diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e9953d5db40..bff282b30f3 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -5,16 +5,17 @@
 {{- end }}
         {{- if or (eq .Kind "taxonomy") (eq .Kind "term") }}
           <ul>
-          {{- range .Pages }}
-            {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
+          {{- range .Data.Terms.Alphabetical }}
+            {{- if and .Page.Title (or (ne (.Page.Scratch.Get "relearnIsHiddenStem") true) (ne .Page.Site.Params.disableTagHiddenPages true) ) }}
+            <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a></li>
+            {{- end }}
+          {{- else }}
+            {{- range sort .Pages "Title" }}
+              {{- if and .Title (or (ne (.Scratch.Get "relearnIsHiddenStem") true) (ne .Site.Params.disableTagHiddenPages true) ) }}
             <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
+              {{- end }}
             {{- end }}
           {{- end }}
           </ul>
         {{- end }}
-          <footer class=" footline">
-          {{- with .Params.LastModifierDisplayName }}
-            <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{ with $.Date }} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{ end }}
-          {{- end }}
-          </footer>
 {{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 62c9d81fac9..3ae3b293973 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,9 +1,4 @@
 {{- partial "header.html" . }}
 
 {{ partial "content.html" . }}
-          <footer class="footline">
-          {{- with .Params.LastModifierDisplayName }}
-            <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{ with $.Date }} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{ end }}
-          {{- end }}
-          </footer>
 {{- partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 044c86c1499..31ee641bed0 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,3 +1,8 @@
+          <footer class=" footline">
+          {{- with .Params.LastModifierDisplayName }}
+            <i class='fas fa-user'></i> <a href="mailto:{{ $.Params.LastModifierEmail }}">{{ . }}</a> {{ with $.Date }} <i class='fas fa-calendar'></i> {{ .Format "02/01/2006" }}{{ end }}
+          {{- end }}
+          </footer>
         {{- if .Params.chapter }}
         </div> <!-- end chapter-->
         {{- end }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 77f34a4d696..98c458c63c7 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -104,7 +104,7 @@
 {{- partial "tags.html" . }}
           </div>
       {{- if and (not .IsHome) (not .Params.chapter) }}
-          <h1>{{ if eq .Kind "term" }}{{ .Data.Singular }} :: {{ end }}{{ .Title }}</h1>
+          <h1>{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} :: {{ end }}{{ .Title }}</h1>
       {{- end }}
 
 {{- define "breadcrumb" }}
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
index e61be76107e..74cdc732df4 100644
--- a/layouts/partials/tags.html
+++ b/layouts/partials/tags.html
@@ -1,7 +1,7 @@
 
 {{- if .Params.tags }}
 <div class="tags">
-{{- range .Params.tags }}
+{{- range sort .Params.tags }}
   <a class="tag-link" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
 {{- end }}
 </div>