diff --git a/core/client/templates/-floating-header.hbs b/core/client/templates/-floating-header.hbs
deleted file mode 100644
index 573a311908..0000000000
--- a/core/client/templates/-floating-header.hbs
+++ /dev/null
@@ -1,22 +0,0 @@
-<header class="floatingheader">
-    <button type="button" class="btn btn-default" href="#">Back</button>
-    <button type="button" {{bind-attr class="featured:featured:unfeatured"}} title="Feature this post" {{action "toggleFeatured"}}>
-        <span class="hidden">Star</span>
-    </button>
-    <small>
-        <span class="status">{{#if isPublished}}Published{{else}}Written{{/if}}</span>
-        <span class="normal">by</span>
-        <span class="author">{{#if author.name}}{{author.name}}{{else}}{{author.email}}{{/if}}</span>
-    </small>
-    <section class="post-controls">
-        {{#link-to "editor.edit" this class="post-edit" title="Edit Post"}}
-            <span class="hidden">Edit Post</span>
-        {{/link-to}}
-        {{#gh-popover-button popoverName="post-settings-menu" classNames="post-settings" title="Post Settings"}}
-            <span class="hidden">Post Settings</span>
-        {{/gh-popover-button}}
-        {{#gh-popover name="post-settings-menu" classNames="post-settings-menu menu-drop-right"}}
-            {{render "post-settings-menu" model}}
-        {{/gh-popover}}
-    </section>
-</header>
diff --git a/core/client/templates/editor/edit.hbs b/core/client/templates/editor/edit.hbs
index 1f5be1b2bd..51928ddb58 100644
--- a/core/client/templates/editor/edit.hbs
+++ b/core/client/templates/editor/edit.hbs
@@ -1,6 +1,6 @@
 <header class="page-header">
     <a class="menu-button" href="#"><span class="sr-only">Menu</span></a>
-    <h2>Editor</h2>
+    <h2 class="page-title">Editor</h2>
 </header>
 
 <div class="page-content">
diff --git a/core/client/templates/posts.hbs b/core/client/templates/posts.hbs
index cd098172a8..e9caf0dfc7 100644
--- a/core/client/templates/posts.hbs
+++ b/core/client/templates/posts.hbs
@@ -1,6 +1,6 @@
 <header class="page-header">
     <a class="menu-button" href="#"><span class="sr-only">Menu</span></a>
-    <h2>Content</h2>
+    <h2 class="page-title">Content</h2>
 </header>
 
 <div class="page-content">
diff --git a/core/client/templates/posts/post.hbs b/core/client/templates/posts/post.hbs
index c396441bc4..89e8cd2329 100644
--- a/core/client/templates/posts/post.hbs
+++ b/core/client/templates/posts/post.hbs
@@ -1,4 +1,17 @@
-{{partial "floating-header"}}
+<header class="post-preview-header">
+    <button type="button" class="btn btn-default btn-back" href="#">Back</button>
+    <button type="button" {{bind-attr class="featured:featured:unfeatured"}} title="Feature this post" {{action "toggleFeatured"}}>
+        <span class="hidden">Star</span>
+    </button>
+    <small>
+        <span class="status">{{#if isPublished}}Published{{else}}Written{{/if}}</span>
+        <span class="normal">by</span>
+        <span class="author">{{#if author.name}}{{author.name}}{{else}}{{author.email}}{{/if}}</span>
+    </small>
+    <section class="post-controls">
+        {{#link-to "editor.edit" this class="btn btn-default post-edit"}} Edit{{/link-to}}
+    </section>
+</header>
 
 {{#view "content-preview-content-view" tagName="section"}}
     <div class="wrapper">
diff --git a/core/server/views/default.hbs b/core/server/views/default.hbs
index 13e513c205..9ae693a4ac 100644
--- a/core/server/views/default.hbs
+++ b/core/server/views/default.hbs
@@ -37,4 +37,4 @@
     {{{ghost_script_tags}}}
 
 </body>
-</html>
+</html>
\ No newline at end of file