diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index d9598ac6e8..1b432b22d3 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,6 +1,16 @@
 {{ partial "header.html" . }}
 
-{{ .Content }}
+{{ if eq .Kind "section" }}
+	{{ .Content }}
+{{end}}
+
+{{ if eq .Kind "taxonomy" }}
+<ul>
+	{{ range .Pages }}
+		<li><a href="{{.URL}}">{{.Title}}</a></li>
+	{{ end }}
+</ul>
+{{end}}
 
 <footer class=" footline" >
 	{{with .Params.LastModifierDisplayName}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 79f6247d94..3e3188e228 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -75,13 +75,20 @@
               </div>
             </div>
             {{ end }}
-
+        <div id="head-tags">
+        {{ partial "tags.html" . }}
+        </div>
         {{ if .Params.chapter }}
           <div id="chapter">
         {{ end }}
         <div id="body-inner">
           {{if and (not .IsHome) (not .Params.chapter) }}
-            <h1>{{.Title}}</h1>
+            <h1>
+              {{ if eq .Kind "taxonomy" }}
+                {{.Kind}} :
+              {{ end }}
+              {{.Title}}
+            </h1>
           {{end}}
 
         {{define "breadcrumb"}}
@@ -93,3 +100,4 @@
             {{.value|safeHTML}}
           {{end}}
         {{end}}
+
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
new file mode 100644
index 0000000000..3263cf09c8
--- /dev/null
+++ b/layouts/partials/tags.html
@@ -0,0 +1,7 @@
+<div class="tags">
+  {{ if .Params.tags }}
+    {{range .Params.tags}}
+      <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>
+    {{end}}
+  {{end}}
+</div>
diff --git a/static/css/theme.css b/static/css/theme.css
index e443e71fae..068350f8d8 100644
--- a/static/css/theme.css
+++ b/static/css/theme.css
@@ -1127,4 +1127,52 @@ pre .copy-to-clipboard:hover {
     text-align: left;
 }
 
+#head-tags{
+  margin-left:1em;  
+  margin-top:1em;
+}
+
+#body .tags a.tag-link {
+    display: inline-block;
+    height: 2em;
+    line-height: 2em;
+    position: relative;
+    margin: 0 16px 8px 0;
+    padding: 0 10px 0 12px;
+    background: #777;    
+    -webkit-border-bottom-right-radius: 3px;    
+    border-bottom-right-radius: 3px;
+    -webkit-border-top-right-radius: 3px;    
+    border-top-right-radius: 3px;
+    -webkit-box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+    box-shadow: 0 1px 2px rgba(0,0,0,0.2);
+    color: #fff;
+    font-size: 0.8em;
+}
+
+#body .tags a.tag-link:before {
+    content: "";
+    position: absolute;
+    top:0;
+    left: -1em;
+    width: 0;
+    height: 0;
+    border-color: transparent #777 transparent transparent;
+    border-style: solid;
+    border-width: 1em 1em 1em 0;        
+}
+
+#body .tags a.tag-link:after {
+    content: "";
+    position: absolute;
+    top: 10px;
+    left: 1px;
+    float: left;
+    width: 5px;
+    height: 5px;
+    -webkit-border-radius: 50%;
+    border-radius: 50%;
+    background: #fff;    
+}
+
 /*# sourceMappingURL=theme.css.map */