diff --git a/formula10/templates/error.jinja b/formula10/templates/error.jinja
index a8c61e5..5453e45 100644
--- a/formula10/templates/error.jinja
+++ b/formula10/templates/error.jinja
@@ -5,10 +5,12 @@
 {% set active_page = "/error" %}
 
 {% block body %}
-    <div class="card">
+    <div class="card shadow-sm mb-2">
+        <div class="card-header">
+            <span class="text-danger fw-bold">Error</span>
+        </div>
         <div class="card-body">
-            <h5 class="card-title text-danger fw-bold">Error</h5>
-            <h6 class="card-subtitle">{{ error_message }}</h6>
+            {{ error_message }}
         </div>
     </div>
 {% endblock body %}
diff --git a/formula10/templates/leaderboard.jinja b/formula10/templates/leaderboard.jinja
index 102ddab..59561cc 100644
--- a/formula10/templates/leaderboard.jinja
+++ b/formula10/templates/leaderboard.jinja
@@ -6,7 +6,7 @@
 
 {% block body %}
 
-    <div class="card">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Note
         </div>
@@ -16,7 +16,7 @@
         </div>
     </div>
 
-    <div class="card mt-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Leaderboard
         </div>
@@ -55,7 +55,7 @@
         </div>
     </div>
 
-    <div class="card mt-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             History
         </div>
diff --git a/formula10/templates/race.jinja b/formula10/templates/race.jinja
index 360b1f0..c73dd13 100644
--- a/formula10/templates/race.jinja
+++ b/formula10/templates/race.jinja
@@ -15,7 +15,7 @@
 {% block body %}
 
     {# Put table in this div to make right padding work #}
-    <div class="d-inline-block overflow-x-scroll w-100">
+    <div class="d-inline-block overflow-x-scroll w-100 mb-2">
         <table class="table table-bordered table-sm table-responsive shadow-sm">
 
             <thead>
diff --git a/formula10/templates/rules.jinja b/formula10/templates/rules.jinja
index 7f2d6a9..1fc34f0 100644
--- a/formula10/templates/rules.jinja
+++ b/formula10/templates/rules.jinja
@@ -5,7 +5,7 @@
 {% set active_page = "/rules" %}
 
 {% block body %}
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Format
         </div>
@@ -22,7 +22,7 @@
         </div>
     </div>
 
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Renntipps
         </div>
@@ -43,7 +43,7 @@
         </div>
     </div>
 
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Punkte
         </div>
@@ -62,7 +62,7 @@
         </div>
     </div>
 
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Bonustipps
         </div>
diff --git a/formula10/templates/season.jinja b/formula10/templates/season.jinja
index bf1b3ec..bf5e746 100644
--- a/formula10/templates/season.jinja
+++ b/formula10/templates/season.jinja
@@ -10,7 +10,7 @@
 
 {% block body %}
 
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Note
         </div>
@@ -26,7 +26,7 @@
 
         {% for user in model.all_users_or_active_user() %}
 
-            <div class="card mb-2 shadow-sm">
+            <div class="card shadow-sm mb-2">
                 <div class="card-header">
                     {# Link should only be visible if all users are visible #}
                     {% if model.active_user is not none %}
diff --git a/formula10/templates/statistics.jinja b/formula10/templates/statistics.jinja
index e702bf5..99222d2 100644
--- a/formula10/templates/statistics.jinja
+++ b/formula10/templates/statistics.jinja
@@ -6,7 +6,7 @@
 
 {% block body %}
 
-    <div class="card mb-2">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Note
         </div>
@@ -18,7 +18,7 @@
 
     <div class="grid card-grid">
 
-        <div class="card mb-2">
+        <div class="card shadow-sm mb-2">
             <div class="card-header">
                 Drivers
             </div>
@@ -51,7 +51,7 @@
             </div>
         </div>
 
-        <div class="card mb-2">
+        <div class="card shadow-sm mb-2">
             <div class="card-header">
                 Constructors
             </div>
diff --git a/formula10/templates/users.jinja b/formula10/templates/users.jinja
index 6e083fa..d6f83e8 100644
--- a/formula10/templates/users.jinja
+++ b/formula10/templates/users.jinja
@@ -6,7 +6,7 @@
 
 {% block body %}
 
-    <div class="card shadow-sm">
+    <div class="card shadow-sm mb-2">
         <div class="card-header">
             Add user
         </div>
@@ -27,7 +27,7 @@
     </div>
 
     {% if model.all_users() | length > 0 %}
-        <div class="card mt-2 shadow-sm">
+        <div class="card shadow-sm mb-2">
             <div class="card-header">
                 Registered users
             </div>
@@ -41,7 +41,7 @@
             </div>
         </div>
 
-        <div class="card mt-2 shadow-sm">
+        <div class="card shadow-sm mb-2">
             <div class="card-header">
                 Delete user
             </div>
@@ -72,16 +72,4 @@
         </div>
     {% endif %}
 
-{#    <div class="card mt-2 border-danger shadow-sm">#}
-{#        <div class="card-body">#}
-{#            <h5 class="card-title">Functions that should not be public</h5>#}
-{#            <h6 class="card-subtitle mb-2">(F you if you click this without knowing what it does)</h6>#}
-
-{#            <a class="btn btn-outline-danger" href="/save/all">Save all data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/all">Load all data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/static">Load static data</a>#}
-{#            <a class="btn btn-outline-danger" href="/load/dynamic">Load dynamic data</a>#}
-{#        </div>#}
-{#    </div>#}
-
 {% endblock body %}