diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index de54839..af3faed 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -11,7 +11,13 @@
{{ if site.GoogleAnalytics }}
- {{ template "_internal/google_analytics.html" . }}
+
+ {{ if hasPrefix site.GoogleAnalytics "UA-"}}
+ {{ template "_internal/google_analytics_async.html" . }}
+ {{ else }}
+
+ {{ template "_internal/google_analytics.html" . }}
+ {{ end }}
{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 66e40a1..634504f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -31,7 +31,13 @@
{{ if site.GoogleAnalytics }}
- {{ template "_internal/google_analytics.html" . }}
+
+ {{ if hasPrefix site.GoogleAnalytics "UA-"}}
+ {{ template "_internal/google_analytics_async.html" . }}
+ {{ else }}
+
+ {{ template "_internal/google_analytics.html" . }}
+ {{ end }}
{{ end }}
diff --git a/layouts/partials/navigators/next-prev-navigator.html b/layouts/partials/navigators/next-prev-navigator.html
index 8ac3513..378c97d 100644
--- a/layouts/partials/navigators/next-prev-navigator.html
+++ b/layouts/partials/navigators/next-prev-navigator.html
@@ -5,7 +5,7 @@
{{ $pages := slice }}
-{{ if isset site "Menus" }}
+{{ if isset site.Menus "sidebar" }}
{{ $pages = partial "helpers/get-pages.html" site.Menus.sidebar }}
{{ end }}