diff --git a/gms/memberdb/static/main.css b/gms/memberdb/static/main.css
index e9ddb0754fa4f1dbd868c349f28b6c764dcf25a2..fc1d591ca2e90d24475e35be8e38f50218cf5dab 100644
--- a/gms/memberdb/static/main.css
+++ b/gms/memberdb/static/main.css
@@ -31,7 +31,13 @@ body {
     border-style: 2px solid #8fc;
     border-radius: 5px;
     padding: 20px;
-    margin: 40px;
+    margin: 10px;
+}
+
+.form-container .tips {
+    margin: 10px 10px 20px 10px;
+    color: #555;
+    text-align: center;
 }
 
 fieldset {
@@ -55,7 +61,8 @@ fieldset {
 
 /* style text boxes */
 .form-row input[type="text"],
-.form-row input[type="email"] {
+.form-row input[type="email"],
+.form-row input[type="password"] {
     display: block;
     padding: 4px;
     font-size: 14px;
@@ -63,12 +70,19 @@ fieldset {
     width: 100%;
 }
 
-.form-row input[type=checkbox] {
+.form-row input[type=checkbox],
+.form-row.readonly .text {
     display: inline;
     font-size: 14px;
     line-height: 20px;
 }
 
+.form-row.readonly .text {
+    font-size: 16px;
+    padding-left: 10px;
+    color: #444;
+}
+
 .help {
     margin: 0 40px;
 }
diff --git a/gms/memberdb/templates/base.html b/gms/memberdb/templates/base.html
index b4535d46c8fac235b37b7765dd8e7e4bf9ceaa0f..0f67b9f1a732f8c1c63431f9a5610143a4d97906 100644
--- a/gms/memberdb/templates/base.html
+++ b/gms/memberdb/templates/base.html
@@ -40,11 +40,7 @@
     <div id="content">
         {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
         {% block content %}
-        {% block object-tools %}{% endblock %}
-        {{ content }}
         {% endblock %}
-        {% block sidebar %}{% endblock %}
-        <br class="clear">
     </div>
     <!-- END Content -->
 
diff --git a/gms/memberdb/templates/index.html b/gms/memberdb/templates/index.html
index e1fabd7163b7049a60abf546febdaa601c2a8b9c..456f5089b00e6f5c5b19c55430d613c45de1e3c2 100644
--- a/gms/memberdb/templates/index.html
+++ b/gms/memberdb/templates/index.html
@@ -6,7 +6,7 @@
 {% if member_list %}
     <ul>
     {% for m in member_list %}
-        <li><a href="{% url 'memberdb:info' m.username %}"><strong>[{{ m.username }}]</strong> {{ m.display_name }}</a></li>
+        <li><a href="#"><strong>[{{ m.username }}]</strong> {{ m.display_name }}</a></li>
     {% endfor %}
     </ul>
 {% else %}
diff --git a/gms/memberdb/templates/register.html b/gms/memberdb/templates/register.html
index 26b25fff76f543314f3d54b51b70727636fde297..776534dbe518a6821f21a4f7f19ea9e5ea1aac78 100644
--- a/gms/memberdb/templates/register.html
+++ b/gms/memberdb/templates/register.html
@@ -1,10 +1,18 @@
 {% extends "base.html" %}
 
-{% block title %}Register a New Gumby into the System{% endblock %}
+{% block title %}UCC Registration{% endblock %}
+
+{% block content_title %}<h1>Register as a new member</h1>{% endblock %}
 
 {% block content %}
 <div class="form-container">
-    <form action="{% url 'memberdb:register' %}" method="post">
+    <form action="{% block action_url %}{% url 'memberdb:register' %}{% endblock %}" method="post">
+        <p class="tips">
+        {% block tips %}
+            Enter your details, and press "Register" when you are done.<br>
+            Once your membership has been approved, you will receive an email with further instructions to activate your account.
+        {% endblock %}
+        </p>
         {% csrf_token %}
     
         {% if form.non_field_errors|length > 0 %}
@@ -14,6 +22,8 @@
             {{ form.non_field_errors }}
         {% endif %}
 
+        {% block extra_preform %}{% endblock %}
+
         {% for field in form %}
         <div class="form-row">
             {{ field.errors }}
@@ -27,7 +37,7 @@
         </div>
         {% endfor %}
         <div class="submit-row">
-            <input type="submit" class="default" value="Register">
+            <input type="submit" class="default" value="{% block action_text %}Register{% endblock %}">
         </div>
     </form>
 </div>
diff --git a/gms/memberdb/templates/renew.html b/gms/memberdb/templates/renew.html
index 030c9671243f4abc5f5f86f014c72864290e6be0..1e6077fa1e4d7940f2d9e59e3a3423c6a87ea531 100644
--- a/gms/memberdb/templates/renew.html
+++ b/gms/memberdb/templates/renew.html
@@ -1,12 +1,25 @@
-<h1>Renew membership for {{ m.username }}</h1>
-
-{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
-
-<form action="{% url 'memberdb:renew' m.username %}" method="post">
-{% csrf_token %}
-{% for choice in question.choice_set.all %}
-    <input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
-    <label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
-{% endfor %}
-<input type="submit" value="Vote">
-</form>
\ No newline at end of file
+{% extends "register.html" %}
+{% block title %}UCC Membership Renewal{% endblock %}
+{% block content_title %}
+    <h1>Renew your membership</h1>
+{% endblock %}
+
+{% block tips %}
+{% if is_new %}
+<b>Your account exists already but no membership information has yet been recorded in this system.</b>
+<br>Please update/correct the details below as necessary.
+{% else %}
+Please confirm that the details below have not changed since your last registration or membership renewal.
+{% endif %}
+{% endblock %}
+
+{% block extra_preform %}
+<div class="form-row readonly">
+    <label for="id_username">Username:</label>
+    <span class="text" id="id_username">{{ request.user.username }}</span>
+</div>
+{% endblock %}
+
+{% block action_url %}{% url 'memberdb:renew' %}{% endblock %}
+
+{% block action_text %}Renew{% endblock %}
\ No newline at end of file