diff --git a/templates/blog.html b/templates/blog.html
index eeeaa7c..009f200 100644
--- a/templates/blog.html
+++ b/templates/blog.html
@@ -4,15 +4,21 @@
 <h1 class="title">
   {{ section.title }}
 </h1>
+
+<p class="larger">sort by <a href="/tags">tags</a>.</p>
+
 <ul>
   <!-- If you are using pagination, section.pages will be empty.
        You need to use the paginator object -->  
   {% for page in section.pages %}
   <li>
-    <a href="{{ page.permalink | safe }}">{{ page.title }}</a> - by {{ page.authors }}, 
-    {{ page.date }}
+    <a href="{{ page.permalink | safe }}">{{ page.title }}</a> - by {{ page.authors }}
     <br>
     {{ page.description }}
+    <br>
+    written: {{ page.date }}
+    <br>
+    tags: {{ page.taxonomies.tags }}
   </li>
   {% endfor %}
 </ul>
diff --git a/templates/tags/list.html b/templates/tags/list.html
index 070014e..d21e608 100644
--- a/templates/tags/list.html
+++ b/templates/tags/list.html
@@ -1,8 +1,21 @@
 {% extends "base.html" %}
 
-{% if page.taxonomies.tags %}
-tags: 
-{% for tag in page.taxonomies.tags %}
-  <a href='{{ get_taxonomy_url(kind="tags", name=tag) | safe }}'>{{ tag }}</a>
-{% endfor %}
-{% endif %}
+{%- block title -%}
+{{ title_macros::title(page_title="Tags", main_title=config.title) }}
+{%- endblock -%}
+
+{% block content %}
+  <div class="post">
+    <h1 class="post-title">all tags</h1>
+
+    <ul>
+      {% for term in terms %}
+      <li class="tag-list">
+        <a href="{{ term.permalink | safe }}">
+          {{ term.name }} ({{ term.pages | length }} post{{ term.pages | length | pluralize }})
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endblock content %}
diff --git a/templates/tags/single.html b/templates/tags/single.html
index 8cf6fb1..fbea463 100644
--- a/templates/tags/single.html
+++ b/templates/tags/single.html
@@ -1,11 +1,6 @@
 {% extends "base.html" %}
 
 {% block content %}
-
-  {% block title %}
-   {{ config.title }} &middot; <a href="/tags">tags</a> &middot; {{ term.name }}
-  {% endblock title %}
-
   <h1>{{ term.name }}</h1>
 
   <div class="page-intro">
@@ -15,15 +10,13 @@
   <ul class="postlist">
     {% for page in term.pages | sort(attribute="date") | reverse %}
     <li class="postlist-item">
-      {% if page.date %}
-      <div class="date">
-        <time class="postlist-date">{{ page.date }}</time>
-      </div>
-      {% endif %}
-      <div class="postlist-head">
-        <h2><a class="postlist-title" href="{{ page.permalink }}">{{ page.title }}</a></h2>
-      </div>
-      <p class="postlist-description">{{ page.description }}</p>
+      <a href="{{ page.permalink | safe }}">{{ page.title }}</a> - by {{ page.authors }}
+      <br>
+      {{ page.description }}
+      <br>
+      written: {{ page.date }}
+      <br>
+      tags: {{ page.taxonomies.tags }}
     </li>
     {% endfor %}
   </ul>