diff --git a/server.js b/server.js
index f8f4e6c..e5878b8 100644
--- a/server.js
+++ b/server.js
@@ -28,9 +28,8 @@ fastify.register(require('point-of-view'), {
       removeEmptyAttributes: true
     },
     partials: {
-      head: 'partials/head.hbs',
+      layout: 'layout.hbs',
       header: 'partials/header.hbs',
-      foot: 'partials/foot.hbs',
       footer: 'partials/footer.hbs',
     }
   },
diff --git a/views/home.hbs b/views/home.hbs
index 3533f31..9ee4f19 100644
--- a/views/home.hbs
+++ b/views/home.hbs
@@ -1,5 +1,6 @@
-{{> header }}
+{{#> layout }}
 
+{{#*inline "page-content-block" }}
 <section>
   <h2 class="subtitle">An attempt at a viable alternative to Goodreads</h2>
 
@@ -24,5 +25,6 @@
     {{ text }}
   </article>
 </section>
+{{/inline}}
 
-{{> footer }}
\ No newline at end of file
+{{/layout}}
\ No newline at end of file
diff --git a/views/partials/head.hbs b/views/layout.hbs
similarity index 56%
rename from views/partials/head.hbs
rename to views/layout.hbs
index ecfc21f..9fd667f 100644
--- a/views/partials/head.hbs
+++ b/views/layout.hbs
@@ -12,4 +12,29 @@
   <link rel="stylesheet" href="/styles/index.css">{{!-- This is controlled by the resources router. --}}
   <script src="index.js"></script>
 </head>
-<body>
\ No newline at end of file
+
+<body>
+{{#> header-block }}
+  {{> header }}
+{{/header-block}}
+
+<main class="container">
+{{#> page-content-block }}
+  {{!-- Wrap the actual page content in {{#*inline "page-content-block"}} to insert it here --}}
+{{/page-content-block}}
+</main>
+
+{{#> footer-block }}
+  {{> footer }}
+{{/footer-block}}
+
+{{#> scripts-block }}
+  <script>
+    (function () {
+      alert('test');
+    })();
+  </script>
+{{/scripts-block}}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/views/partials/foot.hbs b/views/partials/foot.hbs
deleted file mode 100644
index 60ec811..0000000
--- a/views/partials/foot.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-  (function() {
-    alert('test');
-  })();
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/views/partials/footer.hbs b/views/partials/footer.hbs
index 3c5c312..27ef13b 100644
--- a/views/partials/footer.hbs
+++ b/views/partials/footer.hbs
@@ -1,7 +1,3 @@
-</main>
-
 <footer>
   <p>test footer</p>
 </footer>
-
-{{> foot }}
\ No newline at end of file
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index d021ef1..356184c 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -1,5 +1,3 @@
-{{> head }}
-
 <header>
   <nav>
     <div class="brand">
@@ -21,5 +19,3 @@
     </div>
   </nav>
 </header>
-
-<main class="container">
\ No newline at end of file
