diff --git a/blag/templates/base.html b/blag/templates/base.html
index de1f6af..2dad0d7 100644
--- a/blag/templates/base.html
+++ b/blag/templates/base.html
@@ -23,9 +23,9 @@
         <h2>{{ site.description }}</h2>
         <ul>
           <li><h2><a href="/">Blog</a></h2></li>
+          <li><h2><a href="/archive.html">Archive</a></h2></li>
           <li><h2><a href="/tags/">Tags</a></h2></li>
           <li><h2><a href="/about.html">About Me</a></h2></li>
-          <li><h2><a href="/atom.xml">Feed</a></h2></li>
         </ul>
       </nav>
     </header>
@@ -38,10 +38,11 @@
     <footer>
       <p>This website was built with <a href="https://github.com/venthur/blag">blag</a>.
       <br>
+      Subscribe to the <a href="/atom.xml">atom feed</a>.
+      <br>
       Contact me via
-        <a rel="me" href="TODO">[TODO] Mastodon</a>,
-        <a href="TODO">[TODO] Twitter</a> or
-        <a href="TODO">[TODO] Github</a>.
+        <a rel="me" href="https://mastodon.social/[FIXME]">[FIXME] Mastodon</a> or
+        <a href="https://github.com/[FIXME]">[FIXME] Github</a>.
       </p>
     </footer>
   </body>
diff --git a/blag/templates/index.html b/blag/templates/index.html
index a88a011..002e185 100644
--- a/blag/templates/index.html
+++ b/blag/templates/index.html
@@ -3,18 +3,20 @@
 {% block title %}{{ site.title }}{% endblock %}
 
 {% block content %}
-{% for entry in archive[:10] %}
 
-  {% if entry.title %}
-  <h1><a href="{{entry.dst}}">{{entry.title}}</a></h1>
+{% for entry in archive[:15] %}
 
-  {% if entry.description %}
-  <p>— {{ entry.description }}</p>
-  {% endif %}
-
-  {% endif %}
-
-  <p>Written on {{ entry.date.date() }}.</p>
+  <article>
+    <header>
+      <time datetime="{{ entry.date }}">{{ entry.date.date() }}</time>
+      <div>
+      <h2><a href="{{ entry.dst }}">{{ entry.title }}</a></h2>
+      {% if entry.description %}
+      <p>— {{ entry.description }}</p>
+      {% endif %}
+      </div>
+    </header>
+  </article>
 
 {% endfor %}
 
diff --git a/blag/templates/tag.html b/blag/templates/tag.html
index 84bbe2c..4abd3bc 100644
--- a/blag/templates/tag.html
+++ b/blag/templates/tag.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Tag: {{ tag }}{% endblock %}
+{% block title %}#{{ tag }}{% endblock %}
 
 {% block content %}