diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 34045f0731..3fe3618393 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -177,12 +177,21 @@
         {% 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 class="{{ link.class }}" href="{{ link.url }}">{{ link.text|capfirst }}{% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}</a></li>
-                    {% endfor %}     
+                        {% with "true" as as_li %}
+                        {% with "true" as hide_active_anchor %}
+                        {% with "active" as li_class_active %}
+                        {% with "first" as li_class_first %}
+                        {% with form_navigation_links as object_navigation_links %}
+                            {% include "generic_navigation.html" %}
+                        {% endwith %}
+                        {% endwith %}
+                        {% endwith %}
+                        {% endwith %}
+                        {% endwith %}
                 </ul>
             </div>    
     {% endif %}
+    
 {% endblock %}
 
 {% block web_theme_sidebar %}