diff --git a/layouts/partials/articles_for_section.html b/layouts/partials/articles_for_section.html
index d4897c6082a6d813bf638b4fde2807f94a29bbd1..880187a3b8a5cf4a65a4c8a1c17c5daabeedd5f6 100644
--- a/layouts/partials/articles_for_section.html
+++ b/layouts/partials/articles_for_section.html
@@ -1,4 +1,4 @@
-{{ $paginator := .Paginate (where .Data.Pages ".Section" .Section) }}
+{{ $paginator := .Paginate .Data.Pages }}
{{ partial "paginator.html" . }}
{{ range $index, $element := $paginator.Pages }}
<article class='post'>
diff --git a/layouts/partials/body_taxonomy.html b/layouts/partials/body_taxonomy.html
new file mode 100644
index 0000000000000000000000000000000000000000..b57a979571a88713a01433924795f798220388df
--- /dev/null
+++ b/layouts/partials/body_taxonomy.html
@@ -0,0 +1,6 @@
+<div class='row'>
+ <div class='col-md-8'>
+ {{ partial "articles_for_section.html" . }}
+ </div>
+ {{ partial "side_menu_taxonomy.html" . }}
+</div>
diff --git a/layouts/partials/top_list_taxonomy.html b/layouts/partials/top_list_taxonomy.html
new file mode 100644
index 0000000000000000000000000000000000000000..09d67e2b481280b4284e233a1b0f363cc01f9c68
--- /dev/null
+++ b/layouts/partials/top_list_taxonomy.html
@@ -0,0 +1,12 @@
+{{ partial "head.html" . }}
+<body class="list h-feed">
+ <div>
+ {{ partial "menu.html" . }}
+ <div class="main-wrapper">
+ <header class='subheader'>
+ <div class='container'>
+ <h2 class='page-title'> Categories <small> a listing of all the topics we cover organized in one place.</small>
+ </h2>
+ </div>
+ </header>
+ <main class="hfeed container" id="content" role="main">
diff --git a/layouts/taxonomy/tag.html b/layouts/taxonomy/tag.html
index d7a22a8f8be12189f01a87bb9c0b23a296797899..2c3af2b55e173e1b20b141b3802431ef0abb7c5c 100644
--- a/layouts/taxonomy/tag.html
+++ b/layouts/taxonomy/tag.html
@@ -1,24 +1,3 @@
-{{ partial "top_list_resource.html" . }}
-
- {{ $paginator := .Paginate .Data.Pages }}
- <div class='row'>
- <div class='col-md-8'>
- {{ partial "paginator.html" . }}
- {{ range $index, $element := $paginator.Pages }}
-
- <article class='post'>
- {{ partial "post_header_list.html" . }}
- <section class='post-content'>
- {{.Content }}
- </section>
- </article>
-
- {{ end }}
-
-{{ partial "paginator.html" . }}
-
- </div>
- {{ partial "side_menu_taxonomy.html" . }}
- </div>
-
- {{ partial "bottom_list.html" . }}
+{{ partial "top_list_taxonomy.html" . }}
+{{ partial "body_taxonomy.html" . }}
+{{ partial "bottom_list.html" . }}