diff --git a/CHANGELOG.md b/CHANGELOG.md
index a97099e..f223725 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## unreleased
+
+* improved default template
+
 ## [1.3.2] - 2022-06-29
 
 * Added --version option
diff --git a/blag/templates/archive.html b/blag/templates/archive.html
index c680429..e8f9cca 100644
--- a/blag/templates/archive.html
+++ b/blag/templates/archive.html
@@ -7,6 +7,11 @@
 
   {% if entry.title %}
   <h1><a href="{{entry.dst}}">{{entry.title}}</a></h1>
+
+  {% if entry.description %}
+  <p>— {{ entry.description }}</p>
+  {% endif %}
+
   {% endif %}
 
   <p>Written on {{ entry.date.date() }}.</p>
diff --git a/blag/templates/article.html b/blag/templates/article.html
index 5507a42..4080c36 100644
--- a/blag/templates/article.html
+++ b/blag/templates/article.html
@@ -3,5 +3,26 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block content %}
-{{ content }}
+
+  {% if title %}
+  <h2>{{ title }}</h2>
+  {% endif %}
+
+  <aside>
+    <p>published on {{ date.date() }}
+
+    {% if tags %}
+    · tagged with
+      {% for tag in tags|sort(case_sensitive=true) %}
+        {%- if not loop.first and not loop.last %}, {% endif -%}
+        {%- if loop.last and not loop.first %} and {% endif %}
+        <a href="/tags/{{ tag }}.html">#{{ tag }}</a>
+      {%- endfor %}
+    {% endif %}
+    </p>
+  </aside>
+
+
+  {{ content }}
+
 {% endblock %}
diff --git a/blag/templates/base.html b/blag/templates/base.html
index 68ab717..fc6f822 100644
--- a/blag/templates/base.html
+++ b/blag/templates/base.html
@@ -7,16 +7,20 @@
     <meta name="author" content="{{ site.author }}">
     {%- if description %}
     <meta name="description" content="{{ description }}">
-    {% endif %}
-    <title>{% block title %}{% endblock %}</title>
+    {%- else %}
+    <meta name="description" content="{{ site.description }}">
+    {%- endif %}
+    <title>{% block title %}{% endblock %} | {{ site.description }}</title>
   </head>
 
   <body>
     <header>
-      <h1>A Blog</h1>
+      <h1><a href="/">{{ site.title }}</a></h1>
       <nav>
+        <h2>{{ site.description }}</h2>
         <ul>
           <li><a href="/">Blog</a></li>
+          <li><a href="/tags/">Tags</a></li>
           <li><a href="/atom.xml">Atom Feed</a></li>
         </ul>
       </nav>
@@ -26,6 +30,7 @@
     {% block content %}
     {% endblock %}
     </main>
+
   </body>
 
 </html>
diff --git a/blag/templates/tag.html b/blag/templates/tag.html
index 198dc67..7abb4df 100644
--- a/blag/templates/tag.html
+++ b/blag/templates/tag.html
@@ -7,6 +7,11 @@
 
   {% if entry.title %}
   <h1><a href="/{{entry.dst}}">{{entry.title}}</a></h1>
+
+  {% if entry.description %}
+  <p>— {{ entry.description }}</p>
+  {% endif %}
+
   {% endif %}
 
   <p>Written on {{ entry.date.date() }}.</p>
