diff --git a/config.toml b/config.toml
index 8d79292d..e13d8375 100644
--- a/config.toml
+++ b/config.toml
@@ -4,6 +4,7 @@ title = "Jake Jarvis"
 
 canonifyURLs = true
 
+disableFastRender = true
 disableHugoGeneratorInject = true   # don't worry, inserted manually :)
 disableKinds = ["taxonomy", "taxonomyTerm"]
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
deleted file mode 100644
index e57071d7..00000000
--- a/layouts/_default/baseof.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ partial "header.html" . }}{{ block "main" . }}{{ end }}{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
new file mode 100644
index 00000000..bfd73d1d
--- /dev/null
+++ b/layouts/_default/list.html
@@ -0,0 +1,21 @@
+{{ partial "header.html" . }}
+{{ partial "blog-header.html" . }}
+
+<div id="archive">
+  {{ range .Data.Pages.GroupByDate "2006" }}
+  <div class="year">
+    <h2>{{ .Key }}</h2>
+    <ul>
+        {{ range .Pages }}
+        <li class="item">
+          <div class="date">{{ .Date.Format "Jan 2" }}</div>
+          <div class="title"><a href="{{ .Permalink }}">{{ .Title }}</a></div>
+        </li>
+        {{ end }}
+    </ul>
+  </div>
+  {{ end }}
+</div>
+
+{{ partial "blog-footer.html" . }}
+{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/notes/single.html b/layouts/_default/single.html
similarity index 85%
rename from layouts/notes/single.html
rename to layouts/_default/single.html
index 04a8532e..9e258aa4 100644
--- a/layouts/notes/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,6 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
+{{ partial "blog-header.html" . }}
+
 <div id="single">
   <div id="info">
     <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
@@ -24,4 +26,6 @@
     {{ .Content }}
   </div>
 </div>
-{{ end }}
\ No newline at end of file
+
+{{ partial "blog-footer.html" . }}
+{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 4a110649..8ba0cf52 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,4 +1,4 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
     <div itemscope itemtype="http://schema.org/Person">
       <img itemprop="image" id="me" src="{{ "me.jpg" | absURL }}" alt="Photo of Jake Jarvis" title="Photo of Jake Jarvis">
       <h1>Hi! I'm <span itemprop="name">Jake Jarvis</span>. <span id="wave">&#x1F44B;<!--&#x1F3FB;--></span></h1>
@@ -24,4 +24,4 @@
         <div id="info"><span id="copyright"><a href="https://web.archive.org/web/20010501000000*/jakejarvis.com" title="View Old Versions on Wayback Machine" id="wayback" target="_blank" rel="noopener noreferrer nofollow">&copy; 2001 &ndash;</a> {{ now.Format "2006" }} <a itemprop="url" rel="me author" href="{{ .Site.BaseURL }}" title="Jake Jarvis">Jake Jarvis</a>.</span> <a href="https://git.jarv.is/jake/jarv.is" title="View Source Code Repository" id="source" target="_blank" rel="noopener">View source.</a></div>
       </div>
     </div>
-{{ end }}
\ No newline at end of file
+{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/notes/baseof.html b/layouts/notes/baseof.html
deleted file mode 100644
index f78a37e5..00000000
--- a/layouts/notes/baseof.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ partial "header.html" . }}
-{{ partial "blog-header.html" . }}
-{{ block "main" . }}{{ end }}
-{{ partial "blog-footer.html" . }}
-{{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/layouts/notes/list.html b/layouts/notes/list.html
deleted file mode 100644
index 70070709..00000000
--- a/layouts/notes/list.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{{ define "main" }}
-<div id="archive">
-
-{{ range .Data.Pages.GroupByDate "2006" }}
-<div class="year">
-  <h2>{{ .Key }}</h2>
-  <ul>
-      {{ range .Pages }}
-      <li class="item">
-        <div class="date">{{ .Date.Format "Jan 2" }}</div>
-        <div class="title"><a href="{{ .Permalink }}">{{ .Title }}</a></div>
-      </li>
-      {{ end }}
-  </ul>
-</div>
-{{ end }}
-
-</div>
-{{ end }}
\ No newline at end of file
diff --git a/static/style.css b/static/style.css
index 50e87222..af580fb4 100644
--- a/static/style.css
+++ b/static/style.css
@@ -700,8 +700,13 @@ body#notes div#content blockquote {
 body#notes div#content code {
   font-family: monospace;
   background: #f4f4f4;
+  padding: 0.2em;
+  border: 1px solid #cccccc;
+  font-size: 16px;
+}
+
+body#notes div#content pre code {
   padding: 1em 1.5em;
-  font-size: 15px;
   line-height: 1.6;
   page-break-inside: avoid;
   border: 1px solid #ddd;