diff --git a/source/themes/opdavies/opdavies/_layouts/post.html.twig b/source/themes/opdavies/opdavies/_layouts/post.html.twig
index a2d4ea93..ed599bf0 100644
--- a/source/themes/opdavies/opdavies/_layouts/post.html.twig
+++ b/source/themes/opdavies/opdavies/_layouts/post.html.twig
@@ -1,7 +1,8 @@
 {% extends 'default' %}
 
 {% block content_wrapper %}
-  <h1>{{ page.title }}</h1>
-  Posted: {{ page.date | date('jS F Y') }}
-  {% block content %}{% endblock %}
+  <div class="content">
+    {% include 'post-header' %}
+    {% block content %}{% endblock %}
+  </div>
 {% endblock %}
\ No newline at end of file
diff --git a/source/themes/opdavies/opdavies/_partials/post-header.html.twig b/source/themes/opdavies/opdavies/_partials/post-header.html.twig
new file mode 100644
index 00000000..cae6dc8e
--- /dev/null
+++ b/source/themes/opdavies/opdavies/_partials/post-header.html.twig
@@ -0,0 +1,10 @@
+<h1>{{ page.title | title }}</h1>  
+<p class="posted">Posted: {{ page.date | date('jS F Y') }}</p>
+{#
+{% if page.tags %}
+  Tags:
+  {% for tag in page.tags %}
+    {{ tag }}{% if not loop.last %},{% else %}.{% endif %}
+  {% endfor %}
+{% endif %}
+#}
\ No newline at end of file