diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 651f932c4f..7ca5697861 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -138,6 +138,17 @@
                 </ul>
             </div>     
     {% endif %}
+
+    {% get_object_navigation_links "form_header" as form_navigation_links %}
+        {% if form_navigation_links %}
+            <div class="secondary-navigation">
+                <ul class="wat-cf">
+                    {% for link in form_navigation_links %}
+                        <li class="{% if forloop.first %}first {% endif %}{% if link.active %}active{% endif %}"><a href="{{ link.url }}">{{ link.text|capfirst }}{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}</a></li>
+                    {% endfor %}     
+                </ul>
+            </div>    
+    {% endif %}
 {% endblock %}
 
 {% block web_theme_sidebar %}
diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html
index c159b6876f..785d59df5a 100644
--- a/apps/web_theme/templates/web_theme_base.html
+++ b/apps/web_theme/templates/web_theme_base.html
@@ -73,9 +73,9 @@
                 <div id="wrapper" class="wat-cf">
                     <div id="main">
                         <div class="block" id="block-text">
-                            {% if not web_theme_hide_menus %}
+                            {#{% if not web_theme_hide_menus %}#}
                                 {% block web_theme_secondary_navigation %}{% endblock %}
-                            {% endif %}
+                            {#{% endif %}#}
                             {% if messages %}
                                 <div class="inner">
                                     <div class="flash">