diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index fd36b3158..c11355db5 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -324,9 +324,10 @@ class PageController extends Controller
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
         $book = $page->book;
         $this->checkOwnablePermission('page-delete', $page);
+        $this->entityRepo->destroyPage($page);
+
         Activity::addMessage('page_delete', $book->id, $page->name);
         session()->flash('success', trans('entities.pages_delete_success'));
-        $this->entityRepo->destroyPage($page);
         return redirect($book->getUrl());
     }
 
diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index c2899b136..95ae2ed0e 100644
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -4,6 +4,7 @@ use BookStack\Book;
 use BookStack\Chapter;
 use BookStack\Entity;
 use BookStack\Exceptions\NotFoundException;
+use BookStack\Exceptions\NotifyException;
 use BookStack\Page;
 use BookStack\PageRevision;
 use BookStack\Services\AttachmentService;
@@ -1073,6 +1074,7 @@ class EntityRepo
     /**
      * Destroy a given page along with its dependencies.
      * @param Page $page
+     * @throws NotifyException
      */
     public function destroyPage(Page $page)
     {
@@ -1084,6 +1086,12 @@ class EntityRepo
         $this->permissionService->deleteJointPermissionsForEntity($page);
         $this->searchService->deleteEntityTerms($page);
 
+        // Check if set as custom homepage
+        $customHome = setting('app-homepage', '0:');
+        if (intval($page->id) === intval(explode(':', $customHome)[0])) {
+            throw new NotifyException(trans('errors.page_custom_home_deletion'), $page->getUrl());
+        }
+
         // Delete Attached Files
         $attachmentService = app(AttachmentService::class);
         foreach ($page->attachments as $attachment) {
diff --git a/app/Services/SearchService.php b/app/Services/SearchService.php
index 3eeaf32aa..a8784ded1 100644
--- a/app/Services/SearchService.php
+++ b/app/Services/SearchService.php
@@ -382,7 +382,7 @@ class SearchService
     protected function generateTermArrayFromText($text, $scoreAdjustment = 1)
     {
         $tokenMap = []; // {TextToken => OccurrenceCount}
-        $splitChars = " \n\t.,";
+        $splitChars = " \n\t.,!?:;()[]{}<>`'\"";
         $token = strtok($text, $splitChars);
 
         while ($token !== false) {
diff --git a/resources/assets/sass/_grid.scss b/resources/assets/sass/_grid.scss
index b9a6ea53f..0f755e9f0 100644
--- a/resources/assets/sass/_grid.scss
+++ b/resources/assets/sass/_grid.scss
@@ -19,6 +19,7 @@ body.flexbox {
   display: flex;
   align-items: stretch;
   min-height: 0;
+  max-width: 100%;
   position: relative;
   &.rows {
     flex-direction: row;
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index 09158caac..572bec42b 100644
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -41,6 +41,7 @@ return [
 
     // Pages
     'page_draft_autosave_fail' => 'Failed to save draft. Ensure you have internet connection before saving this page',
+    'page_custom_home_deletion' => 'Cannot delete a page while it is set as a homepage',
 
     // Entities
     'entity_not_found' => 'Entity not found',
diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 956dbaf16..ea4a079e8 100644
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -91,7 +91,7 @@
 
 @section('body')
 
-    <div ng-non-bindable class="container small">
+    <div class="container small">
         <h1>{{$book->name}}</h1>
         <div class="book-content" v-show="!searching">
             <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>
diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index e5a044aa7..8f3b91435 100644
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -1,19 +1,19 @@
 @extends('sidebar-layout')
 
 @section('toolbar')
-    <div class="col-sm-6 col-xs-3 faded" ng-non-bindable>
+    <div class="col-sm-6 col-xs-3 faded" v-pre>
         @include('chapters._breadcrumbs', ['chapter' => $chapter])
     </div>
     <div class="col-sm-6 col-xs-9 faded">
         <div class="action-buttons">
-                        <span dropdown class="dropdown-container">
-                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
-                            <ul class="wide">
-                                <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
-                                <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
-                                <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
-                            </ul>
-                        </span>
+            <span dropdown class="dropdown-container">
+                <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
+                <ul class="wide">
+                    <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
+                    <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
+                    <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
+                </ul>
+            </span>
             @if(userCan('page-create', $chapter))
                 <a href="{{ $chapter->getUrl('/create-page') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>
             @endif
@@ -96,13 +96,13 @@
 
 @section('body')
 
-    <div class="container small"  ng-non-bindable >
-        <h1>{{ $chapter->name }}</h1>
+    <div class="container small">
+        <h1 v-pre>{{ $chapter->name }}</h1>
         <div class="chapter-content" v-show="!searching">
-            <p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
+            <p v-pre class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
 
             @if(count($pages) > 0)
-                <div class="page-list">
+                <div v-pre class="page-list">
                     <hr>
                     @foreach($pages as $page)
                         @include('pages/list-item', ['page' => $page])
@@ -110,7 +110,7 @@
                     @endforeach
                 </div>
             @else
-                <div class="well">
+                <div v-pre class="well">
                     <p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p>
                     <p>
                         @if(userCan('page-create', $chapter))
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index c4a639898..12f2f3e97 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -51,7 +51,7 @@
     </div>
 
     {{--Title input--}}
-    <div class="title-input page-title clearfix" ng-non-bindable>
+    <div class="title-input page-title clearfix" v-pre>
         <div class="input">
             @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
         </div>
@@ -63,7 +63,7 @@
         {{--WYSIWYG Editor--}}
         @if(setting('app-editor') === 'wysiwyg')
             <div wysiwyg-editor class="flex-fill flex">
-                <textarea id="html-editor"   name="html" rows="5" ng-non-bindable
+                <textarea id="html-editor"  name="html" rows="5" v-pre
                     @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
             </div>
 
@@ -74,7 +74,7 @@
 
         {{--Markdown Editor--}}
         @if(setting('app-editor') === 'markdown')
-            <div ng-non-bindable id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
+            <div v-pre id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
 
                 <div class="markdown-editor-wrap">
                     <div class="editor-toolbar">
diff --git a/resources/views/partials/activity-item.blade.php b/resources/views/partials/activity-item.blade.php
index 3f162e0bd..185e68038 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" ng-non-bindable>
+<div class="right" v-pre>
     @if($activity->user)
         <a href="{{ $activity->user->getProfileUrl() }}">{{ $activity->user->name }}</a>
     @else
diff --git a/resources/views/partials/book-tree.blade.php b/resources/views/partials/book-tree.blade.php
index 867d9779c..b954a4952 100644
--- a/resources/views/partials/book-tree.blade.php
+++ b/resources/views/partials/book-tree.blade.php
@@ -1,4 +1,4 @@
-<div class="card book-tree" ng-non-bindable>
+<div class="card book-tree" v-pre>
     <h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3>
     <div class="body">
         <ul class="sidebar-page-list menu">
diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 587430918..28c0f1764 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -33,13 +33,13 @@ class EntitySearchTest extends TestCase
 
     public function test_searching_accents_and_small_terms()
     {
-        $page = $this->newPage(['name' => 'My new test quaffleachits', 'html' => 'some áéííúü¿¡ test content {a2 orange dog']);
+        $page = $this->newPage(['name' => 'My new test quaffleachits', 'html' => 'some áéííúü¿¡ test content a2 orange dog']);
         $this->asEditor();
 
         $accentSearch = $this->get('/search?term=' . urlencode('áéíí'));
         $accentSearch->assertStatus(200)->assertSee($page->name);
 
-        $smallSearch = $this->get('/search?term=' . urlencode('{a'));
+        $smallSearch = $this->get('/search?term=' . urlencode('a2'));
         $smallSearch->assertStatus(200)->assertSee($page->name);
     }
 
diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index 7c77e9449..ed0dbe47c 100644
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -16,7 +16,8 @@ class HomepageTest extends TestCase
         $homeVisit->assertSee('Recent Activity');
     }
 
-    public function test_custom_homepage() {
+    public function test_custom_homepage()
+    {
         $this->asEditor();
         $name = 'My custom homepage';
         $content = 'This is the body content of my custom homepage.';
@@ -30,4 +31,26 @@ class HomepageTest extends TestCase
         $homeVisit->assertSee('Recently Updated Pages');
         $homeVisit->assertSee('Recent Activity');
     }
+
+    public function test_delete_custom_homepage()
+    {
+        $this->asEditor();
+        $name = 'My custom homepage';
+        $content = 'This is the body content of my custom homepage.';
+        $customPage = $this->newPage(['name' => $name, 'html' => $content]);
+        $this->setSettings(['app-homepage' => $customPage->id]);
+
+        $homeVisit = $this->get('/');
+        $homeVisit->assertSee($name);
+
+        $pageDeleteReq = $this->delete($customPage->getUrl());
+        $pageDeleteReq->assertStatus(302);
+        $pageDeleteReq->assertRedirect($customPage->getUrl());
+        $pageDeleteReq->assertSessionHas('error');
+        $pageDeleteReq->assertSessionMissing('success');
+
+        $homeVisit = $this->get('/');
+        $homeVisit->assertSee($name);
+        $homeVisit->assertStatus(200);
+    }
 }