diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 9736f438..e7f915a0 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -44,30 +44,32 @@
     {% block header %}
       {% if not popup %}
         {% include "core/base/header.jinja" %}
+
+        {% block info_boxes %}
+          <div id="info_boxes">
+            {% set sith = get_sith() %}
+            {% if sith.alert_msg %}
+              <div id="alert_box">
+                {{ sith.alert_msg|markdown }}
+              </div>
+            {% endif %}
+            {% if sith.info_msg %}
+              <div id="info_box">
+                {{ sith.info_msg|markdown }}
+              </div>
+            {% endif %}
+          </div>
+        {% endblock %}
+
       {% else %}
         <div id="popupheader">{{ user.get_display_name() }}</div>
       {% endif %}
 
-      {% block info_boxes %}
-        <div id="info_boxes">
-          {% set sith = get_sith() %}
-          {% if sith.alert_msg %}
-            <div id="alert_box">
-              {{ sith.alert_msg|markdown }}
-            </div>
-          {% endif %}
-          {% if sith.info_msg %}
-            <div id="info_box">
-              {{ sith.info_msg|markdown }}
-            </div>
-          {% endif %}
-        </div>
-      {% endblock %}
     {% endblock %}
 
     {% block nav %}
       {% if not popup %}
-        {% include "core/base/menu.jinja" %}
+        {% include "core/base/navbar.jinja" %}
       {% endif %}
     {% endblock %}
 
diff --git a/core/templates/core/base/menu.jinja b/core/templates/core/base/navbar.jinja
similarity index 100%
rename from core/templates/core/base/menu.jinja
rename to core/templates/core/base/navbar.jinja