diff --git a/404.html b/404.html
deleted file mode 100755
index 4bf3f7d8..00000000
--- a/404.html
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: default
-title: "404: Page not found"
-permalink: 404.html
----
-
-<div class="page">
-  <h1 class="page-title">404: Page not found</h1>
-  <p class="lead">Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. <a href="{{ site.baseurl }}/">Head back home</a> to try finding it again.</p>
-</div>
diff --git a/404.md b/404.md
index 5ab8821a..d8d612c5 100755
--- a/404.md
+++ b/404.md
@@ -1,9 +1,8 @@
 ---
-layout: default
+layout: page
 title: "404: Page not found"
 permalink: 404.html
 ---
 
-# 404: Page not found
-
-Sorry, we've misplaced that URL or it's pointing to something that doesn't exist. [Head back home]({{ site.baseurl }}) to try finding it again.
+Sorry, we've misplaced that URL or it's pointing to something that doesn't exist.
+[Head back home]({{ site.baseurl }}) to try finding it again.
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 51a5a446..908b4785 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -20,7 +20,7 @@
 
     {% assign pages_list = site.pages | sort:"url" %}
     {% for node in pages_list %}
-      {% if node.title != null %}
+      {% if node.title != null and node.url != "/404.html" %}
         {% if node.layout == "page" %}
           <a class="sidebar-nav-item{% if page.url == node.url %} active{% endif %}" href="{{ site.baseurl }}{{ node.url }}">{{ node.title }}</a>
         {% endif %}