diff --git a/templates/admin/mail.html.tera b/templates/admin/mail.html.tera
index 8f54cd1..6c97d4c 100644
--- a/templates/admin/mail.html.tera
+++ b/templates/admin/mail.html.tera
@@ -8,16 +8,16 @@
             <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 versenden</h2>
-                <form action="/admin/mail" method="post" enctype="multipart/form-data" class="grid gap-3 p-3">
+                <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) }}
                     <div class="">
-                        <label for="content" class=" text-sm text-gray-600 dark:text-white ">
-                            Inhalt
-                        </label>
+                        <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" class="btn btn-primary" value="Abschicken" />
                 </form>
diff --git a/templates/base.html.tera b/templates/base.html.tera
index 19b468d..c01990b 100644
--- a/templates/base.html.tera
+++ b/templates/base.html.tera
@@ -6,9 +6,17 @@
               content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <link rel="manifest" href="public/manifest.json" />
         <link rel="stylesheet" href="/public/main.css" />
-        <link rel="apple-touch-icon" sizes="180x180" href="/public/images/apple-touch-icon.png">
-        <link rel="icon" type="image/png" sizes="32x32" href="/public/images/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="/public/images/favicon-16x16.png">
+        <link rel="apple-touch-icon"
+              sizes="180x180"
+              href="/public/images/apple-touch-icon.png">
+        <link rel="icon"
+              type="image/png"
+              sizes="32x32"
+              href="/public/images/favicon-32x32.png">
+        <link rel="icon"
+              type="image/png"
+              sizes="16x16"
+              href="/public/images/favicon-16x16.png">
         <link rel="manifest" href="/public/images/site.webmanifest">
         <meta name="msapplication-TileColor" content="#da532c">
         <meta name="theme-color" content="#ffffff">
diff --git a/templates/planned.html.tera b/templates/planned.html.tera
index d5ef0f1..638b32f 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -133,12 +133,10 @@
                                                     <a href="/planned/remove/{{ planned_event.trip_details_id }}"
                                                        class="btn btn-attention btn-fw">Abmelden</a>
                                                 {% endif %}
-                                                {% if planned_event.max_people > planned_event.rower | length %}
-                                                    {% if cur_user_participates == false %}
-                                                        <a href="/planned/join/{{ planned_event.trip_details_id }}"
-                                                           class="btn btn-primary btn-fw"
-                                                           {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>Mitrudern</a>
-                                                    {% endif %}
+                                                {% if planned_event.max_people > planned_event.rower | length and cur_user_participates == false %}
+                                                    <a href="/planned/join/{{ planned_event.trip_details_id }}"
+                                                       class="btn btn-primary btn-fw"
+                                                       {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>Mitrudern</a>
                                                 {% endif %}
                                                 {# --- END Row Buttons --- #}
                                                 {# --- START Cox Buttons --- #}
@@ -155,7 +153,7 @@
                                                             {% include "includes/cox-icon" %}
                                                             Abmelden
                                                         </a>
-                                                    {% else %}
+                                                    {% elif planned_event.planned_amount_cox > 0 %}
                                                         <a href="/cox/join/{{ planned_event.id }}"
                                                            class="block btn {% if amount_cox_missing > 0 %} btn-dark {% else %} btn-gray {% endif %} btn-fw"
                                                            {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>