diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 63749f68..2b47a14c 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -30,41 +30,43 @@
     {% block mediagoblin_body %}
     <div class="mediagoblin_body">
       {% block mediagoblin_header %}
-      <div class="mediagoblin_header">
-        <div class="container_12">
-          <div class="grid_12">
-                  {% block mediagoblin_logo %}
-                    <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
-                  {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
-            <div class="mediagoblin_header_right">
-              {% if request.user %}
-                    <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                                user= request.user['username']) }}">
-                                                {{ request.user['username'] }}</a>'s account 
-                    (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
-              {% else %}
-                    <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
-                      Login</a>
-              {% endif %}
+        <div class="mediagoblin_header">
+          <div class="container_12">
+            <div class="grid_12">
+              {% block mediagoblin_logo %}
+                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
+              {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
+              <div class="mediagoblin_header_right">
+                {% if request.user %}
+                  <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                              user= request.user['username']) }}">
+                    {{ request.user['username'] }}</a>'s account 
+                  (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">logout</a>)
+                {% else %}
+                   <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
+                     Login</a>
+                {% endif %}
+              </div>
             </div>
           </div>
         </div>
-      </div>
       {% endblock %}
+
       <div class="container_12 mediagoblin_content">
         <div class="grid_12">
           {% block mediagoblin_content %}
           {% endblock mediagoblin_content %}
         </div>
       </div>
+
       {% block mediagoblin_footer %}
-      <div class="mediagoblin_footer">
-        <div class="container_12">
-          <div class="grid_12">
-            Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>
+        <div class="mediagoblin_footer">
+          <div class="container_12">
+            <div class="grid_12">
+              Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>
+            </div>
           </div>
         </div>
-      </div>
       {% endblock %}
     {% endblock mediagoblin_body %}
     </div>