diff --git a/pelican/themes/notmyidea/templates/authors.html b/pelican/themes/notmyidea/templates/authors.html
index b145902e..f6429e8a 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>
+    <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..5fae82ff 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>
-
+    <ul>
     {%- for tag, articles in tags|sort %}
         <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
     {% endfor %}
+    </ul>
 </section>
 
 {% endblock %}