diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html
index 37e5b4d0..1767da02 100644
--- a/app/dashboard/templates/dashboard/custom_alias.html
+++ b/app/dashboard/templates/dashboard/custom_alias.html
@@ -8,7 +8,7 @@
 
 {% block default_content %}
 
-  <div class="bg-white p-6" style="max-width: 60em; margin: auto">
+  <div class="bg-white p-6 mt-5" style="max-width: 55em; margin: auto">
     <h1 class="h3 mb-5">New Email Alias</h1>
 
     {% if  user_custom_domains|length == 0 and not DISABLE_ALIAS_SUFFIX %}
diff --git a/app/dashboard/templates/dashboard/mailbox_detail.html b/app/dashboard/templates/dashboard/mailbox_detail.html
index 7af28de2..9782d5a0 100644
--- a/app/dashboard/templates/dashboard/mailbox_detail.html
+++ b/app/dashboard/templates/dashboard/mailbox_detail.html
@@ -8,103 +8,104 @@
 
 {% block default_content %}
 
-  <div class="col-md-8 offset-md-2 pb-3">
-    <h1 class="h3">{{ mailbox.email }}
-      {% if mailbox.verified %}
-        <span class="cursor" data-toggle="tooltip" data-original-title="Mailbox Verified">✅</span>
-      {% else %}
-        <span class="cursor" data-toggle="tooltip" data-original-title="Mailbox Not Verified">
+  <div class="row">
+    <div class="col">
+      <h1 class="h3">{{ mailbox.email }}
+        {% if mailbox.verified %}
+          <span class="cursor" data-toggle="tooltip" data-original-title="Mailbox Verified">✅</span>
+        {% else %}
+          <span class="cursor" data-toggle="tooltip" data-original-title="Mailbox Not Verified">
           🚫
         </span>
+        {% endif %}
+        {% if mailbox.pgp_finger_print %}
+          <span class="cursor" data-toggle="tooltip" data-original-title="PGP Enabled">🗝</span>
+        {% endif %}
+      </h1>
+
+      {% if not mailbox.verified %}
+        <div class="alert alert-info">
+          Mailbox not verified, please check your inbox/spam folder for the verification email.
+          <br>
+          To receive the verification email again, you can delete and re-add the mailbox.
+        </div>
       {% endif %}
-      {% if mailbox.pgp_finger_print %}
-        <span class="cursor" data-toggle="tooltip" data-original-title="PGP Enabled">🗝</span>
-      {% endif %}
-    </h1>
 
-    {% if not mailbox.verified %}
-      <div class="alert alert-info">
-        Mailbox not verified, please check your inbox/spam folder for the verification email.
-        <br>
-        To receive the verification email again, you can delete and re-add the mailbox.
-      </div>
-    {% endif %}
+      <!-- Change email -->
+      <div class="card">
+        <form method="post" enctype="multipart/form-data">
+          <input type="hidden" name="form-name" value="update-email">
+          {{ change_email_form.csrf_token }}
 
-    <!-- Change email -->
-    <div class="card">
-      <form method="post" enctype="multipart/form-data">
-        <input type="hidden" name="form-name" value="update-email">
-        {{ change_email_form.csrf_token }}
+          <div class="card-body">
+            <div class="card-title">
+              Change Mailbox Address
+            </div>
+            <div class="form-group">
+              <label class="form-label">Address</label>
 
-        <div class="card-body">
-          <div class="card-title">
-            Change Mailbox Address
+              <!-- Not allow user to change mailbox if there's a pending change -->
+              {{ change_email_form.email(class="form-control", value=mailbox.email, readonly=pending_email != None) }}
+              {{ render_field_errors(change_email_form.email) }}
+
+              {% if pending_email %}
+                <div class="mt-2">
+                  <span class="text-danger">Pending change: {{ pending_email }}</span>
+                  <a href="{{ url_for('dashboard.cancel_mailbox_change_route', mailbox_id=mailbox.id) }}"
+                     class="btn btn-secondary btn-sm">
+                    Cancel mailbox change
+                  </a>
+                </div>
+              {% endif %}
+            </div>
+            <button class="btn btn-primary">Change</button>
           </div>
-          <div class="form-group">
-            <label class="form-label">Address</label>
+        </form>
+      </div>
+      <!-- END Change email -->
 
-            <!-- Not allow user to change mailbox if there's a pending change -->
-            {{ change_email_form.email(class="form-control", value=mailbox.email, readonly=pending_email != None) }}
-            {{ render_field_errors(change_email_form.email) }}
 
-            {% if pending_email %}
-              <div class="mt-2">
-                <span class="text-danger">Pending change: {{ pending_email }}</span>
-                <a href="{{ url_for('dashboard.cancel_mailbox_change_route', mailbox_id=mailbox.id) }}"
-                   class="btn btn-secondary btn-sm">
-                  Cancel mailbox change
-                </a>
+      <div class="card">
+        <form method="post">
+          <input type="hidden" name="form-name" value="pgp">
+
+          <div class="card-body">
+            <div class="card-title">
+              Pretty Good Privacy (PGP)
+              <div class="small-text">
+                By importing your PGP Public Key into SimpleLogin, all emails sent to {{ mailbox.email }} are
+                <b>encrypted</b> with your key.
+              </div>
+            </div>
+
+            {% if not current_user.is_premium() %}
+              <div class="alert alert-danger" role="alert">
+                This feature is only available in premium plan.
               </div>
             {% endif %}
-          </div>
-          <button class="btn btn-primary">Change</button>
-        </div>
-      </form>
-    </div>
-    <!-- END Change email -->
 
+            <div class="form-group">
+              <label class="form-label">PGP Public Key</label>
 
-    <div class="card">
-      <form method="post">
-        <input type="hidden" name="form-name" value="pgp">
-
-        <div class="card-body">
-          <div class="card-title">
-            Pretty Good Privacy (PGP)
-            <div class="small-text">
-              By importing your PGP Public Key into SimpleLogin, all emails sent to {{ mailbox.email }} are
-              <b>encrypted</b> with your key.
+              <textarea name="pgp"
+                  {% if not current_user.is_premium() %} disabled {% endif %}
+                        class="form-control" rows=10
+                        placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----">{{ mailbox.pgp_public_key or "" }}</textarea>
             </div>
-          </div>
 
-          {% if not current_user.is_premium() %}
-            <div class="alert alert-danger" role="alert">
-              This feature is only available in premium plan.
-            </div>
-          {% endif %}
-
-          <div class="form-group">
-            <label class="form-label">PGP Public Key</label>
-
-            <textarea name="pgp"
+            <button class="btn btn-primary" name="action"
                 {% if not current_user.is_premium() %} disabled {% endif %}
-                      class="form-control" rows=10
-                      placeholder="-----BEGIN PGP PUBLIC KEY BLOCK-----">{{ mailbox.pgp_public_key or "" }}</textarea>
+                    value="save">Save
+            </button>
+            {% if mailbox.pgp_finger_print %}
+              <button class="btn btn-danger float-right" name="action" value="remove">Remove</button>
+            {% endif %}
+
           </div>
+        </form>
 
-          <button class="btn btn-primary" name="action"
-              {% if not current_user.is_premium() %} disabled {% endif %}
-                  value="save">Save
-          </button>
-          {% if mailbox.pgp_finger_print %}
-            <button class="btn btn-danger float-right" name="action" value="remove">Remove</button>
-          {% endif %}
-
-        </div>
-      </form>
-
+      </div>
     </div>
-
   </div>
 {% endblock %}
 
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 57e490ef..8d9dc5a6 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -46,7 +46,7 @@
               </div>
             {% endif %}
           </div>
-          <button class="btn btn-primary">Change Email</button>
+          <button class="btn btn-outline-primary">Change Email</button>
         </div>
       </form>
     </div>
@@ -79,7 +79,7 @@
               <img src="{{ current_user.profile_picture_url() }}" class="profile-picture">
             {% endif %}
           </div>
-          <button class="btn btn-primary">Update</button>
+          <button class="btn btn-outline-primary">Update</button>
         </div>
       </form>
     </div>