diff --git a/layouts/terms.html b/layouts/domains/taxonomy.html
similarity index 100%
rename from layouts/terms.html
rename to layouts/domains/taxonomy.html
diff --git a/layouts/domains/terms.html b/layouts/domains/terms.html
new file mode 100644
index 0000000..23b3933
--- /dev/null
+++ b/layouts/domains/terms.html
@@ -0,0 +1,32 @@
+{{ define "main" }}
+
+<div id="home">
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card mt-3">
+        <div class="card-body bg-light">
+          <h2 class="card-text"> {{or (i18n .Title) .Title }}</h2>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    {{- $site := .Site }}
+    {{ range .Data.Terms.ByCount -}}
+    <div class="col-md-{{or $site.Params.TaxoWidth 4}} mt-3">
+      <div class="card">
+        <a href="{{ .Page.Permalink }}" 
+           class="list-group-item d-flex justify-content-between align-items-center">
+          {{ .Page.Title }}
+          <span class="badge rounded-pill bg-secondary">{{ .Count }}</span>
+        </a>
+      </div>
+    </div>
+    {{- end }}
+  </div>
+
+</div>
+
+{{ end }}
diff --git a/layouts/taxonomy.html b/layouts/taxonomy.html
index 894572d..23b3933 100644
--- a/layouts/taxonomy.html
+++ b/layouts/taxonomy.html
@@ -1,48 +1,32 @@
 {{ define "main" }}
 
-<div class="home">
+<div id="home">
 
-  {{- $parents := .Params.Topics -}}
-  {{- $mainWidth := or (and $parents "8") "12" -}}
-  {{- $children := (where 
-                      (where .Site.Pages "Section" "topics") 
-                   "Params.topics" "intersect" (slice .Name))  -}}
   <div class="row">
-    <div class="col-md-{{ $mainWidth }}">
-      <div class="card mt-3 mb-3">
-        <div class="card-header">
-          <h2 class="card-text">{{i18n .Data.Singular}}: {{ .Title }}</h2>
-        </div>
-        <div class="card-body">
-          {{ with .Content -}}
-            <div class="card-text">{{ . }}</div>
-          {{- end }}
-          {{ with $children -}}
-            <p class="card-text">
-            {{- i18n "child-topics" -}}:
-            {{ range . -}}
-              <span class="badge rounded-pill bg-secondary m-1">
-                <a href="{{ .Permalink }}">{{ .Title }}</a>
-              </span>
-            {{- end }}
-            </p>
-          {{- end }}
+    <div class="col-md-12">
+      <div class="card mt-3">
+        <div class="card-body bg-light">
+          <h2 class="card-text"> {{or (i18n .Title) .Title }}</h2>
         </div>
       </div>
     </div>
-    {{ partial "parent-topics.html" . }}
   </div>
 
   <div class="row">
-    {{ $paginator := .Paginate (.Data.Pages) }}
-    {{ range $paginator.Pages }}
-      {{ partial "card.html" . }}
-    {{ end }}
-  </div> 
-    
-  <div class="row">
-    {{ partial "pagination.html" . }}
+    {{- $site := .Site }}
+    {{ range .Data.Terms.ByCount -}}
+    <div class="col-md-{{or $site.Params.TaxoWidth 4}} mt-3">
+      <div class="card">
+        <a href="{{ .Page.Permalink }}" 
+           class="list-group-item d-flex justify-content-between align-items-center">
+          {{ .Page.Title }}
+          <span class="badge rounded-pill bg-secondary">{{ .Count }}</span>
+        </a>
+      </div>
+    </div>
+    {{- end }}
   </div>
 
 </div>
+
 {{ end }}
diff --git a/layouts/topics/list.html b/layouts/term.html
similarity index 100%
rename from layouts/topics/list.html
rename to layouts/term.html
diff --git a/layouts/topics/taxonomy.html b/layouts/topics/taxonomy.html
index 894572d..23b3933 100644
--- a/layouts/topics/taxonomy.html
+++ b/layouts/topics/taxonomy.html
@@ -1,48 +1,32 @@
 {{ define "main" }}
 
-<div class="home">
+<div id="home">
 
-  {{- $parents := .Params.Topics -}}
-  {{- $mainWidth := or (and $parents "8") "12" -}}
-  {{- $children := (where 
-                      (where .Site.Pages "Section" "topics") 
-                   "Params.topics" "intersect" (slice .Name))  -}}
   <div class="row">
-    <div class="col-md-{{ $mainWidth }}">
-      <div class="card mt-3 mb-3">
-        <div class="card-header">
-          <h2 class="card-text">{{i18n .Data.Singular}}: {{ .Title }}</h2>
-        </div>
-        <div class="card-body">
-          {{ with .Content -}}
-            <div class="card-text">{{ . }}</div>
-          {{- end }}
-          {{ with $children -}}
-            <p class="card-text">
-            {{- i18n "child-topics" -}}:
-            {{ range . -}}
-              <span class="badge rounded-pill bg-secondary m-1">
-                <a href="{{ .Permalink }}">{{ .Title }}</a>
-              </span>
-            {{- end }}
-            </p>
-          {{- end }}
+    <div class="col-md-12">
+      <div class="card mt-3">
+        <div class="card-body bg-light">
+          <h2 class="card-text"> {{or (i18n .Title) .Title }}</h2>
         </div>
       </div>
     </div>
-    {{ partial "parent-topics.html" . }}
   </div>
 
   <div class="row">
-    {{ $paginator := .Paginate (.Data.Pages) }}
-    {{ range $paginator.Pages }}
-      {{ partial "card.html" . }}
-    {{ end }}
-  </div> 
-    
-  <div class="row">
-    {{ partial "pagination.html" . }}
+    {{- $site := .Site }}
+    {{ range .Data.Terms.ByCount -}}
+    <div class="col-md-{{or $site.Params.TaxoWidth 4}} mt-3">
+      <div class="card">
+        <a href="{{ .Page.Permalink }}" 
+           class="list-group-item d-flex justify-content-between align-items-center">
+          {{ .Page.Title }}
+          <span class="badge rounded-pill bg-secondary">{{ .Count }}</span>
+        </a>
+      </div>
+    </div>
+    {{- end }}
   </div>
 
 </div>
+
 {{ end }}