update edit page blocks after layout changes

IPython/html/templates/edit.html

@@ -15,16 +15,16 @@ data-file-path="{{file_path}}"
 
 {% endblock %}
 
-{% block header %}
+{% block headercontainer %}
 
-<span id="save_widget" class="nav pull-left save_widget">
+<span id="save_widget" class="pull-left save_widget">
     <span class="filename"></span>
     <span class="last_modified"></span>
 </span>
 
 {% endblock %}
 
-{% block site %}
+{% block header %}
 
 <div id="menubar-container" class="container">
   <div id="menubar">
@@ -70,6 +70,11 @@ data-file-path="{{file_path}}"
   </div>
 </div>
 
+{% endblock %}
+
+{% block site %}
+
+
 <div id="texteditor-container" class="container"></div>
 
 {% endblock %}

IPython/html/templates/notebook.html

@@ -35,7 +35,7 @@ class="notebook_app"
 {% block headercontainer %}
 
 
-<span id="save_widget" class="nav pull-left save_widget">
+<span id="save_widget" class="pull-left save_widget">
     <span class="filename"></span>
     <span class="checkpoint_status"></span>
     <span class="autosave_status"></span>