diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 9a8525c23..573907e56 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -380,6 +380,7 @@ class PageController extends Controller
         return view('pages/revision', [
             'page' => $page,
             'book' => $page->book,
+            'revision' => $revision
         ]);
     }
 
@@ -409,6 +410,7 @@ class PageController extends Controller
             'page' => $page,
             'book' => $page->book,
             'diff' => $diff,
+            'revision' => $revision
         ]);
     }
 
diff --git a/app/PageRevision.php b/app/PageRevision.php
index ff469f0ed..0a9764729 100644
--- a/app/PageRevision.php
+++ b/app/PageRevision.php
@@ -47,4 +47,16 @@ class PageRevision extends Model
         return null;
     }
 
+    /**
+     * Allows checking of the exact class, Used to check entity type.
+     * Included here to align with entities in similar use cases.
+     * (Yup, Bit of an awkward hack)
+     * @param $type
+     * @return bool
+     */
+    public static function isA($type)
+    {
+        return $type === 'revision';
+    }
+
 }
diff --git a/resources/assets/js/pages/page-show.js b/resources/assets/js/pages/page-show.js
index 7754840af..832ec4b36 100644
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -106,25 +106,25 @@ let setupPageShow = window.setupPageShow = function (pageId) {
         goToText(event.target.getAttribute('href').substr(1));
     });
 
-    // Make the book-tree sidebar stick in view on scroll
+    // Make the sidebar stick in view on scroll
     let $window = $(window);
-    let $bookTree = $(".book-tree");
-    let $bookTreeParent = $bookTree.parent();
+    let $sidebar = $("#sidebar .scroll-body");
+    let $bookTreeParent = $sidebar.parent();
     // Check the page is scrollable and the content is taller than the tree
-    let pageScrollable = ($(document).height() > $window.height()) && ($bookTree.height() < $('.page-content').height());
+    let pageScrollable = ($(document).height() > $window.height()) && ($sidebar.height() < $('.page-content').height());
     // Get current tree's width and header height
     let headerHeight = $("#header").height() + $(".toolbar").height();
     let isFixed = $window.scrollTop() > headerHeight;
     // Function to fix the tree as a sidebar
     function stickTree() {
-        $bookTree.width($bookTreeParent.width() + 15);
-        $bookTree.addClass("fixed");
+        $sidebar.width($bookTreeParent.width() + 15);
+        $sidebar.addClass("fixed");
         isFixed = true;
     }
     // Function to un-fix the tree back into position
     function unstickTree() {
-        $bookTree.css('width', 'auto');
-        $bookTree.removeClass("fixed");
+        $sidebar.css('width', 'auto');
+        $sidebar.removeClass("fixed");
         isFixed = false;
     }
     // Checks if the tree stickiness state should change
diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss
index c5b850507..c804b9aa8 100644
--- a/resources/assets/sass/_blocks.scss
+++ b/resources/assets/sass/_blocks.scss
@@ -204,4 +204,21 @@
   background-color: #F8F8F8;
   padding: $-m;
   border: 1px solid #DDD;
+}
+
+#sidebar .scroll-body {
+  &.fixed {
+    z-index: 5;
+    position: fixed;
+    top: 0;
+    padding-right: $-m;
+    width: 30%;
+    left: 0;
+    height: 100%;
+    overflow-y: scroll;
+    -ms-overflow-style: none;
+    //background-color: $primary-faded;
+    border-left: 1px solid #DDD;
+    &::-webkit-scrollbar { width: 0 !important }
+  }
 }
\ No newline at end of file
diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index 5d607ba16..2dd4732f2 100644
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -86,25 +86,8 @@
 
 // Sidebar list
 .book-tree {
-  position: relative;
-  right: 0;
-  top: 0;
   transition: ease-in-out 240ms;
   transition-property: right, border;
-  &.fixed {
-    z-index: 5;
-    position: fixed;
-    top: 0;
-    padding-right: $-l + 5px;
-    width: 30%;
-    left: 0;
-    height: 100%;
-    overflow-y: scroll;
-    -ms-overflow-style: none;
-    //background-color: $primary-faded;
-    border-left: 1px solid #DDD;
-    &::-webkit-scrollbar { width: 0 !important }
-  }
 }
 .book-tree h4 {
   padding: $-m $-s 0 $-s;
diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index 76555fee4..b8be379cd 100644
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -165,6 +165,7 @@ return [
     'pages_move_success' => 'Page moved to ":parentName"',
     'pages_permissions' => 'Page Permissions',
     'pages_permissions_success' => 'Page permissions updated',
+    'pages_revision' => 'Revision',
     'pages_revisions' => 'Page Revisions',
     'pages_revisions_named' => 'Page Revisions for :pageName',
     'pages_revision_named' => 'Page Revision for :pageName',
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index ac2dbfffd..e5a044aa7 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -91,7 +91,7 @@
         </div>
     </div>
 
-    @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree])
+    @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
 @stop
 
 @section('body')
diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php
index f94a614fb..47906a1f6 100644
--- a/resources/views/pages/delete.blade.php
+++ b/resources/views/pages/delete.blade.php
@@ -1,27 +1,30 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('pages._breadcrumbs', ['page' => $page])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('pages._breadcrumbs', ['page' => $page])
-                </div>
+@section('body')
+
+    <div class="container small" ng-non-bindable>
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-delete"></i> {{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}</h3>
+            <div class="body">
+                <p class="text-neg">{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}</p>
+
+                <form action="{{ $page->getUrl() }}" method="POST">
+                    {!! csrf_field() !!}
+                    <input type="hidden" name="_method" value="DELETE">
+                    <div class="form-group">
+                        <a href="{{ $page->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
+                        <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
+                    </div>
+                </form>
             </div>
         </div>
     </div>
 
-    <div class="container small" ng-non-bindable>
-        <h1>{{ $page->draft ? trans('entities.pages_delete_draft') : trans('entities.pages_delete') }}</h1>
-        <p class="text-neg">{{ $page->draft ? trans('entities.pages_delete_draft_confirm'): trans('entities.pages_delete_confirm') }}</p>
-
-        <form action="{{ $page->getUrl() }}" method="POST">
-            {!! csrf_field() !!}
-            <input type="hidden" name="_method" value="DELETE">
-            <a href="{{ $page->getUrl() }}" class="button primary">{{ trans('common.cancel') }}</a>
-            <button type="submit" class="button neg">{{ trans('common.confirm') }}</button>
-        </form>
-    </div>
-
 @stop
\ No newline at end of file
diff --git a/resources/views/pages/detailed-listing.blade.php b/resources/views/pages/detailed-listing.blade.php
index 85b77fae1..b4991d79d 100644
--- a/resources/views/pages/detailed-listing.blade.php
+++ b/resources/views/pages/detailed-listing.blade.php
@@ -1,18 +1,15 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
-
-    <div class="container">
-        <div class="row">
-
-            <div class="col-sm-7">
-                <h1>{{ $title }}</h1>
-                @include('partials/entity-list', ['entities' => $pages, 'style' => 'detailed'])
+@section('body')
+    <div class="container small">
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3>{{ $title }}</h3>
+            @include('partials/entity-list', ['entities' => $pages, 'style' => 'detailed'])
+            <div class="body text-center">
                 {!! $pages->links() !!}
             </div>
-
-            <div class="col-sm-4 col-sm-offset-1"></div>
-
         </div>
+
     </div>
 @stop
\ No newline at end of file
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index 6de47aaf1..79a4878fe 100644
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -16,8 +16,6 @@
             @include('pages/form', ['model' => $page])
             @include('pages/form-toolbox')
         </form>
-
-
     </div>
     
     @include('components.image-manager', ['imageType' => 'gallery', 'uploaded_to' => $page->id])
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index b73b67ef7..ffc1c3fa6 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -5,7 +5,7 @@
 
     {{--Header Bar--}}
     <div class="faded-small toolbar">
-        <div class="container">
+        <div class="container fluid">
             <div class="row">
                 <div class="col-sm-4 faded">
                     <div class="action-buttons text-left">
diff --git a/resources/views/pages/move.blade.php b/resources/views/pages/move.blade.php
index a9b6d69d7..8f934a30e 100644
--- a/resources/views/pages/move.blade.php
+++ b/resources/views/pages/move.blade.php
@@ -1,29 +1,31 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('pages._breadcrumbs', ['page' => $page])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('pages._breadcrumbs', ['page' => $page])
-                </div>
+@section('body')
+
+    <div class="container">
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-folder"></i> {{ trans('entities.pages_move') }}</h3>
+            <div class="body">
+                <form action="{{ $page->getUrl('/move') }}" method="POST">
+                    {!! csrf_field() !!}
+                    <input type="hidden" name="_method" value="PUT">
+
+                    @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter'])
+
+                    <div class="form-group text-right">
+                        <a href="{{ $page->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
+                        <button type="submit" class="button pos">{{ trans('entities.pages_move') }}</button>
+                    </div>
+                </form>
             </div>
         </div>
     </div>
 
-    <div class="container">
-        <h1>{{ trans('entities.pages_move') }}</h1>
-
-        <form action="{{ $page->getUrl('/move') }}" method="POST">
-            {!! csrf_field() !!}
-            <input type="hidden" name="_method" value="PUT">
-
-            @include('components.entity-selector', ['name' => 'entity_selection', 'selectorSize' => 'large', 'entityTypes' => 'book,chapter'])
-
-            <a href="{{ $page->getUrl() }}" class="button muted">{{ trans('common.cancel') }}</a>
-            <button type="submit" class="button pos">{{ trans('entities.pages_move') }}</button>
-        </form>
-    </div>
-
 @stop
diff --git a/resources/views/pages/restrictions.blade.php b/resources/views/pages/restrictions.blade.php
index cfef2ed21..8f0e5353d 100644
--- a/resources/views/pages/restrictions.blade.php
+++ b/resources/views/pages/restrictions.blade.php
@@ -1,20 +1,19 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('pages._breadcrumbs', ['page' => $page])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('pages._breadcrumbs', ['page' => $page])
-                </div>
+@section('body')
+    <div class="container" ng-non-bindable>
+        <p>&nbsp;</p>
+        <div class="card">
+            <h3><i class="zmdi zmdi-lock-outline"></i> {{ trans('entities.pages_permissions') }}</h3>
+            <div class="body">
+                @include('form.restriction-form', ['model' => $page])
             </div>
         </div>
     </div>
-
-    <div class="container" ng-non-bindable>
-        <h1>{{ trans('entities.pages_permissions') }}</h1>
-        @include('form.restriction-form', ['model' => $page])
-    </div>
-
 @stop
diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index a4b5fb4b5..ca74e4afa 100644
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -1,12 +1,20 @@
-@extends('base')
+@extends('sidebar-layout')
 
-@section('content')
+@section('sidebar')
+    <div class="card">
+        <h3><i class="zmdi zmdi-info-outline"></i> {{ trans('common.details') }}</h3>
+        <div class="body">
+            @include('partials.entity-meta', ['entity' => $revision])
+        </div>
+    </div>
+@stop
 
+@section('body')
 
     <div class="container" ng-non-bindable>
         <div class="row">
             <div class="col-md-9">
-                <div class="page-content anim fadeIn">
+                <div class="page-content">
                     @include('pages.page-display')
                 </div>
             </div>
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index bdc8460ef..ed3aa4832 100644
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -1,62 +1,62 @@
-@extends('base')
+@extends('simple-layout')
 
-@section('content')
+@section('toolbar')
+    <div class="col-sm-12 faded">
+        @include('pages._breadcrumbs', ['page' => $page])
+    </div>
+@stop
 
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    @include('pages._breadcrumbs', ['page' => $page])
-                </div>
+@section('body')
+    <div class="container" ng-non-bindable>
+        <p>&nbsp;</p>
+
+        <div class="card">
+            <h3><i class="zmdi zmdi-replay"></i> {{ trans('entities.pages_revisions') }}</h3>
+            <div class="body">
+                @if(count($page->revisions) > 0)
+
+                    <table class="table">
+                        <tr>
+                            <th width="3%">{{ trans('entities.pages_revisions_number') }}</th>
+                            <th width="23%">{{ trans('entities.pages_name') }}</th>
+                            <th colspan="2" width="8%">{{ trans('entities.pages_revisions_created_by') }}</th>
+                            <th width="15%">{{ trans('entities.pages_revisions_date') }}</th>
+                            <th width="25%">{{ trans('entities.pages_revisions_changelog') }}</th>
+                            <th width="20%">{{ trans('common.actions') }}</th>
+                        </tr>
+                        @foreach($page->revisions as $index => $revision)
+                            <tr>
+                                <td>{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}</td>
+                                <td>{{ $revision->name }}</td>
+                                <td style="line-height: 0;">
+                                    @if($revision->createdBy)
+                                        <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
+                                    @endif
+                                </td>
+                                <td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif</td>
+                                <td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
+                                <td>{{ $revision->summary }}</td>
+                                <td>
+                                    <a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>
+                                    <span class="text-muted">&nbsp;|&nbsp;</span>
+
+                                    @if ($index === 0)
+                                        <a target="_blank" href="{{ $page->getUrl() }}"><i>{{ trans('entities.pages_revisions_current') }}</i></a>
+                                    @else
+                                        <a href="{{ $revision->getUrl() }}" target="_blank">{{ trans('entities.pages_revisions_preview') }}</a>
+                                        <span class="text-muted">&nbsp;|&nbsp;</span>
+                                        <a href="{{ $revision->getUrl('restore') }}">{{ trans('entities.pages_revisions_restore') }}</a>
+                                    @endif
+                                </td>
+                            </tr>
+                        @endforeach
+                    </table>
+
+                @else
+                    <p>{{ trans('entities.pages_revisions_none') }}</p>
+                @endif
             </div>
         </div>
-    </div>
-
-    <div class="container" ng-non-bindable>
-        <h1>{{ trans('entities.pages_revisions') }}</h1>
-
-        @if(count($page->revisions) > 0)
-
-            <table class="table">
-                <tr>
-                    <th width="3%">{{ trans('entities.pages_revisions_number') }}</th>
-                    <th width="23%">{{ trans('entities.pages_name') }}</th>
-                    <th colspan="2" width="8%">{{ trans('entities.pages_revisions_created_by') }}</th>
-                    <th width="15%">{{ trans('entities.pages_revisions_date') }}</th>
-                    <th width="25%">{{ trans('entities.pages_revisions_changelog') }}</th>
-                    <th width="20%">{{ trans('common.actions') }}</th>
-                </tr>
-                @foreach($page->revisions as $index => $revision)
-                    <tr>
-                        <td>{{ $revision->revision_number == 0 ? '' : $revision->revision_number }}</td>
-                        <td>{{ $revision->name }}</td>
-                        <td style="line-height: 0;">
-                            @if($revision->createdBy)
-                                <img class="avatar" src="{{ $revision->createdBy->getAvatar(30) }}" alt="{{ $revision->createdBy->name }}">
-                            @endif
-                        </td>
-                        <td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif</td>
-                        <td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
-                        <td>{{ $revision->summary }}</td>
-                        <td>
-                            <a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>
-                            <span class="text-muted">&nbsp;|&nbsp;</span>
-
-                            @if ($index === 0)
-                                <a target="_blank" href="{{ $page->getUrl() }}"><i>{{ trans('entities.pages_revisions_current') }}</i></a>
-                            @else
-                                <a href="{{ $revision->getUrl() }}" target="_blank">{{ trans('entities.pages_revisions_preview') }}</a>
-                                <span class="text-muted">&nbsp;|&nbsp;</span>
-                                <a href="{{ $revision->getUrl('restore') }}">{{ trans('entities.pages_revisions_restore') }}</a>
-                            @endif
-                        </td>
-                    </tr>
-                @endforeach
-            </table>
-
-        @else
-            <p>{{ trans('entities.pages_revisions_none') }}</p>
-        @endif
 
     </div>
 
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 121f6f38e..07ecdfdfc 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -19,7 +19,7 @@
             @endif
             @if(userCan('page-update', $page) || userCan('restrictions-manage', $page) || userCan('page-delete', $page))
                 <div dropdown class="dropdown-container">
-                    <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i></a>
+                    <a dropdown-toggle class="text-primary text-button"><i class="zmdi zmdi-more-vert"></i> {{ trans('common.more') }}</a>
                     <ul>
                         @if(userCan('page-update', $page))
                             <li><a href="{{ $page->getUrl('/move') }}" class="text-primary" ><i class="zmdi zmdi-folder"></i>{{ trans('common.move') }}</a></li>
@@ -77,7 +77,53 @@
         </div>
     @endif
 
-    @include('pages/sidebar-tree-list', ['book' => $book, 'sidebarTree' => $sidebarTree, 'pageNav' => $pageNav])
+    @if($page->tags->count() > 0)
+        <div class="card tag-display">
+            <h3><i class="zmdi zmdi-tag"></i> {{ trans('entities.page_tags') }}</h3>
+            <div class="body">
+                <table>
+                    <tbody>
+                    @foreach($page->tags as $tag)
+                        <tr class="tag">
+                            <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
+                            @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    @endif
+
+    @if ($page->attachments->count() > 0)
+        <div class="card">
+            <h3><i class="zmdi zmdi-attachment-alt"></i> {{ trans('entities.pages_attachments') }}</h3>
+            <div class="body">
+                @foreach($page->attachments as $attachment)
+                    <div class="attachment">
+                        <a href="{{ $attachment->getUrl() }}" @if($attachment->external) target="_blank" @endif><i class="zmdi zmdi-{{ $attachment->external ? 'open-in-new' : 'file' }}"></i>{{ $attachment->name }}</a>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+    @endif
+
+    @if (isset($pageNav) && count($pageNav))
+        <div class="card">
+            <h3><i class="zmdi zmdi-compass"></i> {{ trans('entities.pages_navigation') }}</h3>
+            <div class="body">
+                <div class="sidebar-page-nav menu">
+                    @foreach($pageNav as $navItem)
+                        <li class="page-nav-item h{{ $navItem['level'] }}">
+                            <a href="{{ $navItem['link'] }}">{{ $navItem['text'] }}</a>
+                        </li>
+                    @endforeach
+                </div>
+            </div>
+        </div>
+    @endif
+
+    @include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
 
     <div class="card">
         <h3><i class="zmdi zmdi-info-outline"></i> {{ trans('common.details') }}</h3>
diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 902a6def2..e69de29bb 100644
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -1,87 +0,0 @@
-
-<div class="book-tree" ng-non-bindable>
-
-    @if(isset($page) && $page->tags->count() > 0)
-        <div class="card tag-display">
-            <h3><i class="zmdi zmdi-tag"></i> {{ trans('entities.page_tags') }}</h3>
-            <div class="body">
-                <table>
-                    <tbody>
-                    @foreach($page->tags as $tag)
-                        <tr class="tag">
-                            <td @if(!$tag->value) colspan="2" @endif><a href="{{ baseUrl('/search?term=%5B' . urlencode($tag->name) .'%5D') }}">{{ $tag->name }}</a></td>
-                            @if($tag->value) <td class="tag-value"><a href="{{ baseUrl('/search?term=%5B' . urlencode($tag->name) .'%3D' . urlencode($tag->value) . '%5D') }}">{{$tag->value}}</a></td> @endif
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    @endif
-
-    @if (isset($page) && $page->attachments->count() > 0)
-        <div class="card">
-            <h3><i class="zmdi zmdi-attachment-alt"></i> {{ trans('entities.pages_attachments') }}</h3>
-            <div class="body">
-                @foreach($page->attachments as $attachment)
-                    <div class="attachment">
-                        <a href="{{ $attachment->getUrl() }}" @if($attachment->external) target="_blank" @endif><i class="zmdi zmdi-{{ $attachment->external ? 'open-in-new' : 'file' }}"></i>{{ $attachment->name }}</a>
-                    </div>
-                @endforeach
-            </div>
-        </div>
-    @endif
-
-    @if (isset($pageNav) && count($pageNav))
-        <div class="card">
-            <h3><i class="zmdi zmdi-compass"></i> {{ trans('entities.pages_navigation') }}</h3>
-            <div class="body">
-                <div class="sidebar-page-nav menu">
-                    @foreach($pageNav as $navItem)
-                        <li class="page-nav-item h{{ $navItem['level'] }}">
-                            <a href="{{ $navItem['link'] }}">{{ $navItem['text'] }}</a>
-                        </li>
-                    @endforeach
-                </div>
-            </div>
-        </div>
-    @endif
-
-    <div class="card">
-        <h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3>
-        <div class="body">
-            <ul class="sidebar-page-list menu">
-
-                @if (userCan('view', $book))
-                    <li class="book-header"><a href="{{ $book->getUrl() }}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li>
-                @endif
-
-                @foreach($sidebarTree as $bookChild)
-                    <li class="list-item-{{ $bookChild->getClassName() }} {{ $bookChild->getClassName() }} {{ $bookChild->isA('page') && $bookChild->draft ? 'draft' : '' }}">
-                        <a href="{{ $bookChild->getUrl() }}" class="{{ $bookChild->getClassName() }} {{ $current->matches($bookChild)? 'selected' : '' }}">
-                            @if($bookChild->isA('chapter'))<i class="zmdi zmdi-collection-bookmark"></i>@else <i class="zmdi zmdi-file-text"></i>@endif{{ $bookChild->name }}
-                        </a>
-
-                        @if($bookChild->isA('chapter') && count($bookChild->pages) > 0)
-                            <p chapter-toggle class="text-muted @if($bookChild->matchesOrContains($current)) open @endif">
-                                <i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans('entities.x_pages', ['count' => $bookChild->pages->count()]) }}</span>
-                            </p>
-                            <ul class="menu sub-menu inset-list @if($bookChild->matchesOrContains($current)) open @endif">
-                                @foreach($bookChild->pages as $childPage)
-                                    <li class="list-item-page {{ $childPage->isA('page') && $childPage->draft ? 'draft' : '' }}">
-                                        <a href="{{ $childPage->getUrl() }}" class="page {{ $current->matches($childPage)? 'selected' : '' }}">
-                                            <i class="zmdi zmdi-file-text"></i> {{ $childPage->name }}
-                                        </a>
-                                    </li>
-                                @endforeach
-                            </ul>
-                        @endif
-
-
-                    </li>
-                @endforeach
-            </ul>
-        </div>
-    </div>
-
-</div>
diff --git a/resources/views/partials/book-tree.blade.php b/resources/views/partials/book-tree.blade.php
new file mode 100644
index 000000000..80f7262ca
--- /dev/null
+++ b/resources/views/partials/book-tree.blade.php
@@ -0,0 +1,36 @@
+<div class="card book-tree" ng-non-bindable>
+    <h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3>
+    <div class="body">
+        <ul class="sidebar-page-list menu">
+
+            @if (userCan('view', $book))
+                <li class="book-header"><a href="{{ $book->getUrl() }}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li>
+            @endif
+
+            @foreach($sidebarTree as $bookChild)
+                <li class="list-item-{{ $bookChild->getClassName() }} {{ $bookChild->getClassName() }} {{ $bookChild->isA('page') && $bookChild->draft ? 'draft' : '' }}">
+                    <a href="{{ $bookChild->getUrl() }}" class="{{ $bookChild->getClassName() }} {{ $current->matches($bookChild)? 'selected' : '' }}">
+                        @if($bookChild->isA('chapter'))<i class="zmdi zmdi-collection-bookmark"></i>@else <i class="zmdi zmdi-file-text"></i>@endif{{ $bookChild->name }}
+                    </a>
+
+                    @if($bookChild->isA('chapter') && count($bookChild->pages) > 0)
+                        <p chapter-toggle class="text-muted @if($bookChild->matchesOrContains($current)) open @endif">
+                            <i class="zmdi zmdi-caret-right"></i> <i class="zmdi zmdi-file-text"></i> <span>{{ trans('entities.x_pages', ['count' => $bookChild->pages->count()]) }}</span>
+                        </p>
+                        <ul class="menu sub-menu inset-list @if($bookChild->matchesOrContains($current)) open @endif">
+                            @foreach($bookChild->pages as $childPage)
+                                <li class="list-item-page {{ $childPage->isA('page') && $childPage->draft ? 'draft' : '' }}">
+                                    <a href="{{ $childPage->getUrl() }}" class="page {{ $current->matches($childPage)? 'selected' : '' }}">
+                                        <i class="zmdi zmdi-file-text"></i> {{ $childPage->name }}
+                                    </a>
+                                </li>
+                            @endforeach
+                        </ul>
+                    @endif
+
+
+                </li>
+            @endforeach
+        </ul>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php
index 0442ce50c..49671ba50 100644
--- a/resources/views/partials/entity-meta.blade.php
+++ b/resources/views/partials/entity-meta.blade.php
@@ -1,4 +1,9 @@
 <p class="text-muted small">
+    @if($entity->isA('revision'))
+        {{ trans('entities.pages_revision') }}
+        {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
+        <br>
+    @endif
     @if ($entity->isA('page')) {{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }} <br> @endif
     @if ($entity->createdBy)
         {!! trans('entities.meta_created_name', [
@@ -14,7 +19,7 @@
                 'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
                 'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".htmlentities($entity->updatedBy->name). "</a>"
             ]) !!}
-    @else
+    @elseif (!$entity->isA('revision'))
         <span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>
     @endif
 </p>
\ No newline at end of file
diff --git a/resources/views/sidebar-layout.blade.php b/resources/views/sidebar-layout.blade.php
index 55701b8ba..0880f881d 100644
--- a/resources/views/sidebar-layout.blade.php
+++ b/resources/views/sidebar-layout.blade.php
@@ -15,7 +15,7 @@
 
     <div class="flex-fill flex" @yield('container-attrs') >
 
-        <div class="sidebar flex print-hidden">
+        <div class="sidebar flex print-hidden" id="sidebar">
             <div class="scroll-body">
                 @yield('sidebar')
             </div>