diff --git a/mfa/templates/Email/Add.html b/mfa/templates/Email/Add.html
index 9ba67fa..9b1db75 100644
--- a/mfa/templates/Email/Add.html
+++ b/mfa/templates/Email/Add.html
@@ -2,54 +2,50 @@
 {% block head %}
 {% endblock %}
 {% block content %}
-    <br/>
-    <br/>
-
-    <div class="panel panel-default">
-      <div class="panel-heading">
-	      <strong> Activate Token by email</strong>
-      </div>
-      <div class="panel-body">
-
+<br/>
+<br/>
+<div class="container">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <strong> Activate Token by email</strong>
+    </div>
+    <div class="panel-body">
       <FORM METHOD="POST" ACTION="{% url 'start_email' %}" Id="formLogin"  onSubmit="" name="FrontPage_Form1">
-
-
-      {% csrf_token %}
-          {%  if invalid %}
-          <div class="alert alert-danger">
-              Sorry, The provided token is not valid.
+        {% csrf_token %}
+        {%  if invalid %}
+        <div class="alert alert-danger">
+          Sorry, The provided token is not valid.
+        </div>
+        {% endif %}
+        {% if quota %}
+        <div class="alert alert-warning">
+          {{ quota }}
+        </div>
+        {% endif %}
+        <fieldset>
+          <div class="row">
+            <div class="col-sm-12 col-md-12">
+              <p>Enter the code sent to your email.</p>
+            </div>
           </div>
-          {% endif %}
-      {% if quota %}
-          <div class="alert alert-warning">
-              {{ quota }}
+          <div class="row">
+            <div class="col-sm-12 col-md-12">
+              <div class="form-group">
+                <div class="input-group">
+                  <span class="input-group-addon">
+                  <i class="glyphicon glyphicon-lock"></i>
+                  </span>
+                  <input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
+                </div>
+              </div>
+              <div class="form-group">
+                <input type="submit" class="btn btn-lg btn-success btn-block" value="Verify">
+              </div>
+            </div>
           </div>
-      {% endif %}
-      <fieldset>
-      <div class="row">
-      <div class="col-sm-12 col-md-12">
-        <p>Enter the 6-digits sent to your email.</p>
-      </div>
-      </div>
-
-      <div class="row">
-	  <div class="col-sm-12 col-md-12">
-	    <div class="form-group">
-	      <div class="input-group">
-		<span class="input-group-addon">
-		<i class="glyphicon glyphicon-lock"></i>
-		</span>
-		<input class="form-control" size="6" MaxLength="6" value="" placeholder="e.g 55552" name="otp" type="text" id="otp" autofocus>
-
-	      </div>
-	    </div>
-
-          <div class="form-group">
-
-	      <input type="submit" class="btn btn-lg btn-success btn-block" value="Verify">
-	      </div>
-      </div>
-      </fieldset>
+        </fieldset>
       </FORM>
-      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
\ No newline at end of file
diff --git a/mfa/templates/Email/recheck.html b/mfa/templates/Email/recheck.html
index 82f6d57..913804c 100644
--- a/mfa/templates/Email/recheck.html
+++ b/mfa/templates/Email/recheck.html
@@ -39,7 +39,7 @@
       <fieldset>
       <div class="row">
       <div class="col-sm-12 col-md-12">
-        <p>Enter the 6-digits sent to your email.</p>
+        <p>Enter the code sent to your email.</p>
       </div>
       </div>
 
diff --git a/mfa/templates/MFA.html b/mfa/templates/MFA.html
index c03aed0..9f250c9 100644
--- a/mfa/templates/MFA.html
+++ b/mfa/templates/MFA.html
@@ -66,7 +66,7 @@
                 {% endif %}
             </ul>
             </div>
-
+        </div>
     <br/>
     <br/>
        <table class="table table-striped">
diff --git a/mfa/templates/TOTP/Add.html b/mfa/templates/TOTP/Add.html
index 35b68b2..5bae45f 100644
--- a/mfa/templates/TOTP/Add.html
+++ b/mfa/templates/TOTP/Add.html
@@ -2,7 +2,7 @@
 {% extends "base.html" %}
 {% load static %}
 {% block head %}
-    <style>
+<style>
     #two-factor-steps {
 	border: 1px solid #ccc;
 	border-radius: 3px;
@@ -12,8 +12,8 @@
         margin: 0px;
     }
     </style>
-    <script src="{% static 'mfa/js/qrious.min.js' %}" type="text/javascript"></script>
-    <script type="text/javascript">
+<script src="{% static 'mfa/js/qrious.min.js' %}" type="text/javascript"></script>
+<script type="text/javascript">
     var key="";
     $(document).ready(function addToken() {
         $.ajax({
@@ -61,49 +61,49 @@
     </script>
 {% endblock %}
 {% block content %}
-    <br/>
-    <br/>
-    <div class="container">
-        <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
-            <div class="row" align="center">
-                <h4>Adding Authenticator</h4>
-            </div>
-    <div class="row">
+<br/>
+<br/>
+<div class="container">
+    <div class="col-md-6 col-md-offset-3" id="two-factor-steps">
+        <div class="row" align="center">
+            <h4>Adding Authenticator</h4>
+        </div>
+        <div class="row">
 
-        <p>Scan the image below with the two-factor authentication app on your <a href="javascript:void(0)" onclick="showTOTP()">phone/PC</a> phone/PC. If you can’t use a barcode,
-            <a href="javascript:void(0)" onclick="showKey()">enter this text</a> instead. </p>
+            <p>Scan the image below with the two-factor authentication app on your <a href="javascript:void(0)" onclick="showTOTP()">phone/PC</a>. If you can’t use a barcode,
+                <a href="javascript:void(0)" onclick="showKey()">enter this text</a> instead. </p>
         </div>
 
         <div class="row">
 
-        <div align="center" style="display: none" id="second_step">
+            <div align="center" style="display: none" id="second_step">
 
-        <img id="qr"/>
+                <img id="qr"/>
 
             </div>
-        <div class="row">
+            <div class="row">
 
                 <p><b>Enter the six-digit code from the application</b></p>
                 <p style="color: #333333;font-size: 10px">After scanning the barcode image, the app will display a six-digit code that you can enter below. </p>
 
-        </div>
+            </div>
             <div class="row">
 
 
-            <input style="display: inline;width: 95%" maxlength="6" size="6" class="form-control" id="answer" placeholder="e.g 785481"/>
+                <input style="display: inline;width: 95%" maxlength="6" size="6" class="form-control" id="answer" placeholder="e.g 785481"/>
 
-        </div>
-        <div class="row">
-            <div class="col-md-6" style="padding-left: 0px">
-                <button class="btn btn-success" onclick="verify()">Enable</button>
             </div>
-            <div class="col-md-6" align="right" style="padding-right: 30px">
-                <a href="{% url 'mfa_home' %}"><button class="btn btn-default">Cancel</button></a>
+            <div class="row" style="padding-top: 10px;">
+                <div class="col-md-6" style="padding-left: 0px">
+                    <button class="btn btn-success" onclick="verify()">Enable</button>
+                </div>
+                <div class="col-md-6" align="right" style="padding-right: 30px">
+                    <a href="{% url 'mfa_home' %}"><button class="btn btn-default">Cancel</button></a>
+                </div>
             </div>
         </div>
-        </div>
 
     </div>
-        </div>
-    {% include "modal.html" %}
+</div>
+{% include "modal.html" %}
 {% endblock %}
\ No newline at end of file