diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 019643427..ba30ebdb9 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -10,6 +10,20 @@
   <div class='row'>
     {{#if controller.multiSelect}}
       <button class='post-select' {{action selectPost this}}>{{view.selectText}}</button>
+    {{else}}
+      <div class='topic-meta-data-inside'>
+        <div class='post-info'>
+          <a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
+        </div>
+        {{#if hasHistory}}
+          <div class='post-info edits'>
+            <a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
+              {{editCount}}
+              <i class='icon-pencil'></i>
+            </a>
+          </div>
+        {{/if}}
+      </div>
     {{/if}}
 
     {{#if showUserReplyTab}}
@@ -28,18 +42,6 @@
       <div {{bindAttr class=":contents byTopicCreator:topic-creator"}}>
         <a href='{{unbound usernameUrl}}'>{{avatar this imageSize="large"}}</a>
         <h3 {{bindAttr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{breakUp username}}</a></h3>
-
-        <div class='post-info'>
-          <a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
-        </div>
-        {{#if hasHistory}}
-          <div class='post-info'>
-            <a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
-              <i class='icon-pencil'></i>
-              {{editCount}}
-            </a>
-          </div>
-        {{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js b/app/assets/javascripts/discourse/views/post_menu_view.js
index f329258ae..d9a949e63 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js
@@ -38,7 +38,8 @@ Discourse.PostMenuView = Discourse.View.extend({
   // Trigger re-rendering
   needsToRender: function() {
     this.rerender();
-  }.observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count', 'post.showRepliesBelow', 'post.can_delete', 'post.read', 'post.topic.last_read_post_number'),
+  }.observes('post.deleted_at', 'post.flagsAvailable.@each', 'post.url', 'post.bookmarked', 'post.reply_count',
+             'post.showRepliesBelow', 'post.can_delete', 'post.read', 'post.topic.last_read_post_number'),
 
   // Replies Button
   renderReplies: function(post, buffer) {
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 6310d46af..d1753bfc9 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -371,18 +371,6 @@
         font-size: 12px;
       }
     }
-    .post-info {
-      margin-top: -1px;
-      line-height: 12px;
-      a {
-        color: rgba(#323232, 0.9);
-        font-size: 10px;
-      }
-      .bar {
-        color: $muted-link-color;
-        font-size: 10px;
-      }
-    }
   }
   .reply-to-tab {
     z-index: 490;
@@ -506,6 +494,27 @@
       padding: 2px 5px;
       z-index: 490;
     }
+    .topic-meta-data-inside {
+      position: absolute;
+      top: 4px;
+      right: 316px;
+      z-index: 490;
+      .post-info {
+        font-size: 12px;
+        display: inline-block;
+        float: right;
+        margin-right: 12px;
+        &:first-child {
+          margin-right: 0;
+        }
+        &.edits {
+          opacity: 0.7;
+        }
+      }
+      .post-date {
+        color: #aaa;
+      }
+    }
     img {
       max-width: 100%;
     }
@@ -513,7 +522,7 @@
       position: relative;
       .contents {
         .cooked {
-          padding: 12px 10px 0;
+          padding: 25px 10px 0;
         }
         position: relative;
         border: 1px solid #b9b9b9;
@@ -540,6 +549,9 @@
       }
       .contents.avoid-tab {
         padding-top: 30px;
+        .cooked {
+          padding-top: 10px;
+        }
       }
       .post-actions {
         padding: 3px 0 0px 15px;