diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index cc3f6535..6b8d7deb 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,9 +1,14 @@
 {{ define "main" }}
-    <h1>Posts</h1>
-    {{ range .Data.Pages }}
-    <article>
-        <h2>{{ .Title }}</h2>
-        {{ .Content }}
-    </article>
-    {{ end }}
+{{ $ctx := . }}
+<h1>
+  {{ if .Data.Singular }}
+    <span class="taxonomy-type"> {{ .Data.Singular | title }}</span> 
+  {{ end }}
+  {{ .Title }}
+</h1>
+{{ range .Data.Pages }} 
+  <article>
+    <h2><a href="{{ .URL }}">{{ .Title }}</a></h2>
+  </article>
+{{ end }}
 {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e3e685b2..120aeffd 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,5 @@
 {{ define "main" }}
+{{ $ctx := . }}
 <main class="row single">
   <section class="col-12 col-md-8 offset-md-2 section">
     <article>
@@ -20,13 +21,13 @@ <h2 class="posted">Posted on <time>{{ .Date.Format "Jan 2" }}</time> by {{ .Para
   <aside class="col-12 col-md-10 offset-md-1 aside">
     <div class="row">
       <ul class="col categories">
-        {{ range .Params.topics }}
-        <li><a href="{{ .BaseURL }}/topics/{{ . | urlize }}">{{ . }}</a> </li>
+        {{ range .Params.categories }}
+        <li><a href="{{ $ctx.Site.BaseURL }}/categories/{{ . | urlize }}">{{ . }}</a></li>
         {{ end }}
       </ul>
       <ul class="col tags">
         {{ range .Params.tags }}
-          <li> <a href="{{ .BaseURL }}/tags/{{ . | urlize }}">{{ . }}</a> </li>
+        <li> <a href="{{ $ctx.Site.BaseURL }}/tags/{{ . | urlize }}">{{ . }}</a> </li>
         {{ end }}
       </ul>
       <div class="col-12">
diff --git a/static/scss/lists.scss b/static/scss/lists.scss
new file mode 100644
index 00000000..bba82b5f
--- /dev/null
+++ b/static/scss/lists.scss
@@ -0,0 +1,3 @@
+.taxonomy-type::after {
+  content: ":";
+}
diff --git a/static/scss/main.scss b/static/scss/main.scss
index 2376b8bc..f8880e72 100644
--- a/static/scss/main.scss
+++ b/static/scss/main.scss
@@ -24,6 +24,7 @@ h1, h2, h3, h4, h5, h6 {
 @import "./section.scss";
 @import "./footer.scss";
 @import "./front-page.scss";
+@import "./lists.scss";
 
 .front {
   &-list {