diff --git a/exampleSite/content/cont/tags.en.md b/exampleSite/content/cont/tags.en.md
index 6227dba465..02972bb6b4 100644
--- a/exampleSite/content/cont/tags.en.md
+++ b/exampleSite/content/cont/tags.en.md
@@ -5,11 +5,11 @@ weight: 40
 tags: ["documentation", "tutorial"]
 ---
 
-*Learn theme* support one default taxonomy of gohugo : the *tag* feature.
+*Learn theme* support one default taxonomy of gohugo: the *tag* feature.
 
 ## Configuration 
 
-Just add tags to any page : 
+Just add tags to any page: 
 
 ```markdown
 ---
@@ -23,7 +23,7 @@ tags: ["tutorial", "theme"]
 ## Behavior
 
 
-The tags are displayed at the top of the page, in the order wich they are enterted.
+The tags are displayed at the top of the page, in their insertion order.
 
 Each tag is a link to a *Taxonomy* page displaying all the articles with the given tag. 
 
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 3e3188e228..7800e2128f 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -85,7 +85,7 @@
           {{if and (not .IsHome) (not .Params.chapter) }}
             <h1>
               {{ if eq .Kind "taxonomy" }}
-                {{.Kind}} :
+                {{.Kind}} ::
               {{ end }}
               {{.Title}}
             </h1>
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index 3263cf09c8..48790d87cb 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,7 +1,7 @@
+{{ if .Params.tags }}
 <div class="tags">
-  {{ if .Params.tags }}
-    {{range .Params.tags}}
-      <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }} </a>
-    {{end}}
-  {{end}}
+{{range .Params.tags}}
+  <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+{{end}}
 </div>
+{{end}}
\ No newline at end of file