diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index 4022cbab..20df01d2 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -26,7 +26,10 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Authors on A Pelican Blog</h1>        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
+    <h1>Authors on A Pelican Blog</h1>
+    <ul>
+        <li><a href="/author/alexis-metaireau.html">Alexis Métaireau</a> (2)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -48,4 +51,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 54b1db3e..763cfe77 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -46,8 +46,6 @@ YEAH !</p>
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -67,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 51fada93..225eae6e 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -56,8 +56,6 @@
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -77,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index 66aa05e8..f3035f8e 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -56,8 +56,6 @@
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -77,4 +75,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index c064d8a0..cd9d01b2 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -46,8 +46,6 @@ YEAH !</p>
 </div>
                 </article>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="social">
                         <h2>social</h2>
@@ -67,4 +65,4 @@ YEAH !</p>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index 8172f6ae..0eda47d7 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -26,12 +26,15 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Tags for A Pelican Blog</h1>        <li><a href="/tag/bar.html">bar</a> (3)</li>
+    <h1>Tags for A Pelican Blog</h1>
+    <ul>
+        <li><a href="/tag/bar.html">bar</a> (3)</li>
         <li><a href="/tag/baz.html">baz</a> (1)</li>
         <li><a href="/tag/foo.html">foo</a> (2)</li>
         <li><a href="/tag/foobar.html">foobar</a> (1)</li>
         <li><a href="/tag/oh.html">oh</a> (1)</li>
         <li><a href="/tag/yeah.html">yeah</a> (1)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -53,4 +56,4 @@
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index eb2becfd..d9aaef34 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -30,7 +30,10 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Authors on Alexis' log</h1>        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+    <h1>Authors on Alexis' log</h1>
+    <ul>
+        <li><a href="./author/alexis-metaireau.html">Alexis Métaireau</a> (10)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -76,4 +79,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 113b8841..80c46de5 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -55,8 +55,6 @@ YEAH !</p>
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -100,4 +98,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index c8e066c8..11fd181d 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -63,8 +63,6 @@
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -108,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index c62d3418..c224992e 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -63,8 +63,6 @@
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -108,4 +106,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 288f4ec7..49c78359 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -55,8 +55,6 @@ YEAH !</p>
     Page 1 / 1
 </p>
             </aside><!-- /#featured -->
-            </ol><!-- /#posts-list -->
-            </section><!-- /#content -->
         <section id="extras" class="body">
                 <div class="blogroll">
                         <h2>blogroll</h2>
@@ -100,4 +98,4 @@ YEAH !</p>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 2e70c9e8..ba8d53a4 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -30,12 +30,15 @@
         </header><!-- /#banner -->
 
 <section id="content" class="body">
-    <h1>Tags for Alexis' log</h1>        <li><a href="./tag/bar.html">bar</a> (3)</li>
+    <h1>Tags for Alexis' log</h1>
+    <ul>
+        <li><a href="./tag/bar.html">bar</a> (3)</li>
         <li><a href="./tag/baz.html">baz</a> (1)</li>
         <li><a href="./tag/foo.html">foo</a> (2)</li>
         <li><a href="./tag/foobar.html">foobar</a> (1)</li>
         <li><a href="./tag/oh.html">oh</a> (1)</li>
         <li><a href="./tag/yeah.html">yeah</a> (1)</li>
+    </ul>
 </section>
 
         <section id="extras" class="body">
@@ -81,4 +84,4 @@
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index b145902e..e61a332f 100644
--- a/pelican/themes/notmyidea/templates/authors.html
+++ b/pelican/themes/notmyidea/templates/authors.html
@@ -6,9 +6,11 @@
 
 <section id="content" class="body">
     <h1>Authors on {{ SITENAME }}</h1>
-    {%- for author, articles in authors|sort %}
+    <ul>
+    {% for author, articles in authors|sort %}
         <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 </section>
 
 {% endblock %}
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 2d45bb2a..c8982476 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -42,12 +42,15 @@
             </article></li>
         {% endif %}
         {% if loop.last %}
-            </ol><!-- /#posts-list -->
-            {% if loop.last and (articles_page.has_previous()
-            or not articles_page.has_previous() and loop.length > 1) %}
+            {% if loop.length > 1 %}
+                </ol><!-- /#posts-list -->
+            {% endif %}
+            {% if articles_page.has_previous() or loop.length > 1 %}
                 {% include 'pagination.html' %}
             {% endif %}
-            </section><!-- /#content -->
+            {% if loop.length > 1 %}
+                </section><!-- /#content -->
+            {% endif %}
         {% endif %}
     {% endfor %}
 {% else %}
diff --git a/pelican/themes/notmyidea/templates/taglist.html b/pelican/themes/notmyidea/templates/taglist.html
index c792fd7d..b8f4ba95 100644
--- a/pelican/themes/notmyidea/templates/taglist.html
+++ b/pelican/themes/notmyidea/templates/taglist.html
@@ -1,2 +1,2 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> {% endfor %}</p>{% endif %}
 {% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}
diff --git a/pelican/themes/notmyidea/templates/tags.html b/pelican/themes/notmyidea/templates/tags.html
index 76955f27..fb099557 100644
--- a/pelican/themes/notmyidea/templates/tags.html
+++ b/pelican/themes/notmyidea/templates/tags.html
@@ -6,10 +6,11 @@
 
 <section id="content" class="body">
     <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>
 </section>
 
 {% endblock %}