diff --git a/src/pages/home.php b/src/pages/home.php
index 5d2e0e5e..210f7aba 100644
--- a/src/pages/home.php
+++ b/src/pages/home.php
@@ -10,6 +10,7 @@ use wishthis\Page;
 
 $page = new page(__FILE__, 'Home');
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 
@@ -74,4 +75,5 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
 ?>
diff --git a/src/pages/install.php b/src/pages/install.php
index bba42a15..aef5b818 100644
--- a/src/pages/install.php
+++ b/src/pages/install.php
@@ -15,6 +15,7 @@ if ($options && $options->getOption('isInstalled')) {
 
 $page = new page(__FILE__, 'Install');
 $page->header();
+$page->bodyStart();
 
 $step = isset($_POST['step']) ? $_POST['step'] : 1;
 
diff --git a/src/pages/login-as.php b/src/pages/login-as.php
index 72b4516b..a2a0c0d7 100644
--- a/src/pages/login-as.php
+++ b/src/pages/login-as.php
@@ -25,6 +25,7 @@ if (isset($_POST['email'])) {
 }
 
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 <main>
@@ -56,3 +57,4 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
diff --git a/src/pages/login.php b/src/pages/login.php
index 71c9adf1..40ced7e5 100644
--- a/src/pages/login.php
+++ b/src/pages/login.php
@@ -37,6 +37,7 @@ if (isset($_SESSION['user'])) {
 }
 
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 <main>
@@ -69,3 +70,4 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
diff --git a/src/pages/logout.php b/src/pages/logout.php
index bccc7a80..becda65d 100644
--- a/src/pages/logout.php
+++ b/src/pages/logout.php
@@ -18,6 +18,7 @@ if (PHP_SESSION_ACTIVE === session_status()) {
 }
 
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 <main>
@@ -33,3 +34,4 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
diff --git a/src/pages/power.php b/src/pages/power.php
index 847f37d1..f6b038b9 100644
--- a/src/pages/power.php
+++ b/src/pages/power.php
@@ -10,6 +10,7 @@ use wishthis\Page;
 
 $page = new page(__FILE__, 'Insufficient power');
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 
@@ -29,4 +30,5 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
 ?>
diff --git a/src/pages/register.php b/src/pages/register.php
index edf9f1f8..e2de1b7b 100644
--- a/src/pages/register.php
+++ b/src/pages/register.php
@@ -82,6 +82,7 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
 }
 
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 <main>
@@ -140,3 +141,4 @@ $page->navigation();
 </main>
 <?php
 $page->footer();
+$page->bodyEnd();
diff --git a/src/pages/update.php b/src/pages/update.php
index 2410c2e6..feca04fa 100644
--- a/src/pages/update.php
+++ b/src/pages/update.php
@@ -10,6 +10,7 @@ use wishthis\{Page, User};
 
 $page = new page(__FILE__, 'Update', 100);
 $page->header();
+$page->bodyStart();
 $page->navigation();
 
 /**
@@ -127,4 +128,5 @@ if ('POST' === $_SERVER['REQUEST_METHOD']) {
 
 <?php
 $page->footer();
+$page->bodyEnd();
 ?>
diff --git a/src/pages/wish.php b/src/pages/wish.php
index c99b17ae..8db44bfa 100644
--- a/src/pages/wish.php
+++ b/src/pages/wish.php
@@ -43,6 +43,7 @@ if (!$userIsAuthenticated) {
 
 $page = new page(__FILE__, $wish->title);
 $page->header();
+$page->bodyStart();
 $page->navigation();
 
 $referer = '/?page=wishlists&wishlist=' . $wish->wishlist;
@@ -213,4 +214,5 @@ $referer = '/?page=wishlists&wishlist=' . $wish->wishlist;
 
 <?php
 $page->footer();
+$page->bodyEnd();
 ?>
diff --git a/src/pages/wishlist.php b/src/pages/wishlist.php
index 8c332c02..4b28319a 100644
--- a/src/pages/wishlist.php
+++ b/src/pages/wishlist.php
@@ -21,6 +21,7 @@ if (!$wishlist->exists) {
 
 $page = new page(__FILE__, $wishlist->data['name']);
 $page->header();
+$page->bodyStart();
 $page->navigation();
 ?>
 
@@ -84,4 +85,5 @@ $page->navigation();
 
 <?php
 $page->footer();
+$page->bodyEnd();
 ?>