diff --git a/apps/map/templates/map/form.html b/apps/map/templates/map/form.html
index c1badbd..d43f5a0 100644
--- a/apps/map/templates/map/form.html
+++ b/apps/map/templates/map/form.html
@@ -15,7 +15,7 @@
 {% block title %}{% trans "Submit a Case Study" %}{% endblock %}
 {% block description %}{% trans "Here you can submit a case study for review and it will be added to the map." %}{% endblock %}
 
-{% block content %}
+{% block inner %}
   {% crispy form %}
 {% endblock %}
 
diff --git a/apps/map/templates/map/how_much_time.html b/apps/map/templates/map/how_much_time.html
index 5cfa428..6913664 100644
--- a/apps/map/templates/map/how_much_time.html
+++ b/apps/map/templates/map/how_much_time.html
@@ -33,7 +33,7 @@
 {% block description %}
     {% trans "A complete picture is always more helpful but sometimes you don't have the time" %}
 {% endblock %}
-{% block content %}
+{% block inner %}
     <div class="btn-jumbo-group">
         <a class="btn btn-jumbo bg-warning" href="{% url 'long-form' %}" role="button">
             <h2>20+ Minutes</h2>
diff --git a/ojusomap/templates/base_page.html b/ojusomap/templates/base_page.html
index 979aebc..ee054b4 100644
--- a/ojusomap/templates/base_page.html
+++ b/ojusomap/templates/base_page.html
@@ -11,7 +11,7 @@
 	</style>
 {% endblock %}
 
-{% block body %}
+{% block content %}
 
   <div class="container">
 
@@ -20,7 +20,7 @@
 			<p class="lead text-center">{% block description %}{% endblock %}</p>
 		</div>
 
-		{% block content %}
+		{% block inner %}
 		{% endblock %}
 
   </div><!-- /.container -->
diff --git a/ojusomap/templates/registration/activate.html b/ojusomap/templates/registration/activate.html
index 8fce34f..8deb01c 100644
--- a/ojusomap/templates/registration/activate.html
+++ b/ojusomap/templates/registration/activate.html
@@ -1 +1,8 @@
-{% extends 'base_page.html' %}
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<p>{% trans "Account activation failed" %}</p>
+
+{% endblock %}
diff --git a/ojusomap/templates/registration/activation_complete.html b/ojusomap/templates/registration/activation_complete.html
index 8fce34f..aa93bcc 100644
--- a/ojusomap/templates/registration/activation_complete.html
+++ b/ojusomap/templates/registration/activation_complete.html
@@ -1 +1,6 @@
-{% extends 'base_page.html' %}
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<p>{% trans "Your account is now activated." %}</p>
+{% endblock %}
diff --git a/ojusomap/templates/registration/activation_email.txt b/ojusomap/templates/registration/activation_email.txt
index e69de29..911df01 100644
--- a/ojusomap/templates/registration/activation_email.txt
+++ b/ojusomap/templates/registration/activation_email.txt
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% trans "Activate account at" %} {{ site.name }}:
+
+http://{{ site.domain }}{% url 'registration_activate' activation_key %}
+
+{% blocktrans %}Link is valid for {{ expiration_days }} days.{% endblocktrans %}
diff --git a/ojusomap/templates/registration/activation_email_subject.txt b/ojusomap/templates/registration/activation_email_subject.txt
index 2f9b306..24f477c 100644
--- a/ojusomap/templates/registration/activation_email_subject.txt
+++ b/ojusomap/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-Activate your Ojuso Identity account.
\ No newline at end of file
+{% load i18n %}{% trans "Account activation on" %} {{ site.name }}
diff --git a/ojusomap/templates/registration/logout.html b/ojusomap/templates/registration/logout.html
index 61f162c..f8da51f 100644
--- a/ojusomap/templates/registration/logout.html
+++ b/ojusomap/templates/registration/logout.html
@@ -1,11 +1,6 @@
-{% extends "base_page.html" %}
-{% load bootstrap3 %}
-{% load crispy_forms_tags %}
-{% load envelope_tags %}
+{% extends "base.html" %}
 {% load i18n %}
 
-{% block page_name %}Registration{% endblock %}
-
 {% block content %}
-<p class="text-center">{% trans "You've just been logged out." %} <a href="{% url 'auth_login' %}">{% trans "Click here to login again." %}</p>
+<p>{% trans "Logged out" %}</p>
 {% endblock %}
diff --git a/ojusomap/templates/registration/password_change_done.html b/ojusomap/templates/registration/password_change_done.html
new file mode 100644
index 0000000..659be0a
--- /dev/null
+++ b/ojusomap/templates/registration/password_change_done.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<p>{% trans "Password changed" %}</p>
+{% endblock %}
diff --git a/ojusomap/templates/registration/password_change_form.html b/ojusomap/templates/registration/password_change_form.html
new file mode 100644
index 0000000..10b1fc1
--- /dev/null
+++ b/ojusomap/templates/registration/password_change_form.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<form method="post" action=".">
+  {% csrf_token %} 
+  {{ form.as_p }}
+
+  <input type="submit" value="{% trans 'Submit' %}" />
+</form>
+{% endblock %}
diff --git a/ojusomap/templates/registration/password_reset_complete.html b/ojusomap/templates/registration/password_reset_complete.html
new file mode 100644
index 0000000..55993e8
--- /dev/null
+++ b/ojusomap/templates/registration/password_reset_complete.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+<p>{% trans "Password reset successfully" %}</p>
+
+<p><a href="{% url 'auth_login' %}">{% trans "Log in" %}</a></p>
+
+{% endblock %}
diff --git a/ojusomap/templates/registration/password_reset_confirm.html b/ojusomap/templates/registration/password_reset_confirm.html
new file mode 100644
index 0000000..33bd276
--- /dev/null
+++ b/ojusomap/templates/registration/password_reset_confirm.html
@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+
+{% if validlink %}
+
+<form method="post" action=".">
+  {% csrf_token %} 
+  {{ form.as_p }}
+
+  <input type="submit" value="{% trans 'Submit' %}" />
+</form>
+
+{% else %}
+
+<p>{% trans "Password reset failed" %}</p>
+
+{% endif %}
+
+{% endblock %}
diff --git a/ojusomap/templates/registration/password_reset_done.html b/ojusomap/templates/registration/password_reset_done.html
new file mode 100644
index 0000000..6057ccb
--- /dev/null
+++ b/ojusomap/templates/registration/password_reset_done.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<p>{% trans "Email with password reset instructions has been sent." %}</p>
+{% endblock %}
diff --git a/ojusomap/templates/registration/password_reset_email.html b/ojusomap/templates/registration/password_reset_email.html
index 2e5caa9..c78893e 100644
--- a/ojusomap/templates/registration/password_reset_email.html
+++ b/ojusomap/templates/registration/password_reset_email.html
@@ -1,14 +1,5 @@
-{% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
-
-{% trans "Please go to the following page and choose a new password:" %}
+{% load i18n %}
+{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb64=uid token=token %}
+{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uid token %}
 {% endblock %}
-{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
-
-{% trans "Thanks for using our site!" %}
-
-{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
-
-{% endautoescape %}
\ No newline at end of file
diff --git a/ojusomap/templates/registration/password_reset_form.html b/ojusomap/templates/registration/password_reset_form.html
new file mode 100644
index 0000000..10b1fc1
--- /dev/null
+++ b/ojusomap/templates/registration/password_reset_form.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<form method="post" action=".">
+  {% csrf_token %} 
+  {{ form.as_p }}
+
+  <input type="submit" value="{% trans 'Submit' %}" />
+</form>
+{% endblock %}
diff --git a/ojusomap/templates/registration/registration_closed.html b/ojusomap/templates/registration/registration_closed.html
index d1093a7..c73cfac 100644
--- a/ojusomap/templates/registration/registration_closed.html
+++ b/ojusomap/templates/registration/registration_closed.html
@@ -1,12 +1,6 @@
-{% extends "base_page.html" %}
-{% load bootstrap3 %}
-{% block page_name %}Registration{% endblock %}
+{% extends "base.html" %}
+{% load i18n %}
 
 {% block content %}
-<div class="container">
-	<div class="page-lead">
-	  <h2>Registration</h2>
-		<p class="lead">Account registration is currently closed. Come back soon!</p>
-	</div>
-</div>
+	<p>{% trans "Registration is currently closed." %}</p>
 {% endblock %}
diff --git a/ojusomap/templates/registration/registration_complete.html b/ojusomap/templates/registration/registration_complete.html
index e69de29..96a22ac 100644
--- a/ojusomap/templates/registration/registration_complete.html
+++ b/ojusomap/templates/registration/registration_complete.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block content %}
+<p>{% trans "You are now registered. Activation email sent." %}</p>
+{% endblock %}
\ No newline at end of file