diff --git a/README.md b/README.md
index 05eab09..094cf79 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 - [ ] Allow sign-outs only >2h before event
 
 # Notes / Bugfixes
-- [ ] User loggedin status not present on user admin interface (header/footer not rendering) [ph]
-- [ ] Mobile Breakpoint: Add user broken user admin interface [mb]
 
 # Frontend Process 
 ´cd frontend´
diff --git a/templates/admin/user/index.html.tera b/templates/admin/user/index.html.tera
index 95f1d4b..28dc738 100644
--- a/templates/admin/user/index.html.tera
+++ b/templates/admin/user/index.html.tera
@@ -6,7 +6,7 @@
 <div class="max-w-screen-lg w-full">
   <h1 class="text-center text-3xl uppercase tracking-wide font-bold text-primary-900">Users</h1>
 
-<form action="/admin/user/new" method="post" class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 flex items-end md:items-center justify-between">
+<form action="/admin/user/new" method="post" class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 sm:flex items-end justify-between">
   <div class="w-full">
     <h2 class="text-md font-bold mb-2 uppercase tracking-wide">Neuen User hinzufügen</h2>
     <div class="grid md:grid-cols-3">
@@ -19,8 +19,8 @@
       </div>
     </div>      
   </div>
-  <div>
-    <input value="Hinzufügen" type="submit" class="w-28 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"/>
+  <div class="text-right">
+    <input value="Hinzufügen" type="submit" class="w-28 mt-2 sm:mt-0 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"/>
   </div>
 </form>
 
@@ -37,9 +37,9 @@
       <input type="hidden" name="id" value="{{ user.id }}" />
       <div class="font-bold mb-1">{{ user.name }}</div>
       <div class="grid md:grid-cols-3">
-        <label for="is_guest{{ loop.index }}" class="flex items-center cursor-pointer hover:text-gray-900"><input type="checkbox" id="is_guest{{ loop.index }}" name="is_guest" {% if user.is_guest %} checked="true"{% endif %} class="h-4 w-4 accent-primary-600 mr-2"/> Gast</label>
-        <label for="is_cox{{ loop.index }}" class="flex items-center cursor-pointer hover:text-gray-900"><input type="checkbox" id="is_cox{{ loop.index }}" name="is_cox" {% if user.is_cox %} checked="true"{% endif %} class="h-4 w-4 accent-primary-600 mr-2"/> Steuerberechtigter</label>
-        <label for="is_admin{{ loop.index }}" class="flex items-center cursor-pointer hover:text-gray-900"><input type="checkbox" id="is_admin{{ loop.index }}" name="is_admin" {% if user.is_admin %} checked="true"{% endif %} class="h-4 w-4 accent-primary-600 mr-2"/> Admin</label>
+        {{ macros::checkbox(label='Gast', name='is_guest' ~  loop.index , checked=user.is_guest) }}
+        {{ macros::checkbox(label='Steuerberechtigter', name='is_cox' ~  loop.index , checked=user.is_cox) }}
+        {{ macros::checkbox(label='Admin', name='is_admin' ~  loop.index , checked=user.is_admin) }}
       </div>
        {% if user.pw %}
         <a class="inline-block mt-1 text-primary-600 hover:text-primary-900 underline" href="/admin/user/{{ user.id }}/reset-pw">Passwort zurücksetzen</a>
diff --git a/templates/includes/footer.html.tera b/templates/includes/footer.html.tera
index 72777a9..6282281 100644
--- a/templates/includes/footer.html.tera
+++ b/templates/includes/footer.html.tera
@@ -1,5 +1,5 @@
 <footer class="bg-primary-950 text-white w-full flex justify-center p-3">
-  <div class="max-w-screen-lg w-full flex justify-between">
+  <div class="max-w-screen-xl w-full flex justify-between">
     <div>
       <span class="text-[#ff0000]">&hearts;</span> ASKÖ Ruderverein Donau Linz
     </div>
diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera
index b0d14cb..ce9fc85 100644
--- a/templates/includes/macros.html.tera
+++ b/templates/includes/macros.html.tera
@@ -1,6 +1,6 @@
 {% macro header(loggedin_user) %}
     <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full">
-      <div class="max-w-screen-lg w-full flex justify-between">
+      <div class="max-w-screen-xl w-full flex justify-between">
         <div>
           Hallo {{ loggedin_user.name }}
         </div>
diff --git a/templates/index.html.tera b/templates/index.html.tera
index bfa24b3..ad9ba52 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -3,7 +3,7 @@
 {% extends "base" %}
 
 {% block content %}
-  <div class="max-w-screen-lg w-full grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
+  <div class="max-w-screen-xl w-full grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
     {% if flash %}
           {% if flash.0 == "success" %}
           <div class="sm:col-span-2 lg:col-span-3 bg-[#4ade80] text-white px-3 py-1 rounded-md text-center">
@@ -94,7 +94,7 @@
                   <div class="p-2 border border-t-0 border-primary-100 mb-4 rounded-b-md">
                     {% if planned_event.rower | length > 0 %}
                       {% for rower in planned_event.rower %}
-                        {{ rower.name }} <span class="hidden">(angemeldet seit {{ rower.registered_at }})</span>
+                        {{ rower.name }} <span class="hidden">(angemeldet seit {{ rower.registered_at }})</span><br/>
                       {% endfor %}
                     {% else %}
                         Keine Ruderer angemeldet
@@ -161,7 +161,7 @@
                   <div class="p-2 border border-t-0 border-primary-100 mb-4 rounded-b-md">
                     {% if trip.rower | length > 0 %}
                       {% for rower in trip.rower %}
-                        {{ rower.name }} <span class="hidden">(angemeldet seit {{ rower.registered_at }})</span>
+                        {{ rower.name }} <span class="hidden">(angemeldet seit {{ rower.registered_at }})</span><br/>
                       {% endfor %}
                     {% else %}
                         Keine Ruderer angemeldet