diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 7dbd8c3..3cfa5e0 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,24 +1,27 @@
-
- {{ block "title" . }}
-
- {{ partial "header.html" . }}
-
-
- {{ block "main" . }}
+
+ {{ block "title" . }}
+
{{ if .IsHome }}{{ $.Site.Title }}{{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }}{{ else }}{{ .Title }} :: {{ $.Site.Title }}{{ with $.Site.Params.Subtitle }} — {{ . }}{{ end }}{{ end }}
{{ end }}
-
+ {{ partial "head.html" . }}
+
+
+
+ {{ partial "header.html" . }}
- {{ block "footer" . }}
- {{ partial "footer.html" . }}
- {{ end }}
-
+
+ {{ block "main" . }}
+ {{ end }}
+
-
+ {{ block "footer" . }}
+ {{ partial "footer.html" . }}
+ {{ end }}
+
+
+ {{ if $.Site.GoogleAnalytics }}
+ {{ template "_internal/google_analytics.html" . }}
+ {{ end }}
+
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9bfe08d..1370e2d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -16,25 +16,10 @@