diff --git a/templates/admin/boat/index.html.tera b/templates/admin/boat/index.html.tera
index 33127e1..a79cbbd 100644
--- a/templates/admin/boat/index.html.tera
+++ b/templates/admin/boat/index.html.tera
@@ -2,7 +2,6 @@
 {% import "includes/forms/boat" as boat %}
 {% extends "base" %}
 {% block content %}
-    {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Boats</h1>
         {{ boat::new() }}
diff --git a/templates/admin/list/index.html.tera b/templates/admin/list/index.html.tera
index 6fe0e31..a020b1f 100644
--- a/templates/admin/list/index.html.tera
+++ b/templates/admin/list/index.html.tera
@@ -1,7 +1,6 @@
 {% import "includes/macros" as macros %}
 {% extends "base" %}
 {% block content %}
-    {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">List</h1>
         <form action="/admin/list" method="post">
diff --git a/templates/admin/list/result.html.tera b/templates/admin/list/result.html.tera
index ae43182..a5863c2 100644
--- a/templates/admin/list/result.html.tera
+++ b/templates/admin/list/result.html.tera
@@ -1,7 +1,6 @@
 {% import "includes/macros" as macros %}
 {% extends "base" %}
 {% block content %}
-    {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">List - Result</h1>
         <ol>
diff --git a/templates/admin/mail.html.tera b/templates/admin/mail.html.tera
index 05a0b8f..1f80747 100644
--- a/templates/admin/mail.html.tera
+++ b/templates/admin/mail.html.tera
@@ -2,7 +2,6 @@
 {% import "includes/forms/boat" as boat %}
 {% extends "base" %}
 {% block content %}
-    {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Mail</h1>
         <form action="/admin/mail" method="post" enctype="multipart/form-data">
diff --git a/templates/admin/schnupper/index.html.tera b/templates/admin/schnupper/index.html.tera
index a3e9d5a..b2520b8 100644
--- a/templates/admin/schnupper/index.html.tera
+++ b/templates/admin/schnupper/index.html.tera
@@ -2,7 +2,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Schnupper Verwaltung</h1>
         <div class="grid gap-3">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
diff --git a/templates/admin/user/fees.html.tera b/templates/admin/user/fees.html.tera
index 425ce4f..a6a18f2 100644
--- a/templates/admin/user/fees.html.tera
+++ b/templates/admin/user/fees.html.tera
@@ -2,7 +2,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Gebühren</h1>
         <!-- START filterBar -->
         <div class="search-wrapper">
diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 932975d..068ce64 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -2,7 +2,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Users</h1>
         {% if allowed_to_edit %}
             <form action="/admin/user/new"
diff --git a/templates/admin/user/scheckbuch.html.tera b/templates/admin/user/scheckbuch.html.tera
index 53c5a24..08a6409 100644
--- a/templates/admin/user/scheckbuch.html.tera
+++ b/templates/admin/user/scheckbuch.html.tera
@@ -3,7 +3,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Scheckbücher</h1>
         <!-- START filterBar -->
         <div class="search-wrapper">
diff --git a/templates/base.html.tera b/templates/base.html.tera
index e9c6eb3..dbb98d5 100644
--- a/templates/base.html.tera
+++ b/templates/base.html.tera
@@ -25,7 +25,12 @@
                 </div>
             </header>
         {% endif %}
-        <div class="flex min-h-screen {% if not loggedin_user and not show_kiosk_header %} items-center dark:bg-primary-900 {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8">
+        <div class="flex flex-wrap min-h-screen {% if not loggedin_user and not show_kiosk_header %} items-center dark:bg-primary-900 {% else %} items-start {% endif %} justify-center px-4 py-12 sm:px-6 lg:px-8">
+            {% if flash and loggedin_user %}
+                <div class="max-w-screen-lg w-full mb-3">
+                    {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
+                </div>
+            {% endif %}
             {% block content %}
             {% endblock content %}
         </div>
diff --git a/templates/board/boathouse.html.tera b/templates/board/boathouse.html.tera
index a92fbd4..d07f520 100644
--- a/templates/board/boathouse.html.tera
+++ b/templates/board/boathouse.html.tera
@@ -37,17 +37,18 @@
     </div>
 {% endmacro show_side %}
 {% macro show_aisle(name) %}
-    <div id="{{ name }}-aisle">
+    <div id="{{ name }}-aisle" class="grid grid-cols-2 gap-4">
         {{ self::show_side(aisle_name = name, side_name = "mountain") }}
         {{ self::show_side(aisle_name = name, side_name = "water") }}
     </div>
 {% endmacro show_aisle %}
 {% block content %}
-    {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
-    <div class="max-w-screen-lg w-full">
+    <div class="max-w-screen-lg w-full dark:text-white">
         <h1 class="h1">Bootshaus</h1>
-        {{ self::show_aisle(name = "mountain") }}
-        {{ self::show_aisle(name = "middle") }}
-        {{ self::show_aisle(name = "water") }}
+        <div class="grid md:grid-cols-3 gap-4 divide-x">
+            {{ self::show_aisle(name = "mountain") }}
+            {{ self::show_aisle(name = "middle") }}
+            {{ self::show_aisle(name = "water") }}
+        </div>
     </div>
 {% endblock content %}
diff --git a/templates/boatdamages.html.tera b/templates/boatdamages.html.tera
index d863c49..74908a4 100644
--- a/templates/boatdamages.html.tera
+++ b/templates/boatdamages.html.tera
@@ -4,7 +4,6 @@
 {% block content %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Bootschäden</h1>
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3 mt-3") }}{% endif %}
         <h2 class="text-md font-bold tracking-wide bg-primary-900 mt-3 p-3 text-white flex justify-between items-center rounded-md">
             Neuen Schaden
             <a href="#"
diff --git a/templates/ergo.final.html.tera b/templates/ergo.final.html.tera
index 5166f14..74dd7a9 100644
--- a/templates/ergo.final.html.tera
+++ b/templates/ergo.final.html.tera
@@ -2,7 +2,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Aktuelle Woche</h1>
         <details>
             <summary>Dirty Thirty</summary>
diff --git a/templates/ergo.html.tera b/templates/ergo.html.tera
index 1487cdd..dff7d8a 100644
--- a/templates/ergo.html.tera
+++ b/templates/ergo.html.tera
@@ -3,7 +3,6 @@
 {% block content %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Ergo Challenges</h1>
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="my-3") }}{% endif %}
         <div class="grid gap-3">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 95f7932..e464f26 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -2,7 +2,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-lg w-full">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         <h1 class="h1">Ruderassistent</h1>
         <div class="grid gap-3">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index 5b9a80e..f297fe6 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -4,11 +4,6 @@
 {% block content %}
     <div class="w-full">
         <h1 class="h1">Logbuch</h1>
-        {% if flash %}
-            <div class="pt-3 max-w-lg m-auto">
-                {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
-            </div>
-        {% endif %}
         <div class="w-full grid md:grid-cols-5 gap-3 mt-5">
             <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
                 <h2 class="h2">Boote</h2>
diff --git a/templates/log.html.tera b/templates/log.html.tera
index f15d1c6..b37f3e5 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -4,9 +4,6 @@
 {% block content %}
     <div class="w-full">
         <h1 class="h1">Logbuch</h1>
-        {% if flash %}
-            <div class="w-full">{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}</div>
-        {% endif %}
         <div class="w-full grid md:grid-cols-5 gap-3 mt-5">
             <div class="bg-white dark:bg-primary-900 rounded-md hidden md:block shadow">
                 <h2 class="h2">Boote</h2>
diff --git a/templates/planned.html.tera b/templates/planned.html.tera
index bb4219d..521ec8c 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -3,7 +3,6 @@
 {% extends "base" %}
 {% block content %}
     <div class="max-w-screen-xl w-full grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
-        {% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
         {% if "scheckbuch" in loggedin_user.roles %}
             <div class="grid gap-3 sm:col-span-2 lg:col-span-3">
                 <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"