diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 632ec60..25cbdd5 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -3,7 +3,7 @@
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "page-list.html" . }}
+    {{ partial "page-list/content.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index cc4f463..eceb1d3 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,17 +1,17 @@
 {{ define "header" -}}
-    {{ partial "page-variables-init.html" . }}
+    {{ partial "page-single/variables-init.html" . }}
     {{ partial "header.html" . }}
 {{- end -}}
 
 {{ define "content" -}}
-    {{ partial "page-single.html" . }}
+    {{ partial "page-single/content.html" . }}
 {{- end -}}
 
 {{ define "footer" -}}
     <div class="container content">
-        {{- partial "highlight-js.html" . -}}
-        {{- partial "commenting.html" . -}}
+        {{- partial "page-single/commenting.html" . -}}
     </div>
+    {{- partial "highlight-js.html" . -}}
     {{ partial "footer.html" . }}
-    {{ partial "page-variables-deinit.html" . }}
+    {{ partial "page-single/variables-deinit.html" . }}
 {{- end -}}
diff --git a/layouts/partials/commenting/disqus.html b/layouts/partials/commenting/disqus.html
deleted file mode 100644
index 437a303..0000000
--- a/layouts/partials/commenting/disqus.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id="disqus_thread"></div>
-<script type="text/javascript">
-      (function () {
-            // Check and don't inject Disqus on localhost/127.0.0.1
-            // however, it does not work for customised local domains, 
-            // e.g. example.test, example.dev
-            if (location.hostname === "localhost" || 
-            	location.hostname === "127.0.0.1" || 
-            	location.hostname === "") {
-                return;
-			}
-            var dsq = document.createElement('script');
-            dsq.type = 'text/javascript';
-            dsq.async = true;
-            var disqus_shortname = '{{ .Site.DisqusShortname }}';
-            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
-                  dsq);
-      })();
-</script>
-
-<noscript>
-	Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
-</noscript>
-<a href="http://disqus.com/" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c9a9c04..15b942b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,5 +1,6 @@
-{{ partial "footer/font-awesome-js.html" . }}
 {{ if (.Site.GoogleAnalytics) -}}
-  {{ "<!-- Google Analytics -->" | safeHTML }}
-  {{ template "_internal/google_analytics_async.html" . }}
+  <!-- Google Analytics -->
+  {{- template "_internal/google_analytics_async.html" . -}}
 {{- end }}
+{{ partial "footer/font-awesome-js.html" . }}
+{{ partial "footer/deferred-styles.html" . }}
diff --git a/layouts/partials/footer/deferred-styles.html b/layouts/partials/footer/deferred-styles.html
new file mode 100644
index 0000000..f36b1d9
--- /dev/null
+++ b/layouts/partials/footer/deferred-styles.html
@@ -0,0 +1,6 @@
+<noscript id="deferred-styles">
+  <!-- // styles to be deferred: 
+      // https://developers.google.com/speed/docs/insights/OptimizeCSSDelivery
+  <link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}/css/styles.css" />
+  -->
+</noscript>
diff --git a/layouts/partials/footer/font-awesome-js.html b/layouts/partials/footer/font-awesome-js.html
index 0d0c9d0..54f0e72 100644
--- a/layouts/partials/footer/font-awesome-js.html
+++ b/layouts/partials/footer/font-awesome-js.html
@@ -1 +1,4 @@
-<script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js" integrity="sha384-4oV5EgaV02iISL2ban6c/RmotsABqE4yZxZLcYMAdG7FAPsyHYAPpywE9PJo+Khy" crossorigin="anonymous"></script>
+<script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js"
+  integrity="sha384-4oV5EgaV02iISL2ban6c/RmotsABqE4yZxZLcYMAdG7FAPsyHYAPpywE9PJo+Khy"
+  crossorigin="anonymous">
+</script>
diff --git a/layouts/partials/footer/load-deferred-styles.html b/layouts/partials/footer/load-deferred-styles.html
new file mode 100644
index 0000000..27e949e
--- /dev/null
+++ b/layouts/partials/footer/load-deferred-styles.html
@@ -0,0 +1,18 @@
+<script>
+  var loadDeferredStyles = function () {
+    var addStylesNode = document.getElementById("deferred-styles");
+    if (addStylesNode) {
+      var replacement = document.createElement("div");
+      replacement.innerHTML = addStylesNode.textContent;
+      document.body.appendChild(replacement);
+      addStylesNode.parentElement.removeChild(addStylesNode);
+    }
+  };
+  var raf = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
+    window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+  if (raf) raf(function () {
+    window.setTimeout(loadDeferredStyles, 0);
+  });
+  else
+    window.addEventListener('load', loadDeferredStyles);
+</script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 03aaa35..c9e6476 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,9 +1,7 @@
 <head>
     <link href="http://gmpg.org/xfn/11" rel="profile">
     {{ partial "header/meta.html" . }}
-    {{ partial "header/highlight-css.html" . }}
-    <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/print.min.css" media="print">
-    <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/hyde-hyde.css">
+    {{ partial "header/styles.html" . }}
     {{ `<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
diff --git a/layouts/partials/header/highlight-css.html b/layouts/partials/header/highlight-css.html
index ce877a0..0d5ed5c 100644
--- a/layouts/partials/header/highlight-css.html
+++ b/layouts/partials/header/highlight-css.html
@@ -1,5 +1,5 @@
 {{- if .Site.Params.highlightjs -}}
-{{ "<!-- highlighting -->" | safeHTML }}
+<!-- highlightjs -->
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/{{ .Site.Params.highlightjsstyle | default "default" }}.min.css">
 {{- end -}}
 {{ if .Site.Params.PygmentsUseClasses -}}
diff --git a/layouts/partials/header/styles.html b/layouts/partials/header/styles.html
new file mode 100644
index 0000000..700acd5
--- /dev/null
+++ b/layouts/partials/header/styles.html
@@ -0,0 +1,3 @@
+{{ partial "header/highlight-css.html" . }}
+<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/hyde-hyde.css">
+<link rel="stylesheet" href="{{ .Site.BaseURL }}/css/print.min.css" media="print">
diff --git a/layouts/partials/page-list.html b/layouts/partials/page-list/content.html
similarity index 100%
rename from layouts/partials/page-list.html
rename to layouts/partials/page-list/content.html
diff --git a/layouts/partials/commenting.html b/layouts/partials/page-single/commenting.html
similarity index 53%
rename from layouts/partials/commenting.html
rename to layouts/partials/page-single/commenting.html
index e829626..64bcf29 100644
--- a/layouts/partials/commenting.html
+++ b/layouts/partials/page-single/commenting.html
@@ -1,7 +1,7 @@
 {{- if ne .Params.showcomments false -}}
     {{ if .Site.DisqusShortname -}}
-        {{- partial "commenting/disqus.html" . -}}
+        {{- partial "page-single/commenting/disqus.html" . -}}
     {{- else if .Site.Params.GraphCommentId -}}
-        {{- partial "commenting/graphcomment.html" . -}}
+        {{- partial "page-single/commenting/graphcomment.html" . -}}
     {{- end -}}
 {{- end }}
diff --git a/layouts/partials/page-single/commenting/disqus.html b/layouts/partials/page-single/commenting/disqus.html
new file mode 100644
index 0000000..5bb46a2
--- /dev/null
+++ b/layouts/partials/page-single/commenting/disqus.html
@@ -0,0 +1,29 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    /* 
+      Check and don't inject Disqus on localhost/127.0.0.1, however, it does not
+      work for customised local domains, e.g. example.test, example.dev
+    */
+    (function () {
+    if (location.hostname === "localhost" ||
+      location.hostname === "127.0.0.1" ||
+      location.hostname === "") {
+      return;
+    }
+    var dsq = document.createElement('script');
+    dsq.type = 'text/javascript';
+    dsq.async = true;
+    var disqus_shortname = '{{ .Site.DisqusShortname }}';
+    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+    (document.getElementsByTagName('head')[0] || 
+      document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
+</script>
+
+<noscript>
+  Please enable JavaScript to view the
+  <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
+</noscript>
+<a href="http://disqus.com/" class="dsq-brlink">comments powered by
+  <span class="logo-disqus">Disqus</span>
+</a>
diff --git a/layouts/partials/commenting/graphcomment.html b/layouts/partials/page-single/commenting/graphcomment.html
similarity index 100%
rename from layouts/partials/commenting/graphcomment.html
rename to layouts/partials/page-single/commenting/graphcomment.html
diff --git a/layouts/partials/page-single.html b/layouts/partials/page-single/content.html
similarity index 58%
rename from layouts/partials/page-single.html
rename to layouts/partials/page-single/content.html
index 8db6299..4645a30 100644
--- a/layouts/partials/page-single.html
+++ b/layouts/partials/page-single/content.html
@@ -6,11 +6,11 @@
       {{.}}
     </span>
     {{ end }} 
-    {{ partial "post-meta-top.html" . }}
+    {{ partial "page-single/post-meta-top.html" . }}
   </header>
   <div class="post">
     {{ .Content }}
   </div>
-  {{ partial "post-meta-bottom.html" . }}
-  {{ partial "post-related.html" . }}
+  {{ partial "page-single/post-meta-bottom.html" . }}
+  {{ partial "page-single/post-related.html" . }}
 </article>
diff --git a/layouts/partials/post-meta-bottom.html b/layouts/partials/page-single/post-meta-bottom.html
similarity index 100%
rename from layouts/partials/post-meta-bottom.html
rename to layouts/partials/page-single/post-meta-bottom.html
diff --git a/layouts/partials/post-meta-top.html b/layouts/partials/page-single/post-meta-top.html
similarity index 100%
rename from layouts/partials/post-meta-top.html
rename to layouts/partials/page-single/post-meta-top.html
diff --git a/layouts/partials/post-related.html b/layouts/partials/page-single/post-related.html
similarity index 61%
rename from layouts/partials/post-related.html
rename to layouts/partials/page-single/post-related.html
index 8e27368..7f25ce0 100644
--- a/layouts/partials/post-related.html
+++ b/layouts/partials/page-single/post-related.html
@@ -1,10 +1,10 @@
+{{ $related := .Site.RegularPages.Related . | first 5 }}
+{{ with $related -}}
 <div class="post__related">
     <!-- related content -->
-    {{ $related := .Site.RegularPages.Related . | first 5 }}
-    {{ with $related }}
     <h2>Related Articles</h2>
     <ul class="related-posts">
         {{ partial "posts-list.html" . }}
     </ul>
-    {{ end }}
-</div>
\ No newline at end of file
+</div>
+{{- end }}
diff --git a/layouts/partials/page-variables-deinit.html b/layouts/partials/page-single/variables-deinit.html
similarity index 100%
rename from layouts/partials/page-variables-deinit.html
rename to layouts/partials/page-single/variables-deinit.html
diff --git a/layouts/partials/page-variables-init.html b/layouts/partials/page-single/variables-init.html
similarity index 100%
rename from layouts/partials/page-variables-init.html
rename to layouts/partials/page-single/variables-init.html
diff --git a/layouts/shortcodes/fig.html b/layouts/shortcodes/fig.html
index 314bc45..0746971 100644
--- a/layouts/shortcodes/fig.html
+++ b/layouts/shortcodes/fig.html
@@ -1,22 +1,21 @@
 {{ $fig := newScratch }}
 {{ if .Get "caption" }}
-    {{ $fig.Set "caption" (.Get "caption") }}
+  {{ $fig.Set "caption" (.Get "caption") }}
 {{ else if .Get "alt" }}
-    {{ $fig.Set "caption" (.Get "alt") }}
+  {{ $fig.Set "caption" (.Get "alt") }}
 {{ end }}
 <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-    {{ with .Get "link"}}<a href="{{.}}">{{ end }}
-        <img src="{{ .Get "src" }}" 
-            {{ with $.Scratch.Get "caption" }}alt="{{ . }}"{{ end }}
-            {{ with .Get "align" }}align="{{ . }}"{{ end }}
-            {{ with .Get "width" }}width="{{ . }}"{{ end }}
-        />
-    {{ with .Get "link"}}</a>{{ end }}
-    {{ with ($fig.Get "caption") }}
+  {{ with .Get "link"}}<a href="{{.}}">{{ end }}
+    <img src="{{ .Get "src" }}" 
+        {{ with $.Scratch.Get "caption" }}alt="{{ . }}"{{ end }}
+        {{ with .Get "align" }}align="{{ . }}"{{ end }}
+        {{ with .Get "width" }}width="{{ . }}"{{ end }} />
+  {{ with .Get "link"}}</a>{{ end }}
+  {{ with ($fig.Get "caption") }}
     <figcaption>
-        <span class="img--caption">Figure {{ $.Page.Scratch.Get "fig" }}. {{ . }}</span>
+      <span class="img--caption">Figure {{ $.Page.Scratch.Get "fig" }}. {{ . }}</span>
     </figcaption>
-    {{ end }}
+  {{ end }}
 </figure>
 {{ .Page.Scratch.Add "fig" 1 }}
-{{ $fig.Delete "caption"}}
\ No newline at end of file
+{{ $fig.Delete "caption"}}