diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 691b5ea7f..74fac4dfc 100644
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -1,3 +1,12 @@
+#page-show {
+  >.row .col-md-9 {
+    z-index: 2;
+  }
+  >.row .col-md-3 {
+    z-index: 1;
+  }
+}
+
 .page-editor {
   display: flex;
   flex-direction: column;
@@ -58,6 +67,7 @@
   position: relative;
   display: none;
   left: 0;
+  z-index: 10;
 }
 .pointer {
   border: 1px solid #CCC;
@@ -69,6 +79,7 @@
   top: -60px;
   background-color:#FFF;
   width: 272px;
+  z-index: 55;
   &:before {
     position: absolute;
     left: 50%;
@@ -83,7 +94,7 @@
     transform-origin: 50% 50%;
     border-bottom: 1px solid #CCC;
     border-right: 1px solid #CCC;
-    z-index: 1;
+    z-index: 56;
   }
   input {
     background-color: #FFF;
@@ -97,6 +108,7 @@
     border-radius: 0;
     height: 28px;
     font-size: 12px;
+    vertical-align: top;
   }
   > i {
     color: #888;
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 32d90aca1..25559bd40 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -25,7 +25,7 @@
     <header id="header">
         <div class="container">
             <div class="row">
-                <div class="col-lg-4 col-sm-4">
+                <div class="col-lg-4 col-sm-4" ng-non-bindable>
                     <a href="/" class="logo">
                         @if(Setting::get('app-logo', '') !== 'none')
                             <img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo">
@@ -54,7 +54,7 @@
                             <div class="dropdown-container" dropdown>
                                 <span class="user-name" dropdown-toggle>
                                     <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
-                                    <span class="name">{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i>
+                                    <span class="name" ng-non-bindable>{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i>
                                 </span>
                                 <ul>
                                     <li>
diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php
index 6b58e8b52..dd2de574d 100644
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-<div class="container small">
+<div class="container small" ng-non-bindable>
     <h1>Create New Book</h1>
     <form action="/books" method="POST">
         @include('books/form')
diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php
index f4cf1d8d7..68f755131 100644
--- a/resources/views/books/delete.blade.php
+++ b/resources/views/books/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Delete Book</h1>
         <p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p>
         <p class="text-neg">Are you sure you want to delete this book?</p>
diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index 0e62d1fcd..5bd8917c7 100644
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Edit Book</h1>
         <form action="/books/{{$book->slug}}" method="POST">
             <input type="hidden" name="_method" value="PUT">
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index f28b7c1dd..536d1f105 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -18,7 +18,7 @@
     </div>
 
 
-    <div class="container">
+    <div class="container" ng-non-bindable>
         <div class="row">
             <div class="col-sm-7">
                 <h1>Books</h1>
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index e6898f357..083c8e958 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="faded-small">
+    <div class="faded-small" ng-non-bindable>
         <div class="container">
             <div class="row">
                 <div class="col-md-12">
diff --git a/resources/views/books/sort-box.blade.php b/resources/views/books/sort-box.blade.php
index 2e38f0b0b..4177633ad 100644
--- a/resources/views/books/sort-box.blade.php
+++ b/resources/views/books/sort-box.blade.php
@@ -1,4 +1,4 @@
-<div class="sort-box" data-type="book" data-id="{{ $book->id }}">
+<div class="sort-box" data-type="book" data-id="{{ $book->id }}" ng-non-bindable>
     <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
     <ul class="sortable-page-list sort-list">
         @foreach($bookChildren as $bookChild)
diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index 3ca6a36b6..af4f1825b 100644
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
 
-    <div class="container">
+    <div class="container" ng-non-bindable>
         <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
         <div class="row">
             <div class="col-md-8" id="sort-boxes">
diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index 0b83c2691..7195e76fc 100644
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Create New Chapter</h1>
         <form action="{{$book->getUrl()}}/chapter/create" method="POST">
             @include('chapters/form')
diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index 940404323..ac7c7ccde 100644
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Delete Chapter</h1>
         <p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
         and added directly to the book.</p>
diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 1c2c6d98f..aa76d5ca7 100644
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Edit Chapter</h1>
         <form action="{{$chapter->getUrl()}}" method="POST">
             <input type="hidden" name="_method" value="PUT">
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 9421bbe18..73057cf6d 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="faded-small">
+    <div class="faded-small" ng-non-bindable>
         <div class="container">
             <div class="row">
                 <div class="col-md-4 faded">
@@ -28,7 +28,7 @@
     </div>
 
 
-    <div class="container">
+    <div class="container" ng-non-bindable>
         <div class="row">
             <div class="col-md-8">
                 <h1>{{ $chapter->name }}</h1>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 282c15677..ccae9c0ea 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container">
+    <div class="container" ng-non-bindable>
         <div class="row">
 
             <div class="col-md-7">
diff --git a/resources/views/pages/create.blade.php b/resources/views/pages/create.blade.php
index 441379eae..69c5f7c94 100644
--- a/resources/views/pages/create.blade.php
+++ b/resources/views/pages/create.blade.php
@@ -8,7 +8,7 @@
 
 @section('content')
 
-    <div class="flex-fill flex">
+    <div class="flex-fill flex" ng-non-bindable>
         <form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill">
             @include('pages/form')
             @if($chapter)
diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php
index eb9327122..c97cadeef 100644
--- a/resources/views/pages/delete.blade.php
+++ b/resources/views/pages/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Delete Page</h1>
         <p class="text-neg">Are you sure you want to delete this page?</p>
 
diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index e0862f924..6dde47c63 100644
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -8,7 +8,7 @@
 
 @section('content')
 
-    <div class="flex-fill flex">
+    <div class="flex-fill flex" ng-non-bindable>
         <form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill">
             <input type="hidden" name="_method" value="PUT">
             @include('pages/form', ['model' => $page])
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index a793f9354..7b760e48e 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -1,7 +1,7 @@
 
 
 
-<div class="page-editor flex-fill flex">
+<div class="page-editor flex-fill flex" ng-non-bindable>
 
     {{ csrf_field() }}
     <div class="faded-small">
diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index 0d7f75cd8..bc054ef83 100644
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 
 
-    <div class="container">
+    <div class="container" ng-non-bindable>
         <div class="row">
             <div class="col-md-9">
                 <div class="page-content anim fadeIn">
diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index b7ec1f816..cc597816f 100644
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -17,7 +17,7 @@
     </div>
 
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
 
         @if(count($page->revisions) > 0)
diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index cc01a139f..612ccdba6 100644
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -33,7 +33,7 @@
     </div>
 
 
-    <div class="container" id="page-show">
+    <div class="container" id="page-show" ng-non-bindable>
         <div class="row">
             <div class="col-md-9 print-full-width">
                 <div class="page-content anim fadeIn">
diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 899ea1e4a..dcccaf756 100644
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -1,5 +1,5 @@
 
-<div class="book-tree">
+<div class="book-tree" ng-non-bindable>
     <h6 class="text-muted">Book Navigation</h6>
     <ul class="sidebar-page-list menu">
         <li class="book-header"><a href="{{$book->getUrl()}}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li>
diff --git a/resources/views/partials/activity-item.blade.php b/resources/views/partials/activity-item.blade.php
index 2302eab68..1471bdb50 100644
--- a/resources/views/partials/activity-item.blade.php
+++ b/resources/views/partials/activity-item.blade.php
@@ -7,7 +7,7 @@
     </div>
 @endif
 
-<div class="right">
+<div class="right" ng-non-bindable>
     @if($activity->user)
         {{$activity->user->name}}
     @else
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 688f61892..e0920dacc 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container anim fadeIn">
+    <div class="container anim fadeIn" ng-non-bindable>
 
         <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
 
@@ -52,6 +52,4 @@
     </div>
 
 
-
-
 @stop
\ No newline at end of file
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index bec83d1ea..f20ae6fc4 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -3,7 +3,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Create User</h1>
 
         <form action="/users/create" method="post">
diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php
index 5e3e7e694..0221dee9a 100644
--- a/resources/views/users/delete.blade.php
+++ b/resources/views/users/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Delete User</h1>
         <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
         <p class="text-neg">Are you sure you want to delete this user?</p>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9de78a4c6..ca575731e 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -21,7 +21,7 @@
     <div class="container small">
         <form action="/users/{{$user->id}}" method="post">
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-6" ng-non-bindable>
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="put">
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6df242f10..1faea5afa 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -6,7 +6,7 @@
     @include('settings/navbar', ['selected' => 'users'])
 
 
-    <div class="container small">
+    <div class="container small" ng-non-bindable>
         <h1>Users</h1>
         @if($currentUser->can('user-create'))
             <p>