diff --git a/layouts/_default/category.html b/layouts/_default/category.html
new file mode 100644
index 0000000..cc1ff6b
--- /dev/null
+++ b/layouts/_default/category.html
@@ -0,0 +1,37 @@
+{{ define "header" }}
+  {{ partial "header.html" . }}
+{{ end }}
+
+{{ define "main" }}
+<header class="page">
+  <h1>{{ .Title }}</h1>
+</header>
+
+{{- $pagesByTag := dict -}}
+{{- range $page := .Pages }}
+  {{- range $tag := .GetTerms "tags" -}}
+    {{- $tagName := $tag.Name -}}
+    {{- if not (in $pagesByTag $tagName) -}}
+      {{- $pagesByTag = merge $pagesByTag (dict $tagName (slice $page)) -}}
+    {{- else -}}
+      {{- $pagesForTag := index $pagesByTag $tagName -}}
+      {{- $pagesForTag = $pagesForTag | append $page -}}
+      {{- $pagesByTag = merge $pagesByTag (dict $tagName $pagesForTag) -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+
+{{ range $tag, $pages := $pagesByTag }}
+<h3>{{ $tag }}</h3>
+<ul>
+  {{- range $pages -}}
+  <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+  {{- end -}}
+</ul>
+{{ end }}
+
+{{ end }}
+
+{{ define "footer" }}
+  {{ partial "footer.html" . }}
+{{ end }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
index 87c2966..5ae43d7 100644
--- a/layouts/_default/term.html
+++ b/layouts/_default/term.html
@@ -4,24 +4,14 @@
 
 {{ define "main" }}
 <header class="page">
-  <h1>Term: {{ .Page.Title }}</h1>
+  <h1>{{ .Title }}</h1>
 </header>
 
-<h2>Pages</h2>
 <ul>
-  {{- range .Pages -}}
+{{- range .Pages -}}
   <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
-  {{- end -}}
+{{- end -}}
 </ul>
-
-<h2>Terms</h2>
-<pre>{{ jsonify (dict "indent" "  ") .Data.Terms }}</pre>
-<ul>
-  {{- range $term, $page := .Data.Terms.Alphabetical -}}
-  <li>{{ $term }} -- {{ $page }}</li>
-  {{- end -}}
-</ul>
-
 {{ end }}
 
 {{ define "footer" }}
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index e6a8027..4464b52 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -4,23 +4,19 @@
 
 {{ define "main" }}
 <header class="page">
-  <h1>Terms: {{ .Page.Title }}</h1>
+  <h1>{{ .Title }}</h1>
 </header>
 
-<h2>Pages</h2>
+{{ .Content }}
+
+{{- range .Data.Terms.Alphabetical -}}
+<h2>{{ .Name | title }}</h2>
 <ul>
-  {{- range .Data.Pages -}}
+  {{- range .WeightedPages -}}
   <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
   {{- end -}}
 </ul>
-
-<h2>Terms</h2>
-<ul>
-  {{- range $term, $page := .Data.Terms.Alphabetical -}}
-  <li>{{ $term }} -- {{ $page }}</li>
-  {{- end -}}
-</ul>
-
+{{- end -}}
 {{ end }}
 
 {{ define "footer" }}