diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 64320a7..4c3f409 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -6,6 +6,12 @@
       {{- if eq .Date.IsZero false }}
         <time>{{ .Date.Format "Monday, January 2, 2006" }}</time>
       {{- end }}
+      {{ if .Params.tags }}
+          │
+          {{range .Params.tags}}
+              <a class="btn" href="/tags/{{ . | urlize }}" role="button">{{ . }}</a>
+          {{end}}
+        {{end}}
       {{- if (and (eq .Lastmod.IsZero false) (ne .Lastmod .Date)) }}
         &mdash; last updated <time>{{ .Lastmod.Format "January 2, 2006" }}</time>
       {{- end }}
diff --git a/layouts/index.html b/layouts/index.html
index f877f05..c4d3f4c 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -24,6 +24,7 @@
             <a href="{{ .RelPermalink }}">Read More…</a>
           {{ end }}
         </div>
+        <hr>
       </article>
     {{ end }}
   {{ end }}
diff --git a/static/css/styles.css b/static/css/styles.css
index 268442a..f1ea81d 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -623,3 +623,9 @@ body {
 		display: none;
 	}
 }
+
+.btn {
+	padding: 0.3em;
+	border-width: 1px;
+	border-style: solid;
+}