diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index e5a6a429..934c224b 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -20,12 +20,13 @@
                     <li><a href="/category/yeah.html">yeah</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="/category/bar.html">bar</a> (1)</li>
-    <li><a href="/category/cat1.html">cat1</a> (4)</li>
-    <li><a href="/category/misc.html">misc</a> (4)</li>
-    <li><a href="/category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on A Pelican Blog</h1>
+    <ul>
+        <li><a href="/category/bar.html">bar</a> (1)</li>
+        <li><a href="/category/cat1.html">cat1</a> (4)</li>
+        <li><a href="/category/misc.html">misc</a> (4)</li>
+        <li><a href="/category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index ad887b7b..0ab16b05 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -24,12 +24,13 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="./category/bar.html">bar</a> (1)</li>
-    <li><a href="./category/cat1.html">cat1</a> (4)</li>
-    <li><a href="./category/misc.html">misc</a> (4)</li>
-    <li><a href="./category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on Alexis' log</h1>
+    <ul>
+        <li><a href="./category/bar.html">bar</a> (1)</li>
+        <li><a href="./category/cat1.html">cat1</a> (4)</li>
+        <li><a href="./category/misc.html">misc</a> (4)</li>
+        <li><a href="./category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 694a2bd6..a9ca139a 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -24,12 +24,13 @@
                     <li><a href="./category/bar.html">bar</a></li>
                 </ul></nav>
         </header><!-- /#banner -->
-<ul>
-    <li><a href="./category/bar.html">bar</a> (1)</li>
-    <li><a href="./category/cat1.html">cat1</a> (4)</li>
-    <li><a href="./category/misc.html">misc</a> (4)</li>
-    <li><a href="./category/yeah.html">yeah</a> (1)</li>
-</ul>
+    <h1>Categories on Alexis' log</h1>
+    <ul>
+        <li><a href="./category/bar.html">bar</a> (1)</li>
+        <li><a href="./category/cat1.html">cat1</a> (4)</li>
+        <li><a href="./category/misc.html">misc</a> (4)</li>
+        <li><a href="./category/yeah.html">yeah</a> (1)</li>
+    </ul>
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>links</h2>
diff --git a/pelican/themes/simple/templates/authors.html b/pelican/themes/simple/templates/authors.html
index 4914904f..9aee5db4 100644
--- a/pelican/themes/simple/templates/authors.html
+++ b/pelican/themes/simple/templates/authors.html
@@ -4,9 +4,8 @@
 
 {% block content %}
     <h1>Authors on {{ SITENAME }}</h1>
-
     <ul>
-    {%- for author, articles in authors|sort %}
+    {% for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
     </ul>
diff --git a/pelican/themes/simple/templates/categories.html b/pelican/themes/simple/templates/categories.html
index ec138480..7999de43 100644
--- a/pelican/themes/simple/templates/categories.html
+++ b/pelican/themes/simple/templates/categories.html
@@ -3,9 +3,10 @@
 {% block title %}{{ SITENAME }} - Categories{% endblock %}
 
 {% block content %}
-<ul>
-{% for category, articles in categories|sort %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
-{% endfor %}
-</ul>
+    <h1>Categories on {{ SITENAME }}</h1>
+    <ul>
+    {% for category, articles in categories|sort %}
+        <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a> ({{ articles|count }})</li>
+    {% endfor %}
+    </ul>
 {% endblock %}
diff --git a/pelican/themes/simple/templates/tags.html b/pelican/themes/simple/templates/tags.html
index b5d1482d..b90b0ac3 100644
--- a/pelican/themes/simple/templates/tags.html
+++ b/pelican/themes/simple/templates/tags.html
@@ -4,7 +4,9 @@
 
 {% block content %}
     <h1>Tags for {{ SITENAME }}</h1>
-    {%- for tag, articles in tags|sort %}
+    <ul>
+    {% for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 {% endblock %}