diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index 83b00e9..2cb6c7e 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -359,4 +359,9 @@ ul, li {
 .block-register-inline{
   float: left;
   display: inline-block;
+}
+
+/* core/reset_password.html classes*/
+.send-reset-email{
+  float: right;
 }
\ No newline at end of file
diff --git a/core/templates/registration/passwor_reset_done.html b/core/templates/registration/passwor_reset_done.html
index 0d9ef51..825c6ea 100644
--- a/core/templates/registration/passwor_reset_done.html
+++ b/core/templates/registration/passwor_reset_done.html
@@ -1,35 +1,51 @@
 {% extends "index.html" %}
 {% load i18n static %}
+{% block content%}
 
-{% block content %}
-
-  <div class="row">
-    <div class="col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
-      <div class="row">
-        <div class="col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 col-xs-offset-2 col-xs-8 col-lg-offset-2 col-lg-8 col-xs-offset-2 col-xs-8">
-          </br>
-          </br>
-          <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
-          </br>
-        </div>
+<div class="row">
+  <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4  col-xl-6 col-xl-offset-4 ">
+      <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2  col-lg-8 col-lg-offset-2  col-xl-8 col-xl-offset-2">
+        <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
       </div>
-    </div>
-    <div class="row ">
-      <div class="col-lg-9 col-lg-offset-2 col-xs-9 col-xs-offset-2 col-sm-9 col-sm-offset-2 col-md-9 col-md-offset-2 col-xl-9 col-xl-offset-2">
-        <div class="card">
-          <div class="card-block">
-            <div class="col-md-12 col-xs-12 col-sm-12 col-lg-12 col-xl-12">
-              <form class="form-group " method="post" action="">
-                {% csrf_token %}
-                <div class="form-group is-empty">
-                  <p>{% trans "We have sent instructions to set up your password, if an account exists with the email entered. You should receive them soon." %}</p>
-                  <p>{% trans "If you do not receive an email, please make sure you entered the address you registered, and check the spam folder." %}</p>
-                </div>
-              </form>
+  </div>
+</div>
+<div class="row">
+  <div class="col-md-8 col-md-offset-3 col-sm-10 col-sm-offset-2  col-xs-12 col-xs-offset-1 col-lg-8 col-lg-offset-3 col-xl-8 col-xl-offset-3">
+    {% if success %}
+      <div class="alert alert-success alert-dismissible" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <ul>
+            <li>{{ success }}</li>
+        </ul>
+      </div>
+    {% elif danger %}
+      <div class="alert alert-danger alert-dismissible" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <ul>
+            <li>{{ danger }}</li>
+        </ul>
+      </div>
+    {% endif %}
+    <div class="card">
+      <div class="card-block">
+        <form class="form-group " method="post" action="">
+          <div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
+            {% csrf_token %}
+            <div class="form-group is-empty">
+              <p>{% trans "We have sent instructions to set up your password, if an account exists with the email entered. You should receive them soon." %}</p>
+              <p>{% trans "If you do not receive an email, please make sure you entered the address you registered, and check the spam folder." %}</p>
+            </div>
+            <div class="form-group">
+              <a href="{% url 'core:home' %}" class="btn btn-default btn-raised" >{% trans 'Back' %}</a>
             </div>
           </div>
-        </div>
+        </form>
       </div>
+    </div>
   </div>
-
-{% endblock %}
+</div>
+{% endblock content %}
diff --git a/core/templates/registration/passwor_reset_form.html b/core/templates/registration/passwor_reset_form.html
index 8dfe5bf..7b713b4 100644
--- a/core/templates/registration/passwor_reset_form.html
+++ b/core/templates/registration/passwor_reset_form.html
@@ -2,57 +2,53 @@
 {% load i18n static %}
 {% block content%}
 
-	<div class="row">
-		<div class="col-md-4 col-md-offset-4 col-xs-4 col-xs-offset-4 col-sm-4 col-sm-offset-4 col-lg-4 col-lg-offset-4 col-xl-4 col-xl-offset-4">
-      <div class="row">
-        <div class="col-md-offset-2 col-md-8 col-sm-offset-2 col-sm-8 col-xs-offset-2 col-xs-8 col-lg-offset-2 col-lg-8 col-xs-offset-2 col-xs-8">
-          </br>
-          </br>
-          <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block " alt="logo amadeus">
-          </br>
-        </div>
-      </div>
-    </div>
-		<div class="row ">
-			<div class="col-lg-9 col-lg-offset-2 col-xs-9 col-xs-offset-2 col-sm-9 col-sm-offset-2 col-md-9 col-md-offset-2 col-xl-9 col-xl-offset-2">
-				{% if success %}
-				<div class="alert alert-success alert-dismissible" role="alert">
-						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					<ul>
-							<li>{{ success }}</li>
-					</ul>
-				</div>
-				{% elif danger %}
-				<div class="alert alert-danger alert-dismissible" role="alert">
-						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-							<span aria-hidden="true">&times;</span>
-						</button>
-					<ul>
-							<li>{{ danger }}</li>
-					</ul>
-				</div>
-				{% endif %}
-				<div class="card">
-			    <div class="card-block">
-		        <div class="col-md-12 col-xs-12 col-sm-12 col-lg-12 col-xl-12">
-		        	<form class="form-group " method="post" action="">
-								{% csrf_token %}
-								<div class="form-group is-empty">
-		        			<label for="inputEmail" class="ccontrol-label"> {% trans 'E-mail' %}</label>
-										<input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" {% if email %}value="{{form.email}}"{% endif %}>
-		        		</div>
-								<div class="col-lg-offset-4 col-lg-4 col-xs-offset-4 col-xs-4 col-sm-offset-4 col-sm-4 col-md-offset-4 col-md-4 col-xl-offset-4 col-xl-4">
-									<button type="submite" class="btn btn-raised btn-primary btn-block">{% trans 'Send' %}</button>
-
-								</div>
-		        	</form>
-		        </div>
-			    </div>
-				</div>
+<div class="row">
+	<div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4  col-xl-6 col-xl-offset-4 ">
+	    <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2  col-lg-8 col-lg-offset-2  col-xl-8 col-xl-offset-2">
+	      <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
+	    </div>
+	</div>
+</div>
+<div class="row">
+	<div class="col-md-8 col-md-offset-3 col-sm-10 col-sm-offset-2  col-xs-12 col-xs-offset-1 col-lg-8 col-lg-offset-3 col-xl-8 col-xl-offset-3">
+		{% if success %}
+			<div class="alert alert-success alert-dismissible" role="alert">
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<ul>
+						<li>{{ success }}</li>
+				</ul>
+			</div>
+		{% elif danger %}
+			<div class="alert alert-danger alert-dismissible" role="alert">
+				<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+					<span aria-hidden="true">&times;</span>
+				</button>
+				<ul>
+						<li>{{ danger }}</li>
+				</ul>
+			</div>
+		{% endif %}
+		<div class="card">
+			<div class="card-block">
+				<form class="form-group " method="post" action="">
+					<div class="col-md-12 col-xs-12 col-lg-10 col-lg-offset-1 col-sm-12">
+						{% csrf_token %}
+						<div class="form-group is-empty">
+		       			<label for="inputEmail" class="ccontrol-label"> {% trans 'E-mail' %}</label>
+							<input name="email" type="email" class="form-control" id="inputEmail" placeholder="Email" {% if email %}value="{{form.email}}"{% endif %}>
+	       			</div>
+	       			<div class="form-group send-reset-email">
+							<button type="submite" class="btn btn-raised btn-primary ">{% trans 'Send' %}</button>
+						</div>
+						<div class="form-group">
+							<a href="{% url 'core:home' %}" class="btn btn-default btn-raised" >{% trans 'Back' %}</a>
+						</div>
+					</div>
+       		</form>
 			</div>
 		</div>
 	</div>
-
+</div>
 {% endblock content %}
--
libgit2 0.21.2