diff --git a/templates/admin/mail.html.tera b/templates/admin/mail.html.tera
index 1f8436c..8f54cd1 100644
--- a/templates/admin/mail.html.tera
+++ b/templates/admin/mail.html.tera
@@ -7,13 +7,19 @@
         <div class="grid ">
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
-                <h2 class="h2">Mail senden</h2>
-                <form action="/admin/mail" method="post" enctype="multipart/form-data">
+                <h2 class="h2">Mail versenden</h2>
+                <form action="/admin/mail" method="post" enctype="multipart/form-data" class="grid gap-3 p-3">
                     {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
                     {{ macros::input(label="Betreff", name="subject", type="text", required=true) }}
-                    <textarea name="body" rows="4" cols="50" class="dark:text-white"></textarea>
+                    <div class="">
+                        <label for="content" class=" text-sm text-gray-600 dark:text-white ">
+                            Inhalt
+                        </label>
+                        <textarea id="content" name="body" rows="4" cols="50" class="input rounded-md"></textarea>
+                    </div>
+                    
                     <input type="file" name="files" multiple />
-                    <input type="submit" value="Abschicken" />
+                    <input type="submit" class="btn btn-primary" value="Abschicken" />
                 </form>
             </div>
         </div>
diff --git a/templates/admin/notification.html.tera b/templates/admin/notification.html.tera
index 88b209a..396ee0b 100644
--- a/templates/admin/notification.html.tera
+++ b/templates/admin/notification.html.tera
@@ -8,11 +8,11 @@
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
                 <h2 class="h2">Nachricht senden</h2>
-                <form action="/admin/notification" method="post">
+                <form action="/admin/notification" method="post" class="grid gap-3 p-3">
                     {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
                     {{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
                     {{ macros::input(label="Nachricht", name="message", type="text", required=true) }}
-                    <input type="submit" value="Abschicken" />
+                    <input type="submit" class="btn btn-primary" value="Abschicken" />
                 </form>
             </div>
         </div>
diff --git a/templates/index.html.tera b/templates/index.html.tera
index 21e1388..8899e66 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -145,7 +145,7 @@
                             <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
                         </li>
                         <li class="py-1">
-                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
+                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail</a>
                         </li>
                         <li class="py-1">
                             <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>