diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index e41b2a8..b61deec 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -4,8 +4,8 @@
 <meta charset="utf-8">
 <title>{{ block "title" . }}{{ .Title }} – {{ .Site.Title }}{{ end }}</title>
 {{ block "meta" . }}{{ end }}
-{{- partialCached "meta.html" . -}}
-<link rel="canonical" href="{{ .Permalink }}">
+{{- partial "meta.html" . -}}
+{{- partialCached "meta_cache.html" . -}}
 {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "piwik.html" . }}{{ end -}}
 </head>
 
@@ -30,6 +30,7 @@
 {{ if $.Param "poweredby" }}<p>Powered by <a href="https://gohugo.io/">Hugo</a></p>{{ end -}}
 </footer>
 </div>
-{{ partialCached "scripts.html" . }}
+{{ partial "scripts.html" . -}}
+{{ partialCached "scripts_cache.html" . -}}
 </body>
 </html>
diff --git a/layouts/index.html b/layouts/index.html
index 57af4b4..0bff20a 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,7 +1,8 @@
 {{ define "title" }}{{ .Site.Title }}{{ end }}
 
 {{ define "meta" }}
-{{ partial "single_meta.html" . -}}
+{{- partial "section_meta.html" . -}}
+{{- partial "single_meta.html" . -}}
 {{ end }}
 
 {{ define "main" -}}
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 8663af9..681b7f3 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -3,5 +3,5 @@
 <meta name="HandheldFriendly" content="true">
 {{ .Hugo.Generator }}
 {{ with $.Param "contact" }}<meta name="contact" content="{{ . }}">{{ end }}
-<link rel="stylesheet" href="/css/styles.css{{ if $.Param "cacheBustCSS" }}?{{ readFile "/public/css/styles.css" | sha1 }}{{ end }}">
+<link rel="canonical" href="{{ .Permalink }}">
 <link rel="apple-touch-icon" href="/apple-touch-icon.png">
diff --git a/layouts/partials/meta_cache.html b/layouts/partials/meta_cache.html
new file mode 100644
index 0000000..8427c31
--- /dev/null
+++ b/layouts/partials/meta_cache.html
@@ -0,0 +1 @@
+<link rel="stylesheet" href="/css/styles.css{{ if $.Param "cacheBustCSS" }}?{{ readFile "/public/css/styles.css" | sha1 }}{{ end }}">
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 75cdd9b..eaea3ac 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -1,3 +1,2 @@
 {{ if $.Param "jquery" }}<script src="/js/jquery.min.js"></script>{{ end }}
 {{ if and ($.Param "jquery") ($.Param "slicknav") }}<script src="/js/jquery.slicknav.min.js"></script>{{ end }}
-{{ if $.Param "jquery" }}<script src="/js/script.js{{ if $.Param "cacheBustJS" }}?{{ readFile "/public/js/script.js" | sha1 }}{{ end }}"></script>{{ end }}
diff --git a/layouts/partials/scripts_cache.html b/layouts/partials/scripts_cache.html
new file mode 100644
index 0000000..4532ea1
--- /dev/null
+++ b/layouts/partials/scripts_cache.html
@@ -0,0 +1 @@
+{{ if $.Param "jquery" }}<script src="/js/script.js{{ if $.Param "cacheBustJS" }}?{{ readFile "/public/js/script.js" | sha1 }}{{ end }}"></script>{{ end }}