diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index d6a819c..87275c7 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,29 +1,22 @@
 {{ define "main" }}
+    {{ $data := .Data }}
   <article class="cf pa3 pa4-m pa4-l">
     <div class="measure-wide-l center f4 lh-copy nested-copy-line-height nested-links nested-img mid-gray">
       {{ .Content }}
     </div>
   </article>
   <div class="mw8 center">
-    {{ range $taxonomyname, $taxonomy := .Site.Taxonomies }}
-      <h1>
-        {{ $taxonomyname | humanize }}
-      </h1>
-
-      <section class="ph4">
-        {{ range $key, $value := $taxonomy }}
-          <h2 class="f1">
-            <a href="{{ $key | urlize }}" class="link blue hover-black">
-              {{ $key }}
-            </a>
-          </h2>
-          {{ range $value.Pages }}
-            {{ partial "summary.html" . }}
-          {{ end }}
+    <section class="ph4">
+      {{ range $key, $value := .Data.Terms }}
+        <h2 class="f1">
+          <a href="{{ "/" | relLangURL }}{{ $.Data.Plural | urlize }}/{{ $key | urlize }}" class="link blue hover-black">
+            {{ $.Data.Singular | humanize }}: {{ $key }}
+          </a>
+        </h2>
+        {{ range $value.Pages }}
+          {{ partial "summary.html" . }}
         {{ end }}
-      </section>
-
-    {{ end }}
-
+      {{ end }}
+    </section>
   </div>
 {{ end }}
diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html
index da2120e..0f140cf 100644
--- a/layouts/partials/summary.html
+++ b/layouts/partials/summary.html
@@ -1,11 +1,12 @@
 <div class="relative w-100 mb4 bg-white nested-copy-line-height">
   <div class="bg-white mb3 pa4 gray overflow-hidden">
+    <span class="f6 db">{{ humanize .Section }}</span>
     <h1 class="f3 near-black">
       <a href="{{ .URL }}" class="link black dim">
         {{ .Title }}
       </a>
     </h1>
-    <div class="nested-links f5 lh-copy nested-copy-line-height">      
+    <div class="nested-links f5 lh-copy nested-copy-line-height">
       {{ .Summary  }}
     </div>
   </div>