diff --git a/fir_auth_2fa/templates/two_factor/login.html b/fir_auth_2fa/templates/two_factor/login.html
index 301954c8..5f6cf5d0 100644
--- a/fir_auth_2fa/templates/two_factor/login.html
+++ b/fir_auth_2fa/templates/two_factor/login.html
@@ -6,7 +6,6 @@
 {% block content %}
 
   {% if wizard.steps.current == 'auth' %}
-    <div class="container">
       <div class="row justify-content-md-center">
         <div class="col-sm-5 col-sm-offset-4 col-xs-12 col-xs-offset-0">
           <form class="form-signin p-4" method="post"> {% csrf_token %}
@@ -16,7 +15,7 @@ <h2 class="form-signin-heading">{%  trans "Sign in to FIR" %}</h2>
 	    <fieldset>
 	      {% for field in form %}
 	      {% if field|is_checkbox %}
-	      <div class="checkbox">
+	      <div class="checkbox mb-3">
 	        <label>
 	          {{ field }}
 	          {{ field.label }}
@@ -45,18 +44,15 @@ <h2 class="form-signin-heading">{%  trans "Sign in to FIR" %}</h2>
 	  {% endif %}
         </div>
       </div>
-    </div>
 
   {% elif wizard.steps.current == 'token' %}
-      <div class="container">
         <div class="row justify-content-md-center">
           <div class="col-sm-4 col-sm-offset-4 col-xs-12 col-xs-offset-0">
             <form class="form-signin p-4" method="post"> {% csrf_token %}
               <img class="img-responsive img-fluid" src="{% static "img/logo.jpg" %}" alt="Logo" />
-              <h2 class="form-signin-heading"></h2>
+              <h2 class="form-signin-heading">Please enter the token generated by your token generator.</h2>
                 {{ wizard.management_form }}
 	        <fieldset>
-                  <h2>Please enter the token generated by your token generator.</h2>
                   <div class="form-group mb-3">
                     {{ wizard.form }}
                   </div>
@@ -77,7 +73,6 @@ <h2>Please enter the token generated by your token generator.</h2>
                 
           </div>
        </div>
-      </div>
   {% endif %}
 
 {% endblock %}