diff --git a/app/User.php b/app/User.php
index 37e40437a..cfc20453f 100644
--- a/app/User.php
+++ b/app/User.php
@@ -24,7 +24,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      *
      * @var array
      */
-    protected $fillable = ['name', 'email'];
+    protected $fillable = ['name', 'email', 'password'];
 
     /**
      * The attributes excluded from the model's JSON form.
diff --git a/resources/assets/sass/styles.scss b/resources/assets/sass/styles.scss
index 33b82e006..68b1c0125 100644
--- a/resources/assets/sass/styles.scss
+++ b/resources/assets/sass/styles.scss
@@ -296,7 +296,9 @@ h1, h2, h3, h4, h5, h6 {
   }
 }
 
-
+.book-tree {
+  margin-top: $-xl;
+}
 .book-tree h4 {
   padding: $-m $-s 0 $-s;
   i {
@@ -309,7 +311,7 @@ h1, h2, h3, h4, h5, h6 {
 .book-tree .sidebar-page-list {
   list-style: none;
   margin: 0;
-  margin-top: $-xl;
+  margin-top: $-xs;
   border-left: 5px solid $color-book;
   li a {
     display: block;
diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index aec475a51..4a06a19c4 100644
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -18,16 +18,25 @@
     </div>
 
 
-
-    <div class="page-content">
-        <h1>Books</h1>
-        @foreach($books as $book)
-            <div class="book">
-                <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
-                <p class="text-muted">{{$book->description}}</p>
+    <div class="container">
+        <div class="row">
+            <div class="col-md-8">
+                <h1>Books</h1>
+                @if(count($books) > 0)
+                    @foreach($books as $book)
+                        <div class="book">
+                            <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
+                            <p class="text-muted">{{$book->description}}</p>
+                        </div>
+                        <hr>
+                    @endforeach
+                @else
+                    <p class="text-muted">No books have been created.</p>
+                    <a href="/books/create" class="text-pos"><i class="zmdi zmdi-edit"></i>Create one now</a>
+                @endif
             </div>
-            <hr>
-        @endforeach
+            <div class="col-md-4"></div>
+        </div>
     </div>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index cc915f39c..b44cd8505 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -36,27 +36,37 @@
 
                 <div class="page-list">
                     <hr>
-                    @foreach($book->children() as $childElement)
-                        <div class="book-child">
-                            <h3>
-                                <a href="{{ $childElement->getUrl() }}" class="{{ $childElement->getName() }}">
-                                    <i class="zmdi {{ $childElement->isA('chapter') ? 'zmdi-collection-bookmark chapter-toggle':'zmdi-file-text'}}"></i>{{ $childElement->name }}
-                                </a>
-                            </h3>
-                            <p class="text-muted">
-                                {{$childElement->getExcerpt()}}
-                            </p>
+                    @if(count($book->children()) > 0)
+                        @foreach($book->children() as $childElement)
+                            <div class="book-child">
+                                <h3>
+                                    <a href="{{ $childElement->getUrl() }}" class="{{ $childElement->getName() }}">
+                                        <i class="zmdi {{ $childElement->isA('chapter') ? 'zmdi-collection-bookmark chapter-toggle':'zmdi-file-text'}}"></i>{{ $childElement->name }}
+                                    </a>
+                                </h3>
+                                <p class="text-muted">
+                                    {{$childElement->getExcerpt()}}
+                                </p>
 
-                            @if($childElement->isA('chapter') && count($childElement->pages) > 0)
-                                <div class="inset-list">
-                                    @foreach($childElement->pages as $page)
-                                        <h4><a href="{{$page->getUrl()}}"><i class="zmdi zmdi-file-text"></i>{{$page->name}}</a></h4>
-                                    @endforeach
-                                </div>
-                            @endif
-                        </div>
+                                @if($childElement->isA('chapter') && count($childElement->pages) > 0)
+                                    <div class="inset-list">
+                                        @foreach($childElement->pages as $page)
+                                            <h4><a href="{{$page->getUrl()}}"><i class="zmdi zmdi-file-text"></i>{{$page->name}}</a></h4>
+                                        @endforeach
+                                    </div>
+                                @endif
+                            </div>
+                            <hr>
+                        @endforeach
+                    @else
+                        <p class="text-muted">No pages or chapters have been created for this book.</p>
+                        <p>
+                            <a href="{{$book->getUrl() . '/page/create'}}" class="text-page"><i class="zmdi zmdi-file-text"></i>Create a new page</a>
+                             &nbsp;&nbsp;<em class="text-muted">-or-</em>&nbsp;&nbsp;&nbsp;
+                            <a href="{{$book->getUrl() . '/chapter/create'}}" class="text-chapter"><i class="zmdi zmdi-collection-bookmark"></i>Add a chapter</a>
+                        </p>
                         <hr>
-                    @endforeach
+                    @endif
                 </div>
 
                 <p class="text-muted small">
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 56b946497..9eb27f225 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -56,7 +56,14 @@
                             @endforeach
                         </div>
                     @else
-                        <p class="text-muted">No pages are in this chapter</p>
+                        <hr>
+                        <p class="text-muted">No pages are currently in this chapter.</p>
+                        <p>
+                            <a href="{{$chapter->getUrl() . '/create-page'}}" class="text-page"><i class="zmdi zmdi-file-text"></i>Create a new page</a>
+                            &nbsp;&nbsp;<em class="text-muted">-or-</em>&nbsp;&nbsp;&nbsp;
+                            <a href="{{$book->getUrl() . '/sort'}}" class="text-book"><i class="zmdi zmdi-book"></i>Sort the current book</a>
+                        </p>
+                        <hr>
                     @endif
 
                     <p class="text-muted small">
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 746ac406f..de6414044 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -7,13 +7,18 @@
         <div class="row">
             <div class="col-md-7">
                 <h2>Books</h2>
-                @foreach($books as $book)
-                    <div class="book">
-                        <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
-                        <p class="text-muted">{{$book->description}}</p>
-                    </div>
-                    <hr>
-                @endforeach
+                @if(count($books) > 0)
+                    @foreach($books as $book)
+                        <div class="book">
+                            <h3><a href="{{$book->getUrl()}}">{{$book->name}}</a></h3>
+                            <p class="text-muted">{{$book->description}}</p>
+                        </div>
+                        <hr>
+                    @endforeach
+                @else
+                    <p class="text-muted">No books have been created.</p>
+                    <a href="/books/create" class="text-pos"><i class="zmdi zmdi-edit"></i>Create one now</a>
+                @endif
             </div>
             <div class="col-md-4 col-md-offset-1">
                 <div class="margin-top large">&nbsp;</div>
diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 7783431d6..ed439e62c 100644
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -1,5 +1,6 @@
 
 <div class="book-tree">
+    <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>
         @foreach($book->children() as $bookChild)
diff --git a/resources/views/partials/activity-list.blade.php b/resources/views/partials/activity-list.blade.php
index 11d0d17ea..7198e7cbb 100644
--- a/resources/views/partials/activity-list.blade.php
+++ b/resources/views/partials/activity-list.blade.php
@@ -9,4 +9,6 @@
             </div>
         @endforeach
     </div>
+@else
+    <p class="text-muted">New activity will show up here.</p>
 @endif
\ No newline at end of file