diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss
index 76150fe44..dec087b9c 100644
--- a/resources/assets/sass/_components.scss
+++ b/resources/assets/sass/_components.scss
@@ -586,6 +586,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 .comment-box {
+  clear: left;
   border: 1px solid #DDD;
   margin-bottom: $-s;
   border-radius: 3px;
diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index 2b6fa9cb0..748d473eb 100644
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -445,13 +445,4 @@ ul.pagination {
     font-size: .8em;
     margin: 0;
   }
-}
-
-.card.entity-details {
-  .active-restriction {
-    margin-top: $-xs;
-  }
-  .active-restriction + .active-restriction {
-    margin-top: 0;
-  }
 }
\ No newline at end of file
diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index c8e4571db..df6cda02d 100755
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -35,6 +35,7 @@
 }
 
 .page-content {
+  width: 100%;
   max-width: 840px;
   margin: 0 auto;
   margin-top: $-xxl;
@@ -315,6 +316,18 @@
   }
 }
 
+.comments-container {
+  width: 100%;
+  border-top: 1px solid #DDD;
+  margin-top: $-xl;
+  margin-bottom: $-m;
+  h5 {
+    color: #888;
+    font-weight: normal;
+    margin-top: 0.5em;
+  }
+}
+
 .comment-editor .CodeMirror, .comment-editor .CodeMirror-scroll {
   min-height: 175px;
 }
diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 3d7763e22..756e32ef4 100644
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,5 +1,5 @@
 <div page-comments page-id="{{ $page->id }}" ng-non-bindable class="comments-list">
-  <h3 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h3>
+  <h5 comments-title class="float left">{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
 
     <div class="comment-container" comment-container>
         @foreach($page->comments as $comment)
@@ -7,7 +7,6 @@
         @endforeach
     </div>
 
-
     @if(userCan('comment-create-all'))
 
         <div class="comment-box" comment-box style="display:none;">
@@ -33,7 +32,7 @@
         </div>
 
         <div class="form-group" comment-add-button>
-            <button type="button" action="addComment" class="button outline">{{ trans('entities.comment_add') }}</button>
+            <button type="button" action="addComment" class="button outline float right">{{ trans('entities.comment_add') }}</button>
         </div>
     @endif
 
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 3448a164a..3b8b7abff 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -117,8 +117,11 @@
 
 @stop
 
+@section('body-wrap-classes', 'flex-fill columns')
+
 @section('body')
-    <div class="page-content" page-display="{{ $page->id }}">
+
+    <div class="page-content flex" page-display="{{ $page->id }}">
 
         <div class="pointer-container" id="pointer">
             <div class="pointer anim" >
@@ -129,10 +132,10 @@
         </div>
 
         @include('pages/page-display')
-
     </div>
+
     @if ($commentsEnabled)
-      <div class="container small nopad">
+      <div class="container small nopad comments-container">
           @include('comments/comments', ['page' => $page])
       </div>
     @endif
diff --git a/resources/views/sidebar-layout.blade.php b/resources/views/sidebar-layout.blade.php
index 24863d1eb..bf853c09e 100644
--- a/resources/views/sidebar-layout.blade.php
+++ b/resources/views/sidebar-layout.blade.php
@@ -25,7 +25,7 @@
             </div>
         </div>
 
-        <div class="content flex">
+        <div class="content flex @yield('body-wrap-classes')">
             @yield('body')
         </div>
     </div>