diff --git a/templates/settings.html b/templates/settings.html
index fed3e9f..8f7f719 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -101,16 +101,31 @@
     <h2>Password</h2>
 
     <form id="settings-password-form" method="post" action="/settings?change=password" accept-charset="UTF-8">
-      <label class="form-label" for="settings-password-oldpass">Current password: </label>
-      <input class="form-control" id="settings-password-oldpass" type="password" name="oldpass" /><br/>
-
-      <label class="form-label" for="settings-password-newpass">New password: </label>
-      <input class="form-control" id="settings-password-newpass" type="password" name="newpass" /><br/>
-
-      <label class="form-label" for="settings-password-newpass2">Repeat password: </label>
-      <input class="form-control" id="settings-password-newpass2" type="password" name="newpass2" /><br/>
-
-      <input class="btn btn-primary" type="submit" value="Save changes" />
+      <div class="row g-2 mb-2">
+        <div class="col-md">
+          <div class="form-floating">
+            <input class="form-control" id="settings-password-oldpass" type="password" name="oldpass">
+            <label for="settings-password-oldpass">Current password </label>
+          </div>
+        </div>
+        <div class="col-md">
+          <div class="form-floating">
+            <input class="form-control" id="settings-password-newpass" type="password" name="newpass">
+            <label for="settings-password-newpass">New password</label>
+          </div>
+        </div>
+        <div class="col-md">
+          <div class="form-floating">
+            <input class="form-control" id="settings-password-newpass2" type="password" name="newpass2">
+            <label for="settings-password-newpass2">Repeat password</label>
+          </div>
+        </div>
+      </div>
+      <div class="row g-2">
+        <div class="col">
+          <input class="btn btn-primary" type="submit" value="Save changes">
+        </div>
+      </div>
     </form>
 
   </section>