diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss
index ed232ea84..3de5c57ff 100644
--- a/app/assets/stylesheets/single-post-view.scss
+++ b/app/assets/stylesheets/single-post-view.scss
@@ -4,7 +4,6 @@
 
 #single-post-content {
   border-right: solid 1px #cccccc;
-  padding-right: 12px;
   #head {
     padding-bottom: 10px;
     border-bottom: 1px solid $border-grey;
@@ -60,7 +59,6 @@
       .img { margin-right: 10px; }
     }
     #single-post-actions {
-      padding-right: 5px;
       i {
         font-size: 28px;
         line-height: 30px;
diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
index e933a2bc7..9d33fece5 100644
--- a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
@@ -1,101 +1,102 @@
-<div id='head' class='row'>
-  <div class='col-md-12
-  '>
-    <div id='post-info' class='col-md-8'>
-      <div class="img pull-left">
-        {{#if root}}
-          {{#linkToAuthor root.author}}
-            {{{personImage this 'medium'}}}
-          {{/linkToAuthor}}
-        {{else}}
-          {{#linkToAuthor author}}
-            {{{personImage this 'medium'}}}
-          {{/linkToAuthor}}
-        {{/if}}
-      </div>
-
-      <div class="bd">
-        <span class='author'>
+<div id="head" class="row">
+  <div class="col-md-12">
+    <div class="row">
+      <div id="post-info" class="col-md-8">
+        <div class="img pull-left">
           {{#if root}}
             {{#linkToAuthor root.author}}
-              {{name}}
+              {{{personImage this "medium"}}}
             {{/linkToAuthor}}
           {{else}}
             {{#linkToAuthor author}}
-              {{name}}
+              {{{personImage this "medium"}}}
             {{/linkToAuthor}}
           {{/if}}
-        </span>
+        </div>
 
-        <div class='info'>
-          {{#if public}}
-            <span class='post_scope' title="{{t "stream.public"}}">
-              <i class="entypo globe small"></i>
-            </span>
-          {{else}}
-            <span class='post_scope' title="{{t "stream.limited"}}">
-              <i class="entypo lock small"></i>
-            </span>
-          {{/if}}
-          <span class="post-time">
+        <div class="bd">
+          <span class="author">
             {{#if root}}
-              <a href="/posts/{{root.id}}">
-                <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
-              </a>
+              {{#linkToAuthor root.author}}
+                {{name}}
+              {{/linkToAuthor}}
             {{else}}
+              {{#linkToAuthor author}}
+                {{name}}
+              {{/linkToAuthor}}
+            {{/if}}
+          </span>
+
+          <div class="info">
+            {{#if public}}
+              <span class="post_scope" title="{{t "stream.public"}}">
+                <i class="entypo globe small"></i>
+              </span>
+            {{else}}
+              <span class="post_scope" title="{{t "stream.limited"}}">
+                <i class="entypo lock small"></i>
+              </span>
+            {{/if}}
+            <span class="post-time">
+              {{#if root}}
+                <a href="/posts/{{root.id}}">
+                  <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
+                </a>
+              {{else}}
+                <a href="/posts/{{id}}">
+                  <time datetime="{{created_at}}" title="{{localTime created_at}}" />
+                </a>
+              {{/if}}
+            </span>
+            {{#if root}}
+              {{#if root.provider_display_name}}
+                {{t "stream.via" provider=root.provider_display_name}}
+              {{/if}}
+            {{else}}
+              {{#if provider_display_name}}
+                {{t "stream.via" provider=provider_display_name}}
+              {{/if}}
+            {{/if}}
+            <div class="status-message-location" />
+          </div>
+          {{#unless root}}
+            <div id="single-post-moderation" />
+          {{/unless}}
+        </div>
+      </div>
+      {{#unless root}}
+        <div id="single-post-actions" class="col-md-4" />
+      {{/unless}}
+    </div>
+    {{#if root}}
+      <div class="row reshare">
+        <div class="col-md-8" id="reshare-info">
+          <i class="entypo retweet small pull-left"></i>
+          <div class="img pull-left">
+            {{#linkToAuthor author}}
+              {{{personImage this "small"}}}
+            {{/linkToAuthor}}
+          </div>
+          <span class="author">
+            {{#linkToAuthor author}}
+              {{name}}
+            {{/linkToAuthor}}
+          </span>
+          <div class="post-context">
+            <span class="post-time">
               <a href="/posts/{{id}}">
                 <time datetime="{{created_at}}" title="{{localTime created_at}}" />
               </a>
-            {{/if}}
-          </span>
-          {{#if root}}
-            {{#if root.provider_display_name}}
-              {{t "stream.via" provider=root.provider_display_name}}
-            {{/if}}
-          {{else}}
-            {{#if provider_display_name}}
-              {{t "stream.via" provider=provider_display_name}}
-            {{/if}}
-          {{/if}}
-          <div class='status-message-location' />
+            </span>
+            <span id="single-post-moderation" />
+          </div>
         </div>
-        {{#unless root}}
-          <div id='single-post-moderation' />
-        {{/unless}}
+        <div id="single-post-actions" class="col-md-4" />
       </div>
-    </div>
-    {{#unless root}}
-      <div id='single-post-actions' class='col-md-4' />
-    {{/unless}}
-  </div>
-  {{#if root}}
-    <div class='row reshare'>
-      <div class='col-md-8' id='reshare-info'>
-        <i class='entypo retweet small pull-left'></i>
-        <div class="img pull-left">
-          {{#linkToAuthor author}}
-            {{{personImage this 'small'}}}
-          {{/linkToAuthor}}
-        </div>
-        <span class="author">
-          {{#linkToAuthor author}}
-            {{name}}
-          {{/linkToAuthor}}
-        </span>
-        <div class="post-context">
-          <span class="post-time">
-            <a href="/posts/{{id}}">
-              <time datetime="{{created_at}}" title="{{localTime created_at}}" />
-            </a>
-          </span>
-          <span id='single-post-moderation' />
-        </div>
-      </div>
-      <div id='single-post-actions' class='col-md-4' />
-    </div>
-  {{/if}}
-</div>
-<div id='body' class='row'>
-  <div id='real-post-content' class='post-content col-md-12'>
+    {{/if}}
+  </div>
+</div>
+<div id="body" class="row">
+  <div id="real-post-content" class="post-content col-md-12">
   </div>
 </div>