diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 941d30e..1452525 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -13,7 +13,7 @@ $jsFiles = [
 ];
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
-<div class="header small">
+<header class="small">
     <h1>
         <a href="/maps" title="Back to playable maps">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
@@ -47,7 +47,7 @@ $jsFiles = [
          --><span id="deleted" class="bold">0</span><!--
         --></span>
     </p>
-</div>
+</header>
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
     <form id="metadataForm" class="marginTop">
diff --git a/views/error/404.php b/views/error/404.php
index 7538936..6751fa3 100644
--- a/views/error/404.php
+++ b/views/error/404.php
@@ -1,7 +1,6 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>404 | Page not found</h2>
     <p>The requested URL was not found on this server. <a href="/" title="MapGuesser">Back to start.</a></p>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/game.php b/views/game.php
index 966a3fc..03abc84 100644
--- a/views/game.php
+++ b/views/game.php
@@ -8,7 +8,7 @@ $jsFiles = [
 ];
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
-<div class="header small">
+<header class="small">
     <h1>
         <a href="/maps" title="Back to playable maps">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
@@ -20,7 +20,7 @@ $jsFiles = [
         --><span>Round <span id="currentRound" class="bold"></span></span><!--
         --><span>Score <span id="currentScoreSum" class="bold"></span></span>
     </p>
-</div>
+</header>
 <div id="guessCover"></div>
 <div id="panorama"></div>
 <div id="showGuessButtonContainer">
diff --git a/views/login/activate.php b/views/login/activate.php
index 6ad9b78..428ca72 100644
--- a/views/login/activate.php
+++ b/views/login/activate.php
@@ -1,9 +1,8 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Account activation</h2>
     <div class="box">
         <p class="error justify">Activation failed. Please check the link you entered or retry <a href="/signup" title="Sign up">sign up</a>!</p>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login/cancel.php b/views/login/cancel.php
index c22293e..2f37e59 100644
--- a/views/login/cancel.php
+++ b/views/login/cancel.php
@@ -1,6 +1,5 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Account cancellation</h2>
     <div class="box">
         <?php if ($success) : ?>
@@ -9,5 +8,5 @@
             <p class="error justify">Cancellation failed. Please check the link you entered! Maybe the account was already deleted, in this case no further action is required.</p>
         <?php endif; ?>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login/google_login.php b/views/login/google_login.php
index 334857b..da33385 100644
--- a/views/login/google_login.php
+++ b/views/login/google_login.php
@@ -1,9 +1,8 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Login up with Google</h2>
     <div class="box">
         <p class="error justify">Authenticating with Google failed. Please <a href="/login/google" title="Login with Google">retry</a>!</p>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login/google_signup.php b/views/login/google_signup.php
index 510cb08..b818e3f 100644
--- a/views/login/google_signup.php
+++ b/views/login/google_signup.php
@@ -1,6 +1,5 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Sign up</h2>
     <div class="box">
         <form id="googleSignupForm" action="/signup/google" method="post">
@@ -22,7 +21,7 @@
             </div>
         </form>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <script>
     (function () {
         var form = document.getElementById('googleSignupForm');
diff --git a/views/login/login.php b/views/login/login.php
index c5bc6af..fe6f48b 100644
--- a/views/login/login.php
+++ b/views/login/login.php
@@ -5,7 +5,6 @@ $jsFiles = [
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Login</h2>
     <div class="box">
         <form id="loginForm" action="/login" method="post">
@@ -21,5 +20,5 @@ $jsFiles = [
             </div>
         </form>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login/signup.php b/views/login/signup.php
index 22ef35f..b61f80d 100644
--- a/views/login/signup.php
+++ b/views/login/signup.php
@@ -5,7 +5,6 @@ $jsFiles = [
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Sign up</h2>
     <div class="box">
         <form id="signupForm" action="/signup" method="post">
@@ -31,5 +30,5 @@ $jsFiles = [
             </div>
         </form>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login/signup_success.php b/views/login/signup_success.php
index 2d7111d..e727ee1 100644
--- a/views/login/signup_success.php
+++ b/views/login/signup_success.php
@@ -1,9 +1,8 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Sign up</h2>
     <div class="box">
         <p class="justify">Sign up was successful. Please check your email and click on the activation link to activate your account!</p>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/maps.php b/views/maps.php
index 6ddd385..32504e3 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -5,7 +5,6 @@ $cssFiles = [
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Playable maps</h2>
     <div id="mapContainer">
         <?php foreach ($maps as $map): ?>
@@ -60,7 +59,7 @@ $cssFiles = [
             <?php endfor; ?>
         <?php endif; ?>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <script>
     (function () {
         const GOOGLE_MAPS_JS_API_KEY = '<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>';
diff --git a/views/profile.php b/views/profile.php
index 24b6e43..03810a5 100644
--- a/views/profile.php
+++ b/views/profile.php
@@ -5,7 +5,6 @@ $jsFiles = [
 ?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
     <h2>Profile</h2>
     <div class="box">
         <form id="profileForm" action="/profile" method="post">
@@ -21,5 +20,5 @@ $jsFiles = [
             </div>
         </form>
     </div>
-</div>
+<?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/templates/header.php b/views/templates/header.php
index 5ae84ef..11d2c96 100644
--- a/views/templates/header.php
+++ b/views/templates/header.php
@@ -1,11 +1,11 @@
-<div class="header">
+<header>
     <h1>
         <a href="/" title="MapGuesser">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
          --><span>MapGuesser</span>
         </a>
     </h1>
-    <p class="header">
+    <p>
         <?php if (Container::$request->user()) : ?>
             <span><a href="/profile" title="Profile">
                 <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
@@ -20,4 +20,5 @@
             --><span><a href="/login" title="Login">Login</a></span>
         <?php endif; ?>
     </p>
-</div>
\ No newline at end of file
+</header>
+<main>
\ No newline at end of file