diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 36beb83ac..2254deb60 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -13,18 +13,7 @@
         {{ i18n "last_updated" }} {{ partial "date-fmt.html" .}} 
           {{ partial "github.html" . }}
       </p>
-      <ul class="tags">
-          {{ range (.GetTerms "tags") }}
-          <li><a href="{{ .Permalink }}">
-          {{if (eq $.Site.Language.Lang "en")}}
-            {{ .LinkTitle | humanize }}
-          {{else}}
-            {{ .LinkTitle }}
-          {{end}}
-            </a>
-           </li>
-          {{ end }}
-      </ul>
+      {{partial "tags.html" .}}
       {{partial "toc.html" .}}
       {{partial "textprocessing.html" . }}
     </article>
diff --git a/layouts/index.html b/layouts/index.html
index c7871e9f6..6a7a0e326 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -8,13 +8,14 @@
     <!-- Begin actual content -->
     {{partial "header.html" .}}
     <article>
-        {{partial "toc.html" .}}
-        {{partial "textprocessing.html" . }}
-        {{if $.Site.Data.config.enableRecentNotes}}
-          {{partial "recent.html" . }}
-        {{end}}
+      {{partial "toc.html" .}}
+      {{partial "textprocessing.html" . }}
+      {{partial "allTags.html" .}}
+      {{partial "recent.html" . }}
+        <!-- {{if $.Site.Data.config.enableRecentNotes}} -->
+        <!-- {{end}} -->
     </article>
-    {{partial "footerIndex.html" .}}
+    <!-- {{partial "footerIndex.html" .}} -->
 </div>
 </body>
 </html>
diff --git a/layouts/partials/allTags.html b/layouts/partials/allTags.html
new file mode 100644
index 000000000..32a477cff
--- /dev/null
+++ b/layouts/partials/allTags.html
@@ -0,0 +1,9 @@
+<h2>Topics</h2><br>
+{{range $name, $taxonomy := .Site.Taxonomies.tags}} {{ $cnt := .Count }}
+{{ with $.Site.GetPage (printf "/tags/%s" $name) }}
+    <div class="tagbutton">
+  <a href={{ .RelPermalink }} title="All pages with tag <i>{{$name}}</i>">{{$name}}</a>
+  <sup>{{$cnt}}</sup>
+    </div>
+{{end}}
+{{end}}
\ No newline at end of file
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
new file mode 100644
index 000000000..04202c1f2
--- /dev/null
+++ b/layouts/partials/tags.html
@@ -0,0 +1,5 @@
+<ul class="tags">
+    {{ range (.GetTerms "tags") }}
+    <li><a href="{{ .Permalink }}">{{ .LinkTitle | title}}</a></li>
+    {{ end }}
+</ul>
\ No newline at end of file