diff --git a/_includes/overrides/404.html b/_includes/overrides/404.html
index b9468fc..70389c4 100644
--- a/_includes/overrides/404.html
+++ b/_includes/overrides/404.html
@@ -1,7 +1,29 @@
-{% extends "main.html" %}
+{% extends "base.html" %}
+
+{% block tabs %}
+{{ super() }}
+
+{% endblock %}
+
+{% block site_nav %}
+{% endblock %}
+
{% block content %}
-
- {% include ".icons/fontawesome/regular/sad-tear.svg" %}
- Uh oh - Page not found...
-
+
+
+
+
+
+
+
+ Page not found
+
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/_includes/overrides/home.html b/_includes/overrides/home.html
index a04eaf5..8aabcfb 100644
--- a/_includes/overrides/home.html
+++ b/_includes/overrides/home.html
@@ -23,10 +23,10 @@