diff --git a/layouts/404.html b/layouts/404.html
index b23049cbc2..51e7cca82d 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -1,6 +1,6 @@
{{- partial "page-meta.hugo" . }}
-
+
{{- partial "meta.html" . }}
{{- .Scratch.Add "title" "" }}
@@ -28,7 +28,7 @@
-
>
+ >
{{ T "title-404" }}
{{ T "message-404" }}
diff --git a/layouts/partials/_taxonomy.html b/layouts/partials/_taxonomy.html
index 0bb4bb6232..fc5b5b02ef 100644
--- a/layouts/partials/_taxonomy.html
+++ b/layouts/partials/_taxonomy.html
@@ -1,6 +1,6 @@
{{- partial "page-meta.hugo" . }}
{{- partial "header.html" . }}
-
+
{{ if eq .Kind "term" }}{{ .Data.Singular | humanize }} {{ default "::" .Site.Params.titleSeparator }} {{ end }}{{ .Title }}
diff --git a/layouts/partials/archetypes/chapter/article.html b/layouts/partials/archetypes/chapter/article.html
index 82c957b5ac..9c9ce89d78 100644
--- a/layouts/partials/archetypes/chapter/article.html
+++ b/layouts/partials/archetypes/chapter/article.html
@@ -1,7 +1,7 @@
{{- $page := .page }}
{{- $content := .content }}
{{- with $page }}
-
+
{{ partial "heading-pre.html" . }}{{ T "Chapter" .Params.Weight }}
{{ .Title }}
{{ partial "heading-post.html" . }}
diff --git a/layouts/partials/archetypes/default/article.html b/layouts/partials/archetypes/default/article.html
index 2d6a20efe1..f0a717534e 100644
--- a/layouts/partials/archetypes/default/article.html
+++ b/layouts/partials/archetypes/default/article.html
@@ -1,7 +1,7 @@
{{- $page := .page }}
{{- $content := .content }}
{{- with $page }}
-
+
{{ partial "heading-pre.html" . }}{{ .Title }}
{{ partial "heading-post.html" . }}
{{ $content | safeHTML }}
diff --git a/layouts/partials/archetypes/deprecated-chapter/article.html b/layouts/partials/archetypes/deprecated-chapter/article.html
index db6ad21690..997383c03c 100644
--- a/layouts/partials/archetypes/deprecated-chapter/article.html
+++ b/layouts/partials/archetypes/deprecated-chapter/article.html
@@ -1,7 +1,7 @@
{{- $page := .page }}
{{- $content := .content }}
{{- with $page }}
-
+
{{ $content | safeHTML }}