diff --git a/templates/404.html b/templates/404.html
new file mode 100644
index 0000000..b6a14a0
--- /dev/null
+++ b/templates/404.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+<main id="main-content">
+  <div id="welcome-message">
+    <h2 id="blog-page-title">|| 404 Not Found ||</h2>
+    <h6 class="blog-post-date">These are not the frogs you're looking for 👋 🐸</h6>
+  </div>
+  <div class="dotted-border"></div>
+</main>
+{% endblock content %}
diff --git a/templates/base.html b/templates/base.html
index d642fc1..720988e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -17,19 +17,7 @@
  ██████    ██    ██████  ███████ ██   ██ ██      ██   ██  ██████   ██████  ██ ██      ██ ███████ 
   </pre></a></div>
   <div class="dotted-border"></div>
-    <main id="main-content">
-      <div id="welcome-message">
-        <h1 class="title">Welcome</h1>
-        <p>This blog is made with 💜 and <a target="_blank" href="https://www.getzola.org">Zola!</a></p>
-        <p>It's currently running on <a target="_blank" href="https://www.vultr.com">Vultr</a> and <a target="_blank" href="https://www.openbsd.org">OpenBSD</a>
-        </p>
-      </div>
-      <div class="dotted-border"></div>
-      <div class="blog-entry-container">
-        <h3 class="title">View the latest posts</h3>
-       {% block content %} {% endblock %}
-      </div>
-    </main>
+    {% block content %} {% endblock content %}
   </div>
 </body>
 
diff --git a/templates/index.html b/templates/index.html
index ce6db9e..94f6fb2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,11 +1,23 @@
 {% extends "base.html" %}
 
 {% block content %}
-<ul>
-  <!-- If you are using pagination, section.pages will be empty.
-       You need to use the paginator object -->  
-  {% for page in section.pages %}
-  <li class="blog-entry-title">{{ page.date }} // <a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
-  {% endfor %}
-</ul>
+<main id="main-content">
+  <div id="welcome-message">
+    <h1 class="title">Welcome</h1>
+    <p>This blog is made with 💜 and <a target="_blank" href="https://www.getzola.org">Zola!</a></p>
+    <p>It's currently running on <a target="_blank" href="https://www.vultr.com">Vultr</a> and <a target="_blank" href="https://www.openbsd.org">OpenBSD</a>
+    </p>
+  </div>
+  <div class="dotted-border"></div>
+  <div class="blog-entry-container">
+    <h3 class="title">View the latest posts</h3>
+      <ul>
+      <!-- If you are using pagination, section.pages will be empty.
+           You need to use the paginator object -->  
+        {% for page in section.pages %}
+        <li class="blog-entry-title">{{ page.date }} // <a href="{{ page.permalink | safe }}">{{ page.title }}</a></li>
+        {% endfor %}
+      </ul>
+  </div>
+</main>
 {% endblock content %}
diff --git a/templates/page.html b/templates/page.html
index a4658c1..9168758 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,32 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <link rel="stylesheet" href=/main.css>
-  <title>🐸 CyberFrog</title>
-</head>
+{% extends "base.html" %}
 
-<body>
-  <div id="site-content">
-  <!-- Credits to http://patorjk.com/software/taag/ for the header, made using "ANSI Regular" font -->
-  <div id="ascii-header"><a href="/"><pre>
- ██████ ██    ██ ██████  ███████ ██████  ███████ ██████   ██████   ██████     ███    ███ ███████ 
-██       ██  ██  ██   ██ ██      ██   ██ ██      ██   ██ ██    ██ ██          ████  ████ ██      
-██        ████   ██████  █████   ██████  █████   ██████  ██    ██ ██   ███    ██ ████ ██ █████   
-██         ██    ██   ██ ██      ██   ██ ██      ██   ██ ██    ██ ██    ██    ██  ██  ██ ██      
- ██████    ██    ██████  ███████ ██   ██ ██      ██   ██  ██████   ██████  ██ ██      ██ ███████ 
-  </pre></a></div>
-  <div class="dotted-border"></div>
-  <main id="main-content">
-    <div id="welcome-message">
-      <h2 id="blog-page-title">{{ page.title }}</h2>
-      <h6 class="blog-post-date">// Published: {{ page.date }} // Modified: {{ page.updated }} //</h6>
-    </div>
+{% block content %}
+<main id="main-content">
+  <div id="welcome-message">
+    <h2 id="blog-page-title">{{ page.title }}</h2>
+    <h6 class="blog-post-date">// Published: {{ page.date }} // Modified: {{ page.updated }} //</h6>
+  </div>
   <div class="dotted-border"></div>
   <div id="blog-post-content">
     {{ page.content | safe }}
   </div>
-  </main>
-</body>
-
-</html>
+</main>
+{% endblock content %}
