4 files changed, 40 insertions, 8 deletions
diff --git a/zola-static/templates/base.html b/zola-static/templates/base.html
index 69b7dc3..9aa47d8 100644
--- a/zola-static/templates/base.html
+++ b/zola-static/templates/base.html
@@ -10,6 +10,11 @@
 <body>
   <section class="section">
     <div class="container">
+	  {% block header %}
+	  <h1 class="header-title"><a href="{{ config.base_url }}">Jack Jamison</a></h1>
+	  {% endblock header %}
+	  <hr>
+	  <br>
       {% block content %} {% endblock content %}
     </div>
   </section>
diff --git a/zola-static/templates/blog-page.html b/zola-static/templates/blog-page.html
index f0f638e..8e2fa3d 100644
--- a/zola-static/templates/blog-page.html
+++ b/zola-static/templates/blog-page.html
@@ -1,9 +1,19 @@
 {% extends "base.html" %}
 
+{% block header %}
+<div class="header-container">
+  <div>
+	<h1 class="header-title">
+	  {{ page.title }}
+	</h1>
+	<p class="subtitle"><strong>{{ page.date }}</strong> {% if page.updated  %} <small>(updated {{ page.updated }})</small> {% endif %}</p>
+  </div>
+  <div>
+	<h1 class="header-title"><a href="{{ config.base_url }}">Jack Jamison</a></h1>
+  </div>
+</div>
+{% endblock header %}
+
 {% block content %}
-<h1 class="title">
-  {{ page.title }}
-</h1>
-<p class="subtitle"><strong>{{ page.date }}</strong></p>
 {{ page.content | safe }}
 {% endblock content %}
diff --git a/zola-static/templates/index.html b/zola-static/templates/index.html
index 297850d..f674f13 100644
--- a/zola-static/templates/index.html
+++ b/zola-static/templates/index.html
@@ -1,8 +1,20 @@
 {% extends "base.html" %}
 
 {% block content %}
-<h1 class="title">
-  Jack Jamison's Homepage
-</h1>
-<p><a href ="{{ get_url(path='@/blog/_index.md') }}">My blog</a></p>
+<h2>All about</h2>
+<ul>
+  <li><p><a href="{{ get_url(path='@/about-me.md') }}">About me</a></p></li>
+  <li><p><a href="{{ get_url(path='@/about-this-site.md') }}">About this site</a></p></li>
+</ul>
+<h2>Articles</h2>
+<ul>
+  <li><p><a href="{{ get_url(path='@/blog/_index.md') }}"></a></p></li>
+</ul>
+<h2>Links</h2>
+<ul>
+  <li><p><a href="https://github.com/JackJ30">GitHub</a></p></li>
+  <li><p><a href="https://jackj30.github.io">Old portfolio</a></p></li>
+</ul>
+<hr>
+<p class="footer-text"><a href="{{ get_url(path='@/blog/_index.md') }}">All articles sorted by date</a></p>
 {% endblock content %}
diff --git a/zola-static/templates/main-page.html b/zola-static/templates/main-page.html
new file mode 100644
index 0000000..8226656
--- /dev/null
+++ b/zola-static/templates/main-page.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block content %}
+{{ page.content | safe }}
+{% endblock content %}