diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 409de92..b2a8f9b 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -36,37 +36,52 @@
                    placeholder="Suchen nach (Name, [yes|no]-role:<name>, has-[no-]membership-pdf)" />
         </div>
         <!-- END filterBar -->
-        <div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4">
-            <div id="filter-result-js"
-                 class="text-primary-950 dark:text-white text-right"></div>
-            {% for user in users %}
-                <div data-filterable="true"
-                     data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %} ">
+        <div id="filter-result-js" class="search-result"></div>
+        {% for user in users %}
+            <div data-filterable="true"
+                 data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %}"
+                 class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative">
+                <details class="block dark:text-white w-full">
+                    <summary>
+                        <span class="text-black dark:text-white cursor-pointer">
+                            <span class="font-bold">
+                                {{ user.name }}
+                                {% if not user.last_access and "admin" in loggedin_user.roles and user.mail %}
+                                    <form action="/admin/user"
+                                          method="post"
+                                          enctype="multipart/form-data"
+                                          class="inline">
+                                        &bullet; <a class="font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
+    href="/admin/user/{{ user.id }}/send-welcome-mail"
+    onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a>
+                                    </form>
+                                {% endif %}
+                                {% if user.last_access %}&bullet; ⏳&nbsp;{{ user.last_access | date }}{% endif %}
+                            </span>
+                            <small class="block text-gray-600 dark:text-gray-100">
+                                {% for role in user.roles %}
+                                    {{ role }}
+                                    {% if not loop.last %},{% endif %}
+                                {% endfor %}
+                            </small>
+                        </span>
+                    </summary>
                     <form action="/admin/user"
                           method="post"
                           enctype="multipart/form-data"
-                          class="bg-white dark:bg-primary-900 p-3 rounded-md w-full">
-                        <div class="w-full grid gap-3">
+                          class="w-full mt-2">
+                        {% if user.pw %}
+                            <a class="block my-1 font-normal text-[#f43f5e] dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
+                               href="/admin/user/{{ user.id }}/reset-pw"
+                               onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
+                        {% endif %}
+                        <div class="w-full grid gap-3 mt-3">
                             <input type="hidden" name="id" value="{{ user.id }}" />
-                            <div class="font-bold mb-1 text-black dark:text-white">
-                                {{ user.name }}
-                                {% if user.last_access %}
-                                    (last access:
-                                    {{ user.last_access | date }})
-                                {% endif %}
-                                {% if user.pw %}
-                                    <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
-                                       href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a>
-                                {% endif %}
-                                {% if not user.last_access and "admin" in loggedin_user.roles %}
-                                    <a class="block mt-1 font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
-                                       href="/admin/user/{{ user.id }}/send-welcome-mail">Willkommensmail verschicken</a>
-                                {% endif %}
-                            </div>
                             <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
                                 {% for role in roles %}
                                     {{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles, disabled=allowed_to_edit == false) }}
                                 {% endfor %}
+                                <hr class="sm:col-span-2 lg:col-span-4 my-3" />
                                 {% if user.membership_pdf %}
                                     <a href="/admin/user/{{ user.id }}/membership"
                                        class="text-black dark:text-white">Beitrittserklärung herunterladen</a>
@@ -100,8 +115,8 @@
                             </div>
                         {% endif %}
                     </form>
-                </div>
-            {% endfor %}
-        </div>
+                </details>
+            </div>
+        {% endfor %}
     </div>
 {% endblock content %}
diff --git a/templates/planned.html.tera b/templates/planned.html.tera
index 84ae217..84ceb49 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -391,15 +391,15 @@
         </div>
         {# --- START Add Buttons --- #}
         {% if "manage_events" in loggedin_user.roles or "cox" in loggedin_user.roles %}
-            <div class="grid {% if "manage_events" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
+            <div class="grid {% if "manage_events" in loggedin_user.roles and "cox" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
                 {% if "manage_events" in loggedin_user.roles %}
-                    <a href="#"
-                       data-sidebar="true"
-                       data-trigger="sidebar"
-                       data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen"
-                       data-day="{{ day.day }}"
-                       data-body="#addEventForm"
-                       class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 rounded-bl-md text-sm font-semibold">
+                    <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#addEventForm" class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 text-sm font-semibold
+                        {% if "cox" in loggedin_user.roles %}
+                            rounded-bl-md
+                        {% else %}
+                            rounded-b-md
+                        {% endif %}
+                        ">
                         <span class="absolute inset-y-0 left-0 flex items-center pl-3">{% include "includes/plus-icon" %}</span>
                         Event
                     </a>