diff --git a/user_details.php b/user_details.php
index c28c0709..496c8834 100644
--- a/user_details.php
+++ b/user_details.php
@@ -5,7 +5,7 @@ require_once "includes/inc_all_user.php";
 
 <div class="card card-dark">
     <div class="card-header">
-        <h3 class="card-title"><i class="fas fa-fw fa-user mr-2"></i>Your User Details</h3>
+        <h3 class="card-title"><i class="fas fa-cog mr-2"></i>User Preferences</h3>
     </div>
     <div class="card-body">
 
@@ -27,7 +27,7 @@ require_once "includes/inc_all_user.php";
                 <div class="col-9">
 
                     <div class="form-group">
-                        <label>Your Name <strong class="text-danger">*</strong></label>
+                        <label>Name <strong class="text-danger">*</strong></label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
@@ -37,7 +37,7 @@ require_once "includes/inc_all_user.php";
                     </div>
 
                     <div class="form-group">
-                        <label>Your Role</label>
+                        <label>Role</label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-user-shield"></i></span>
@@ -47,7 +47,7 @@ require_once "includes/inc_all_user.php";
                     </div>
 
                     <div class="form-group">
-                        <label>Your Email <strong class="text-danger">*</strong></label>
+                        <label>Email <strong class="text-danger">*</strong></label>
                         <div class="input-group">
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="fa fa-fw fa-envelope"></i></span>
diff --git a/user_preferences.php b/user_preferences.php
index 18bed96d..a4d81213 100644
--- a/user_preferences.php
+++ b/user_preferences.php
@@ -40,7 +40,7 @@ $user_config_calendar_first_day = intval($row['user_config_calendar_first_day'])
 
             <?php } ?>
 
-            <button type="submit" name="edit_your_user_preferences" class="btn btn-primary btn-block mt-3"><i class="fas fa-check mr-2"></i>Save</button>
+            <button type="submit" name="edit_your_user_preferences" class="btn btn-primary"><i class="fas fa-check mr-2"></i>Save</button>
 
         </form>
 
diff --git a/user_security.php b/user_security.php
index 20dc80fc..99329dac 100644
--- a/user_security.php
+++ b/user_security.php
@@ -8,8 +8,8 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens);
 ?>
 
 <div class="card card-dark">
-    <div class="card-header py-3">
-        <h3 class="card-title"><i class="fas fa-fw fa-shield-alt mr-2"></i>Your Password</h3>
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-shield-alt mr-2"></i>Your Password</h3>
     </div>
     <div class="card-body">
         <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
@@ -28,25 +28,25 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens);
                 </div>
             </div>
 
-            <button type="submit" name="edit_your_user_password" class="btn btn-primary btn-block mt-3"><i class="fas fa-check mr-2"></i>Save</button>
+            <button type="submit" name="edit_your_user_password" class="btn btn-primary"><i class="fas fa-check mr-2"></i>Change</button>
 
         </form>
     </div>
 </div>
 
 <div class="card card-dark">
-    <div class="card-header py-3">
-        <h3 class="card-title"><i class="fas fa-fw fa-lock mr-2"></i>Mult-Factor Authentication</h3>
+    <div class="card-header">
+        <h3 class="card-title"><i class="fas fa-lock mr-2"></i>Mult-Factor Authentication</h3>
     </div>
     <div class="card-body">
         <form action="post.php" method="post" autocomplete="off">
             <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
 
             <?php if (empty($session_token)) { ?>
-                <button type="submit" name="enable_2fa" class="btn btn-success btn-block mt-3"><i class="fa fa-fw fa-lock"></i><br> Enable 2FA</button>
+                <button type="submit" name="enable_2fa" class="btn btn-success"><i class="fa fa-fw fa-lock"></i><br> Enable 2FA</button>
             <?php } else { ?>
                 <p>You have set up 2FA. Your QR code is below.</p>
-                <button type="submit" name="disable_2fa" class="btn btn-danger btn-block mt-3"><i class="fa fa-fw fa-unlock"></i><br>Disable 2FA</button>
+                <button type="submit" name="disable_2fa" class="btn btn-danger"><i class="fa fa-fw fa-unlock"></i><br>Disable 2FA</button>
             <?php } ?>
 
             <center>