diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index 99068077c..892e85f35 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -12,7 +12,7 @@
   <link rel="shortcut icon" href="/favicon.png" type="image/png">
   <link rel="icon" href="/favicon.png" type="image/png">
 </head>
-<body id="top">
+<body>
 <div class="overlay"></div>
 {% block navbar %}
 <nav class="navbar navbar-expand-lg navbar-light bg-light navbar-fixed-top">
@@ -101,7 +101,7 @@
 </div>
 {% endif %}
 
-<div class="container">
+<div class="container my-4">
 {% block content %}{% endblock %}
 </div>
 
diff --git a/data/web/templates/index.twig b/data/web/templates/index.twig
index e0bbc8895..96f3f21ca 100644
--- a/data/web/templates/index.twig
+++ b/data/web/templates/index.twig
@@ -3,35 +3,35 @@
 {% block navbar %}{% endblock %}
 
 {% block content %}
-<div class="row">
+<div class="row my-4">
   <div class="col-12 col-md-7 col-lg-6 col-xl-5 ms-auto me-auto">
     <div class="card">
       <div class="card-header"><i class="bi bi-person-fill"></i> {{ lang.login.login }}</div>
       <div class="card-body">
-        <div class="text-center mailcow-logo"><img src="{{ logo|default('/img/cow_mailcow.svg') }}" alt="mailcow"></div>
+        <div class="text-center mailcow-logo mb-4"><img src="{{ logo|default('/img/cow_mailcow.svg') }}" alt="mailcow"></div>
         {% if ui_texts.ui_announcement_text and ui_texts.ui_announcement_active %}
-        <div class="alert alert-{{ ui_texts.ui_announcement_type }} rot-enc ui-announcement-alert">{{ ui_texts.ui_announcement_text|rot13 }}</div>
+        <div class="my-4 alert alert-{{ ui_texts.ui_announcement_type }} rot-enc ui-announcement-alert">{{ ui_texts.ui_announcement_text|rot13 }}</div>
         {% endif %}
         <legend>{% if oauth2_request %}{{ lang.oauth2.authorize_app }}{% else %}{{ ui_texts.main_name|raw }}{% endif %}</legend><hr />
         {% if is_mobileconfig %}
-        <div class="alert alert-info">{{ lang.login.mobileconfig_info }}</div>
+        <div class="my-4 alert alert-info ">{{ lang.login.mobileconfig_info }}</div>
         {% endif %}
         <form method="post" autofill="off">
-          <div class="form-group">
+          <div class="d-flex mt-2">
             <label class="visually-hidden" for="login_user">{{ lang.login.username }}</label>
             <div class="input-group">
               <div class="input-group-text"><i class="bi bi-person-fill"></i></div>
               <input name="login_user" autocorrect="off" autocapitalize="none" type="{% if is_mobileconfig %}email{% else %}text{% endif %}" id="login_user" class="form-control" placeholder="{{ lang.login.username }}" required="" autofocus="" autocomplete="username">
             </div>
           </div>
-          <div class="form-group">
+          <div class="d-flex mt-2">
             <label class="visually-hidden" for="pass_user">{{ lang.login.password }}</label>
             <div class="input-group">
               <div class="input-group-text"><i class="bi bi-lock-fill"></i></div>
               <input name="pass_user" type="password" id="pass_user" class="form-control" placeholder="{{ lang.login.password }}" required="" autocomplete="current-password">
             </div>
           </div>
-          <div class="form-group" style="position: relative">
+          <div class="d-flex mt-4" style="position: relative">
             <div class="btn-group">
               <div class="btn-group">
                 <button type="submit" class="btn btn-xs-lg btn-success" value="Login">{{ lang.login.login }}</button>
@@ -58,12 +58,12 @@
           </div>
         </form>
         {% if login_delay %}
-        <p><div class="alert alert-info">{{ lang.login.delayed|format(login_delay) }}</b></div></p>
+        <p><div class="my-4 alert alert-info">{{ lang.login.delayed|format(login_delay) }}</b></div></p>
         {% endif %}
-        <div id="fido2-alerts"></div>
+        <div class="my-4" id="fido2-alerts"></div>
         {% if not oauth2_request and (mailcow_apps or app_links) %}
         <legend><i class="bi bi-link-45deg"></i> {{ ui_texts.apps_name|raw }}</legend><hr />
-        <div class="apps">
+        <div class="my-4 apps">
           {% for app in mailcow_apps %}
             {% if not skip_sogo or not is_uri('SOGo', app.link) %}
             <div>
