diff --git a/themes/hackit0x14/templates/base.html b/themes/hackit0x14/templates/base.html
index 5febab3..d779171 100644
--- a/themes/hackit0x14/templates/base.html
+++ b/themes/hackit0x14/templates/base.html
@@ -115,16 +115,15 @@
         </div>
         <div class="collapse navbar-collapse navbar-ex1-collapse">
             <ul class="nav navbar-nav">
-                {% for title, link in MENUITEMS %}
+                {% if page %}
+                    {% set menu = LOCALMENUITEMS[page.lang] %}
+                {% else %}
+                    {% set menu = MENUITEMS %}
+                {% endif %}
+                {% for title, link in menu %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
-                {% if DISPLAY_PAGES_ON_MENU %}
-                    {% for p in PAGES %}
-                         <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">
-                             {{ p.menulabel|default(p.title) }}
-                          </a></li>
-                      {% endfor %}
-                {% endif %}
+
                 {% if DISPLAY_CATEGORIES_ON_MENU %}
                     {% for cat, null in categories %}
                         <li {% if cat == category %}class="active"{% endif %}>
@@ -132,6 +131,7 @@
                         </li>
                     {% endfor %}
                 {% endif %}
+
             </ul>
             <ul class="nav navbar-nav navbar-right">
             {% if 'tipue_search' in PLUGINS %}