diff --git a/templates/admin/user/view.html.tera b/templates/admin/user/view.html.tera
index e6a61bb..80edf2d 100644
--- a/templates/admin/user/view.html.tera
+++ b/templates/admin/user/view.html.tera
@@ -7,8 +7,8 @@
             <a href="/admin/user" class="link link-primary link-no-underline">&larr; Userverwaltung</a>
         {% endif %}
         <h1 class="h1">{{ user.name }}</h1>
-        <div class="grid sm:grid-cols-2 gap-3">
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+        <div class="grid sm:grid-cols-2 gap-8 my-8">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">
                     Grunddaten
                     <br />
@@ -53,7 +53,7 @@
                     </div>
                 </div>
             </div>
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">
                     Mitgliedschaft
                     <br />
@@ -285,7 +285,7 @@
                 </div>
             </div>
             {% if is_clubmember %}
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                     <h2 class="h2">Rollen</h2>
                     <div>
                         <ul class="divide-y divide-gray-200 dark:divide-primary-60 w-full">
@@ -363,7 +363,7 @@
                 </div>
             {% endif %}
             {% if supposed_to_pay %}
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                     <h2 class="h2">💸-Beitrag</h2>
                     <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
                         <div class="py-3">
@@ -400,7 +400,7 @@
                     </div>
                 </div>
             {% endif %}
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">Aktivitäten</h2>
                 <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
                     <div class="py-3">
@@ -414,13 +414,13 @@
                     </div>
                 </div>
             </div>
-            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+            <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow">
                 <h2 class="h2">Ergo-Challenge</h2>
-                <div class="mx-3 divide-y divide-gray-200 dark:divide-primary-600">
-                    <div class="py-3">
-                        {{ macros::input(label='DOB', name='dob', type="text", value=user.dob, readonly=allowed_to_edit == false) }}
-                        {{ macros::input(label='Weight (kg)', name='weight', type="text", value=user.weight, readonly=allowed_to_edit == false) }}
-                        {{ macros::input(label='Sex', name='sex', type="text", value=user.sex, readonly=allowed_to_edit == false) }}
+                <div class="mx-3">
+                    <div class="grid gap-3 pb-3 mt-3">
+                        {{ macros::inputgroup(label='DOB', name='dob', type="text", value=user.dob, readonly=allowed_to_edit == false) }}
+                        {{ macros::inputgroup(label='Weight (kg)', name='weight', type="text", value=user.weight, readonly=allowed_to_edit == false) }}
+                        {{ macros::inputgroup(label='Sex', name='sex', type="text", value=user.sex, readonly=allowed_to_edit == false) }}
                     </div>
                 </div>
             </div>