diff --git a/layouts/taxonomy/summary.html b/layouts/taxonomy-summary.html
similarity index 82%
rename from layouts/taxonomy/summary.html
rename to layouts/taxonomy-summary.html
index aa3d555..c95c632 100644
--- a/layouts/taxonomy/summary.html
+++ b/layouts/taxonomy-summary.html
@@ -1,4 +1,4 @@
 <article class="list-view{{ with .Section }} list-view--{{ . | urlize }}{{ end }}">
 <h2 class="title"><a href="{{ .RelPermalink }}">{{ .Title }}</a> <span class="meta">({{ .Data.Pages.Len }})</span></h2>
-<p>{{ .Description }}</p>
+{{ with .Description }}<p>{{ . }}</p>{{ end }}
 </article>
diff --git a/layouts/taxonomy.html b/layouts/taxonomy.html
new file mode 100644
index 0000000..7a7308e
--- /dev/null
+++ b/layouts/taxonomy.html
@@ -0,0 +1,13 @@
+{{ define "main" -}}
+<main class="main layout__main">
+<header>
+<h1 class="title">{{ .Title }}</h1>
+</header>
+
+{{ .Content }}
+
+{{ range .Pages.ByTitle -}}
+{{ .Render "taxonomy-summary" }}
+{{ end -}}
+</main>
+{{ end -}}