diff --git a/templates/macros/macros.html b/templates/macros/macros.html
index bc23a38..acfbb03 100644
--- a/templates/macros/macros.html
+++ b/templates/macros/macros.html
@@ -57,7 +57,7 @@
 {% endmacro tags %}
 
 {% macro page_header(title) %}
-<h1>
+<h1 class="title-container">
     {{ title }}
 </h1>
 {% endmacro content %}
@@ -80,7 +80,7 @@
 {% macro content(page) %}
 <main>
     <article>
-        <div class="title">
+        <div>
             {#<h1 class="title">{{ page.title }}</h1>#}
             {{ post_macros::page_header(title=page.title) }}
 
@@ -203,7 +203,7 @@
 
 {% macro list_title(pages, tag_name=false) %}
 {% if tag_name %}
-<h1>Entries tagged - "{{ term.name }}"</h1>
+<h1 class="title-container">Entries tagged - "{{ term.name }}"</h1>
 {% else %}
 <h1 class="page-title">All articles</h1>
 {% endif %}
diff --git a/templates/section.html b/templates/section.html
index 8f2cef3..6576f7e 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -10,7 +10,7 @@
 {% endif -%}
 
 <main class="list">
-	<div class="title-container">
+	<div>
 		{{ post_macros::page_header(title=section.title) }}
 	</div>
 	{%- if paginator %}
diff --git a/templates/tags/list.html b/templates/tags/list.html
index adfd51e..e0ec994 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -1,7 +1,8 @@
 {% extends "index.html" %}
 
 {% block main_content %}
-<h1 class="page-title">Tags</h1>
+
+{{ post_macros::page_header(title="Tags")}}
 
 <div class="tag-cloud">
     <ul class="tags">