diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml
index 87dd233..adb1458 100644
--- a/src/Views/Home/Users.cshtml
+++ b/src/Views/Home/Users.cshtml
@@ -666,11 +666,11 @@
                         <label class="form-label" for="detailCity">@T["City"]</label>
                         <input type="text" class="form-control" id="detailCity" value="" disabled />
                     </div>
-                    <div class="col-md-6">
+                    <div class="col-md-5">
                         <label class="form-label" for="detailStreet">@T["Street"]</label>
                         <input type="text" class="form-control" id="detailStreet" value="" disabled />
                     </div>
-                    <div class="col-md-2">
+                    <div class="col-md-3">
                         <label class="form-label" for="detailStreetNr">@T["Street Nr."]</label>
                         <input type="text" class="form-control" id="detailStreetNr" value="" disabled />
                     </div>
diff --git a/src/Views/Settings/Admin.cshtml b/src/Views/Settings/Admin.cshtml
index 598d875..965d540 100644
--- a/src/Views/Settings/Admin.cshtml
+++ b/src/Views/Settings/Admin.cshtml
@@ -128,10 +128,10 @@
                     </table>
                     <div class="attributes"></div>
                     <div class="row mb-2">
-                        <div class="col-md-8 mt-2">
+                        <div class="col-md-6 mt-2">
                             <button type="button" class="btn btn-danger" id="Presets.@(preset.Key).Delete" data-type="deletePreset">@T["Delete preset"]</button>
                         </div>
-                        <div class="col-md-4 ms-auto mt-2">
+                        <div class="col-md-6 ms-auto mt-2">
                             <button type="button" class="btn btn-primary" data-type="addAttribute">@T["Add attribute"]</button>
                         </div>
                     </div>
@@ -423,10 +423,10 @@
                         <tbody class="attributes"></tbody>
                     </table>
                     <div class="row mb-4">
-                        <div class="col-md-4">
+                        <div class="col-md-6">
                             <button type="button" class="btn btn-danger" id="Presets.${presetId}.Delete" data-type="deletePreset">@T["Delete preset"]</button>
                         </div>
-                        <div class="col-md-4 ms-auto">
+                        <div class="col-md-6 ms-auto">
                             <button type="button" class="btn btn-primary" data-type="addAttribute">@T["Add attribute"]</button>
                         </div>
                     </div>
diff --git a/src/Views/Settings/User.cshtml b/src/Views/Settings/User.cshtml
index c72074b..15a5062 100644
--- a/src/Views/Settings/User.cshtml
+++ b/src/Views/Settings/User.cshtml
@@ -32,29 +32,37 @@
     </div>
     <h4 class="fw-bold">@T["Personal data"]</h4>
     <div class="row g-3 mb-3">
-        <div class="col-md-1">
+        <div class="col-md-2">
             <label class="form-label" for="title">@T["Title"]</label>
             <input type="text" id="title" class="form-control" value="@Model.userModel.Title" readonly/>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-5">
             <label class="form-label" for="name">@T["Name"]</label>
             <input type="text" id="name" class="form-control" value="@Model.userModel.Cn" readonly/>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-5">
             <label class="form-label" for="surname">@T["Surname"]</label>
             <input type="text" id="surname" class="form-control" value="@Model.userModel.Sn" readonly/>
         </div>
     </div>
     <div class="row g-3 mb-3">
-        <div class="col-md-2">
+        <div class="col-md-4">
+            <label class="form-label" for="detailCity">@T["City"]</label>
+            <input type="text" class="form-control" id="detailCity" value="@Model.userModel.Description?.Address.City" readonly />
+        </div>
+        <div class="col-md-5">
+            <label class="form-label" for="detailStreet">@T["Street"]</label>
+            <input type="text" class="form-control" id="detailStreet" value="@Model.userModel.Description?.Address.Street" readonly />
+        </div>
+        <div class="col-md-3">
+            <label class="form-label" for="detailStreetNr">@T["Street Nr."]</label>
+            <input type="text" class="form-control" id="detailStreetNr" value="@Model.userModel.Description?.Address.StreetNr" readonly />
+        </div>
+        <div class="col-md-3">
             <label class="form-label" for="birthdate">@T["Birth date"]</label>
             <input type="text" id="birthdate" class="form-control" value="@Model.userModel.Description?.BirthDate" readonly/>
         </div>
         <div class="col-md-4">
-            <label class="form-label" for="address">@T["Address"]</label>
-            <input type="text" id="address" class="form-control" value="@Model.userModel.Description?.Address" readonly/>
-        </div>
-        <div class="col-md-3">
             <label class="form-label" for="workplace">@T["Workplace"]</label>
             <input type="text" id="workplace" class="form-control" value="@Model.userModel.Description?.Workplace" readonly/>
         </div>