diff --git a/src/TerribleDev.Blog.Web/Controllers/HomeController.cs b/src/TerribleDev.Blog.Web/Controllers/HomeController.cs
index 7aa550c..27915fd 100644
--- a/src/TerribleDev.Blog.Web/Controllers/HomeController.cs
+++ b/src/TerribleDev.Blog.Web/Controllers/HomeController.cs
@@ -51,7 +51,7 @@ namespace TerribleDev.Blog.Web.Controllers
         {
             if(!postsByPage.TryGetValue(pageNumber, out var result))
             {
-                return NotFound();
+                return Redirect("/404/");
             }
             return View(new HomeViewModel() { Posts = result, Page = pageNumber, HasNext = postsByPage.ContainsKey(pageNumber + 1), HasPrevious = postsByPage.ContainsKey(pageNumber - 1) });
         }
@@ -80,7 +80,7 @@ namespace TerribleDev.Blog.Web.Controllers
         {
             if(!posts.TryGetValue(postUrl, out var currentPost))
             {
-                return NotFound();
+                return Redirect("/404/");
             }
             return View(model: currentPost);
         }
@@ -88,13 +88,23 @@ namespace TerribleDev.Blog.Web.Controllers
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {
+            this.Response.StatusCode = 500;
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
         [Route("/404")]
+        [Route("{*url}", Order = 999)]
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult FourOhFour()
         {
+            this.Response.StatusCode = 404;
             return View();
         }
+        [Route("/404.html")]
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult FourOhFourCachePage()
+        {
+            //make a route so the service worker can cache a 404 page, but get a valid status code
+            return View(viewName: nameof(FourOhFour));
+        }
     }
 }
diff --git a/src/TerribleDev.Blog.Web/Views/Home/Index.cshtml b/src/TerribleDev.Blog.Web/Views/Home/Index.cshtml
index f65809d..b400d82 100644
--- a/src/TerribleDev.Blog.Web/Views/Home/Index.cshtml
+++ b/src/TerribleDev.Blog.Web/Views/Home/Index.cshtml
@@ -9,14 +9,17 @@
     {
         <partial name="PostSummary" model="post" />
     }
-    @if (Model.HasNext)
-    {
         <div class="bottomNavButtons">
-            <a href="/page/@(Model.Page - 1)/" class="btn">&#8592; Previous Page</a>
+            @if (Model.HasPrevious)
+            {
+                <a href="/page/@(Model.Page - 1)/" class="btn">&#8592; Previous Page</a>
+            }
             <div class="spacer"></div>
-            <a href="/page/@(Model.Page + 1)/" class="btn">Next Page &#8594;</a>
+            @if (Model.HasNext)
+            {
+                <a href="/page/@(Model.Page + 1)/" class="btn">Next Page &#8594;</a>
+            }
         </div>
-    }
 </cache>
 
 @section Head {
diff --git a/src/TerribleDev.Blog.Web/Views/Shared/Nav.cshtml b/src/TerribleDev.Blog.Web/Views/Shared/Nav.cshtml
index a63eb52..c15c1ff 100644
--- a/src/TerribleDev.Blog.Web/Views/Shared/Nav.cshtml
+++ b/src/TerribleDev.Blog.Web/Views/Shared/Nav.cshtml
@@ -7,7 +7,6 @@
     <ul class="sidebarBtns">
         <li><a href="/" class="link-unstyled">Home</a></li>
         <li><a href="/all-tags" class="link-unstyled">Tags</a></li>
-        <li><a href="/about" class="link-unstyled">About</a></li>
         <li><a href="https://github.com/terribledev" target="_blank" class="link-unstyled">Github</a></li>
         <li><a href="https://twitter.com/terribledev" target="_blank" class="link-unstyled">Twitter</a></li>
         <li><a href="mailto:tommy@terribledev.io" class="link-unstyled">Email</a></li>
diff --git a/src/TerribleDev.Blog.Web/wwwroot/js/sw.js b/src/TerribleDev.Blog.Web/wwwroot/js/sw.js
index ce899fc..db4bcf7 100644
--- a/src/TerribleDev.Blog.Web/wwwroot/js/sw.js
+++ b/src/TerribleDev.Blog.Web/wwwroot/js/sw.js
@@ -8,7 +8,7 @@ self.addEventListener('install', function (event) {
 
 var preLoad = function () {
     return caches.open('pwabuilder-offline').then(function (cache) {
-        return cache.addAll(['/offline/', '/', '/404/', '/index.html']);
+        return cache.addAll(['/offline/', '/', '/404.html', '/index.html']);
     });
 }
 
@@ -46,7 +46,7 @@ var returnFromCache = function (request) {
             if (!matching) {
                 return cache.match('/offline/')
             } else if (matching.status == 404) {
-                return cache.match('/404/');
+                return cache.match('/404.html');
             } else {
                 return matching
             }
diff --git a/src/TerribleDev.Blog.Web/wwwroot/js/swi.js b/src/TerribleDev.Blog.Web/wwwroot/js/swi.js
index 47dfcf8..6705d1b 100644
--- a/src/TerribleDev.Blog.Web/wwwroot/js/swi.js
+++ b/src/TerribleDev.Blog.Web/wwwroot/js/swi.js
@@ -1,7 +1,7 @@
 //Add this below content to your HTML page, or add the js file to your page at the very top to register sercie worker
-if (navigator.serviceWorker.controller) {
+if (navigator && navigator.serviceWorker && navigator.serviceWorker.controller) {
     console.log('[PWA Builder] active service worker found, no need to register')
-} else {
+} else if (navigator && navigator.serviceWorker) {
 
     //Register the ServiceWorker
     navigator.serviceWorker.register('/sw.min.js', {
@@ -56,6 +56,9 @@ attachNavToggle('menuBtn');
 attachNavToggle('closeNav');
 document.addEventListener("readystatechange", function () {
     var nav = document.getElementById('navBar');
+    if (!nav) {
+        return;
+    }
     var computedNav = window.getComputedStyle(nav);
     if (computedNav.width && computedNav.width !== "0px") {
         triggerLazyImages();