diff --git a/app/eve_api/templates/eve_api/add.html b/app/eve_api/templates/eve_api/add.html
index 6faa219..9b847d7 100644
--- a/app/eve_api/templates/eve_api/add.html
+++ b/app/eve_api/templates/eve_api/add.html
@@ -11,7 +11,7 @@
 
 <form action="{% url eve_api.views.eveapi_add %}" method="post">
 
-<formset>
+<fieldset>
 
   {% include "formtools/formfield.html" with field=form.api_user_id %}
   {% include "formtools/formfield.html" with field=form.api_key class="xxlarge"%}
@@ -19,7 +19,7 @@
 
   {% csrf_token %}
   <input type="submit" value="Add API Key" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/eve_api/templates/eve_api/update.html b/app/eve_api/templates/eve_api/update.html
index 671b8eb..ed5ce05 100644
--- a/app/eve_api/templates/eve_api/update.html
+++ b/app/eve_api/templates/eve_api/update.html
@@ -10,7 +10,7 @@
 <p>Please update your API key as provided on the <a href="http://eve-online.com/api">EVE Online API page</a> and a optional description.</p>
 
 <form action="{% url eveapi-update acc.api_user_id %}" method="post">
-<formset>
+<fieldset>
 
   {% include "formtools/formfield.html" with field=form.api_user_id %}
   {% include "formtools/formfield.html" with field=form.api_key class="xxlarge" %}
@@ -18,7 +18,7 @@
 
   {% csrf_token %}
   <input type="submit" value="Add API Key" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/groups/templates/groups/create_request.html b/app/groups/templates/groups/create_request.html
index 75ed1f0..138c572 100644
--- a/app/groups/templates/groups/create_request.html
+++ b/app/groups/templates/groups/create_request.html
@@ -10,10 +10,10 @@
 <p>Please fill in a reason why you like to be a member of this group and any supporting evidence as requested by the group adminship</p>
 
 <form action="{% url groups.views.create_request groupid %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
   {% csrf_token %}
   <input type="submit" value="Create Request" class="btn primary" />
-</formset>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/groups/templates/groups/group_list.html b/app/groups/templates/groups/group_list.html
index 1e8a4ca..2d7aa75 100644
--- a/app/groups/templates/groups/group_list.html
+++ b/app/groups/templates/groups/group_list.html
@@ -8,6 +8,26 @@
 
 <p>This is the list of your current groups, and groups you can request to be a member of.</p>
 
+{% if group_list %}
+<table class="zebra-striped" id="groups">
+  <thead>
+    <tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
+  </thead>
+  <tbody>
+    {% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
+    <tr><td>{{ group }}</td>
+      <td>{{ description }}</td>
+      <td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
+      <td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
+          {% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
+          {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% else %}
+<b>No groups are available.</b>
+{% endif %}
 
 <script src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
 <script >
@@ -16,25 +36,4 @@
     });
 </script>
 
-<table class="zebra-striped" id="groups">
-{% if group_list %}
-<thead>
-<tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
-</thead>
-<tbody>
-{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
-<tr><td>{{ group }}</td>
-    <td>{{ description }}</td>
-    <td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
-    <td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
-        {% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
-        {% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
-</tr>
-{% endfor %}
-</tbody>
-</table>
-{% else %}
-<b>No groups are available.</b>
-{% endif %}
-
 {% endblock %}
diff --git a/app/hr/templates/hr/applications/accept.html b/app/hr/templates/hr/applications/accept.html
index abbb0b6..5291746 100644
--- a/app/hr/templates/hr/applications/accept.html
+++ b/app/hr/templates/hr/applications/accept.html
@@ -10,12 +10,12 @@
 
 <p>Fill in a note you want to send to the user.</p>
 <form action="{% url hr-acceptapplication application.id %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
   {% include "formtools/formfield.html" with field=form.template %}
   {% csrf_token %}
   <input type="submit" value="Add" class="btn primary"/>
-</formset>
+</fieldset>
 
 </form>
 {% endblock %}
diff --git a/app/hr/templates/hr/applications/add.html b/app/hr/templates/hr/applications/add.html
index c3f740e..e8ea6ba 100644
--- a/app/hr/templates/hr/applications/add.html
+++ b/app/hr/templates/hr/applications/add.html
@@ -11,12 +11,12 @@
 <p>Select the character you wish to apply with, then the corporation you wish to apply for.</p>
 
 <form action="{% url hr-addapplication %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.character %}
   {% include "formtools/formfield.html" with field=form.corporation %}
   {% csrf_token %}
   <input type="submit" value="Create Application" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/hr/templates/hr/applications/add_message.html b/app/hr/templates/hr/applications/add_message.html
index 039ed1f..cf2730c 100644
--- a/app/hr/templates/hr/applications/add_message.html
+++ b/app/hr/templates/hr/applications/add_message.html
@@ -8,12 +8,11 @@
 </div>
 
 <form action="{% url hr-addmessage application.id %}" method="post">
-
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
   {% if form.template %}{% include "formtools/formfield.html" with field=form.template %}{% endif %}
   {% csrf_token %}
   <input type="submit" value="Add" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/hr/templates/hr/applications/add_note.html b/app/hr/templates/hr/applications/add_note.html
index 97dbbd2..d936a83 100644
--- a/app/hr/templates/hr/applications/add_note.html
+++ b/app/hr/templates/hr/applications/add_note.html
@@ -8,10 +8,10 @@
 </div>
 
 <form action="{% url hr-addnote application.id %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
   {% csrf_token %}
   <input type="submit" value="Add" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/hr/templates/hr/applications/reject.html b/app/hr/templates/hr/applications/reject.html
index 83ecc81..8ff87fd 100644
--- a/app/hr/templates/hr/applications/reject.html
+++ b/app/hr/templates/hr/applications/reject.html
@@ -10,12 +10,12 @@
 <p>Fill in the rejection reason below, please note, this will be sent out to the user.</p>
 <form action="{% url hr-rejectapplication application.id %}" method="post">
 
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
   {% include "formtools/formfield.html" with field=form.template %}
   {% csrf_token %}
   <input type="submit" value="Reject" class="btn error"/>
-</formset>
+</fieldset>
 
 
 </form>
diff --git a/app/hr/templates/hr/blacklist_add.html b/app/hr/templates/hr/blacklist_add.html
index 65f4bda..f7de5bb 100644
--- a/app/hr/templates/hr/blacklist_add.html
+++ b/app/hr/templates/hr/blacklist_add.html
@@ -7,7 +7,7 @@
 </div>
 
 <form action="{% url hr-blacklist-add %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.type %}
   {% include "formtools/formfield.html" with field=form.value class="xxlarge" %}
   {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
@@ -15,7 +15,7 @@
 
   {% csrf_token %}
   <input type="submit" value="Add Blacklist" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 {% endblock %}
 
diff --git a/app/hr/templates/hr/recommendations/add.html b/app/hr/templates/hr/recommendations/add.html
index 4c7c6e2..c80092c 100644
--- a/app/hr/templates/hr/recommendations/add.html
+++ b/app/hr/templates/hr/recommendations/add.html
@@ -13,11 +13,11 @@
 The person you are recommending needs to have created their application before you can add a recommendation.</p>
 
 <form action="{% url hr-addrecommendation %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.character %}
   {% include "formtools/formfield.html" with field=form.application %}
   {% csrf_token %}
   <input type="submit" value="Add Recommendation" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/reddit/templates/reddit/add.html b/app/reddit/templates/reddit/add.html
index 127ebb1..f17173d 100644
--- a/app/reddit/templates/reddit/add.html
+++ b/app/reddit/templates/reddit/add.html
@@ -13,10 +13,10 @@ corporation</p>
 on from time to time</p>
 
 <form action="{% url reddit-addaccount %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.username %}
   {% csrf_token %}
   <input type="submit" value="Add Account" />
-</formset>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/sso/templates/sso/apipassword.html b/app/sso/templates/sso/apipassword.html
index 3865f96..af45c5b 100644
--- a/app/sso/templates/sso/apipassword.html
+++ b/app/sso/templates/sso/apipassword.html
@@ -12,11 +12,11 @@
 password below.</p>
 
 <form action="{% url sso.views.set_apipasswd %}" method="post">
-<formset>
+<fieldset>
   {% include "formtools/formfield.html" with field=form.password %}
   {% csrf_token %}
   <input type="submit" value="Reset Account" class="btn primary" />
-</formset>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/sso/templates/sso/lookup/userlookup.html b/app/sso/templates/sso/lookup/userlookup.html
index 8f8577a..4a54b4a 100644
--- a/app/sso/templates/sso/lookup/userlookup.html
+++ b/app/sso/templates/sso/lookup/userlookup.html
@@ -10,7 +10,7 @@
 
 <p>
 <form action="{% url sso.views.user_lookup %}" method="post">
-<formset>
+<fieldset>
   {% csrf_token %}
   <div class="clearfix">
     {{ form.type.label_tag }}
@@ -25,7 +25,7 @@
     </div>
   </div>
   <input type="submit" value="Lookup" class="btn primary"/>
-</formset>
+</fieldset>
 </form>
 </p>
 {% endblock %}
diff --git a/app/templates/registration/activation_complete.html b/app/templates/registration/activation_complete.html
index e1848f8..9b93b04 100644
--- a/app/templates/registration/activation_complete.html
+++ b/app/templates/registration/activation_complete.html
@@ -1,6 +1,9 @@
 {% extends "registration/registration_base.html" %}
 {% block title %}Activation complete{% endblock %}
 {% block content %}
+<div class="page-header">
+  <h1>Activation Complete</h1>
+</div>
 <p>Thanks, activation complete!  You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p>
 {% endblock %}
 
diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html
index 666b982..3d93dbb 100644
--- a/app/templates/registration/login.html
+++ b/app/templates/registration/login.html
@@ -15,30 +15,20 @@
 
 <form method="post" action="{% url django.contrib.auth.views.login %}">
 <fieldset>
-    <div class="clearfix">
-        {{ form.username.label_tag }}
-        <div class="input">
-          {{ form.username }}
-        </div>
-    </div>
-    <div class="clearfix">
-        {{ form.password.label_tag }}
-        <div class="input">
-           {{ form.password }}
-        </div>
-    </div>
+  {% include "formtools/formfield.html" with field=form.username %}
+  {% include "formtools/formfield.html" with field=form.password %}
 
-    <div class="row">
-        <div class="span10">
-            <a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a>
-            <a href="{% url registration_register %}" class="btn success">Create Account</a>
-        </div>
-        <div class="span6">
-            <input type="submit" value="Login" class="btn primary pull-right"/>
-        </div>
+  <div class="row">
+    <div class="span10">
+      <a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a>
+      <a href="{% url registration_register %}" class="btn success">Create Account</a>
     </div>
-    <input type="hidden" name="next" value="{{ next }}" />
-    {% csrf_token %}
+    <div class="span6">
+      <input type="submit" value="Login" class="btn primary pull-right"/>
+    </div>
+  </div>
+  <input type="hidden" name="next" value="{{ next }}" />
+  {% csrf_token %}
 </fieldset>
 </form>
 
diff --git a/app/templates/registration/password_change_form.html b/app/templates/registration/password_change_form.html
index 9a0648a..c8a5309 100644
--- a/app/templates/registration/password_change_form.html
+++ b/app/templates/registration/password_change_form.html
@@ -1,11 +1,17 @@
 {% extends "registration/registration_base.html" %}
 {% block title %}Change password{% endblock %}
 {% block content %}
+<div class="page-header">
+  <h1>Change Password</h1>
+</div>
+
 <form method='post' action=''>
-<table>
-    {{ form }}
-</table>
-<input type='submit' value="Change password" />
-{% csrf_token %}
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.old_password %}
+  {% include "formtools/formfield.html" with field=form.new_password1 %}
+  {% include "formtools/formfield.html" with field=form.new_password2 %}
+  {% csrf_token %}
+  <input type='submit' value="Change password" class="btn primary"/>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/templates/registration/password_reset_complete.html b/app/templates/registration/password_reset_complete.html
index 25b40da..beb255a 100644
--- a/app/templates/registration/password_reset_complete.html
+++ b/app/templates/registration/password_reset_complete.html
@@ -1,5 +1,8 @@
 {% extends "registration/registration_base.html" %}
 {% block title %}Password reset complete{% endblock %}
 {% block content %}
+<div class="page-header">
+  <h1>Password Reset Complete</h1>
+</div>
 <p>Your password has been reset!  You may now <a href="{{ login_url }}">log in</a>.</p>
 {% endblock %}
diff --git a/app/templates/registration/password_reset_done.html b/app/templates/registration/password_reset_done.html
index 47a8c49..51207b1 100644
--- a/app/templates/registration/password_reset_done.html
+++ b/app/templates/registration/password_reset_done.html
@@ -1,8 +1,8 @@
 {% extends "registration/registration_base.html" %}
 {% block title %}Password reset{% endblock %}
 {% block content %}
-<p>
-We have sent you an email with a link to reset your password.  Please check
-your email and click the link to continue.
-</p>
+<div class="page-header">
+  <h1>Password Reset</h1>
+</div>
+<p>We have sent you an email with a link to reset your password.  Please check your email and click the link to continue.</p>
 {% endblock %}
diff --git a/app/templates/registration/password_reset_form.html b/app/templates/registration/password_reset_form.html
index 723f773..299544e 100644
--- a/app/templates/registration/password_reset_form.html
+++ b/app/templates/registration/password_reset_form.html
@@ -1,13 +1,15 @@
 {% extends "registration/registration_base.html" %}
-{% block title %}Reset password{% endblock %}
+{% block title %}Forgotten password{% endblock %}
 {% block content %}
-<p>Forgot your password?  Enter your email in the form below and we'll send you
-instructions for creating a new one.</p>
+<div class="page-header">
+  <h1>Forgotten Password</h1>
+</div>
+<p>Forgot your password?  Enter your email in the form below and we'll send you instructions for creating a new one.</p>
 <form method='post' action=''>
-<table>
-    {{ form }}
-</table>
-<input type='submit' value="Reset password" />
-{% csrf_token %}
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.email %}
+  {% csrf_token %}
+  <input type='submit' value="Reset password" class="btn primary"/>
+</fieldset>
 </form>
 {% endblock %}
diff --git a/app/templates/registration/registration_form.html b/app/templates/registration/registration_form.html
index 04eeba0..123b194 100644
--- a/app/templates/registration/registration_form.html
+++ b/app/templates/registration/registration_form.html
@@ -13,10 +13,13 @@
 <p>In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.</p>
 
 <form method='post' action=''>
-  <table>
-    {{ form }}
-  </table>
-  {% csrf_token %}
-  <input type="submit" value="Send activation email" class="btn primary"/>
+  <fieldset>
+    {% include "formtools/formfield.html" with field=form.username %}
+    {% include "formtools/formfield.html" with field=form.email %}
+    {% include "formtools/formfield.html" with field=form.password1 %}
+    {% include "formtools/formfield.html" with field=form.password2 %}
+    {% csrf_token %}
+    <input type="submit" value="Send activation email" class="btn primary"/>
+  </fieldset>
 </form>
 {% endblock %}