Apply review comments

core/templates/core/base.jinja

@@ -44,9 +44,6 @@
     {% block header %}
       {% if not popup %}
         {% include "core/base/header.jinja" %}
-      {% else %}
-        <div id="popupheader">{{ user.get_display_name() }}</div>
-      {% endif %}
 
         {% block info_boxes %}
           <div id="info_boxes">
@@ -63,11 +60,16 @@
             {% endif %}
           </div>
         {% endblock %}
+
+      {% else %}
+        <div id="popupheader">{{ user.get_display_name() }}</div>
+      {% endif %}
+
     {% endblock %}
 
     {% block nav %}
       {% if not popup %}
-        {% include "core/base/menu.jinja" %}
+        {% include "core/base/navbar.jinja" %}
       {% endif %}
     {% endblock %}