diff --git a/layerindex/static/css/additional.css b/layerindex/static/css/additional.css
index 155154a..1608bab 100644
--- a/layerindex/static/css/additional.css
+++ b/layerindex/static/css/additional.css
@@ -186,3 +186,7 @@ padding: 8px;
 .breadcrumb {
     background-color: transparent;
 }
+
+.nav-spacer {
+    margin-left: 10px;
+}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index c6ba512..9ac80c6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -56,7 +56,13 @@
                     </div>
                 {% endif %}
                 <ul class="nav pull-right">
-                    {% block submitlink %}<li><a href="{% url submit_layer %}">Submit layer</a></li>{% endblock %}
+                    <li class="divider-vertical"></li>
+                </ul>
+                {% block topfunctions %}
+                <div class="pull-right nav-spacer">
+                    <a class="btn btn-info" href="{% url submit_layer %}">Submit layer</a>
+                </div>
+                <ul class="nav pull-right">
                     {% if user.is_authenticated %}
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -68,9 +74,9 @@
                             <li><a href="{% url duplicates 'master' %}">Duplicates</a></li>
                         </ul>
                     </li>
-                    <li class="divider-vertical"></li>
                     {% endif %}
                 </ul>
+                {% endblock %}
             </div> <!-- end of "container" -->
         </div> <!--  "end of "navbar-inner" -->
     </div> <!--  end of "navbar" -->
diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html
index 8e524d3..ba37ee9 100644
--- a/templates/layerindex/editlayer.html
+++ b/templates/layerindex/editlayer.html
@@ -14,8 +14,8 @@
 {% block title_append %} - edit layer{% endblock %}
 -->
 
-{% block submitlink %}
-<!-- Remove submit link added by base.html, otherwise clicking it may lose changes -->
+{% block topfunctions %}
+<!-- Remove submit link/tools drop-down added by base.html, otherwise clicking it may lose changes -->
 {% endblock %}