diff --git a/anatomy/tests/test_anatomy_exams.py b/anatomy/tests/test_anatomy_exams.py
index 3b8e01e3..6eca2334 100644
--- a/anatomy/tests/test_anatomy_exams.py
+++ b/anatomy/tests/test_anatomy_exams.py
@@ -300,11 +300,11 @@ def test_exams(db, client):
         search_exam = (
             cid_scores_soup.find("div", {"id": "exam-assigned"})
             .find("ul", {"class": exam.app_name})
-            .find_all("li", attrs={"data-exam-id": exam.pk})
+            .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
         assert exam.name in str(search_exam)
-        assert "Active" in str(search_exam)
+        assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
         invalid_exam = cid_scores_soup.find_all(
diff --git a/generic/templates/generic/cid_group_base.html b/generic/templates/generic/cid_group_base.html
index bb1c837f..58307b9b 100644
--- a/generic/templates/generic/cid_group_base.html
+++ b/generic/templates/generic/cid_group_base.html
@@ -3,28 +3,33 @@
 
 {% block navigation %}
         {{block.super}}
-        <br/>
-        Group: {{group.name}}->
         {% if group_type == "cid" %}
+                <br/>
+                Group: {{group.name}}->
 
                 {% if not group %}
-                    <a href="{% url 'generic:cid_group_detail' cidusergroup.pk %}">Group</a> /
-                    <a href="{% url 'generic:cid_group_update' cidusergroup.pk %}">Edit Users</a> /
-                    <a href="{% url 'generic:cid_group_exams' cidusergroup.pk %}">Edit Exams</a> /
-                    <a href="{% url 'generic:cid_group_delete' cidusergroup.pk %}">Delete</a>
+                        <a href="{% url 'generic:cid_group_detail' cidusergroup.pk %}">Group</a> /
+                        <a href="{% url 'generic:cid_group_update' cidusergroup.pk %}">Edit Users</a> /
+                        <a href="{% url 'generic:cid_group_exams' cidusergroup.pk %}">Edit Exams</a> /
+                        <a href="{% url 'generic:cid_group_delete' cidusergroup.pk %}">Delete</a>
 
                 {% else %}
-                    <a href="{% url 'generic:cid_group_detail' group.pk %}">Group</a> /
-                    <a href="{% url 'generic:cid_group_update' group.pk %}">Edit Users</a> /
-                    <a href="{% url 'generic:cid_group_exams' group.pk %}">Edit Exams</a> /
-                    <a href="{% url 'generic:cid_group_delete' group.pk %}">Delete</a>
+                        <a href="{% url 'generic:cid_group_detail' group.pk %}">Group</a> /
+                        <a href="{% url 'generic:cid_group_update' group.pk %}">Edit Users</a> /
+                        <a href="{% url 'generic:cid_group_exams' group.pk %}">Edit Exams</a> /
+                        <a href="{% url 'generic:cid_group_delete' group.pk %}">Delete</a>
                 {% endif %}
 
         {% else %}
-                <a href="{% url 'generic:user_group_detail' group.pk %}">Group</a> /
-                <a href="{% url 'generic:user_group_update' group.pk %}">Edit Users</a> /
-                <a href="{% url 'generic:user_group_exams' group.pk %}">Edit Exams</a> /
-                <a href="{% url 'generic:user_group_delete' group.pk %}">Delete</a>
+
+                {% if group %}
+                        <br/>
+                        Group: {{group.name}}->
+                        <a href="{% url 'generic:user_group_detail' group.pk %}">Group</a> /
+                        <a href="{% url 'generic:user_group_update' group.pk %}">Edit Users</a> /
+                        <a href="{% url 'generic:user_group_exams' group.pk %}">Edit Exams</a> /
+                        <a href="{% url 'generic:user_group_delete' group.pk %}">Delete</a>
+                {% endif %}
         {% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/generic/templates/generic/cidusergroup_form.html b/generic/templates/generic/cidusergroup_form.html
index 87df0c35..a9e758ab 100755
--- a/generic/templates/generic/cidusergroup_form.html
+++ b/generic/templates/generic/cidusergroup_form.html
@@ -5,10 +5,10 @@
 {% endblock %}
 {% block js %}
 <!--<script type="text/javascript" src="/admin/jsi18n/"></script>-->
-{{form.media}}
+    {{form.media}}
 
-<script type="text/javascript">
-</script>
+    <script type="text/javascript">
+    </script>
 
 <!-- {{ form.media }} -->
 {% endblock %}
@@ -20,28 +20,31 @@
         <h2>Add New Group</h2>
         Use this form to create a CID user group.
     {% endif %}
-<form action="" method="post" enctype="multipart/form-data" id="condition-form">
-    {% csrf_token %}
+    <form action="" method="post" enctype="multipart/form-data" id="condition-form">
+        {% csrf_token %}
 
-    <table>
-        {{ form.as_table }}
-    </table>
-    <input type="submit" class="submit-button" value="Submit" name="submit">
+        <table>
+            {{ form.as_table }}
+        </table>
+        <input type="submit" class="submit-button" value="Submit" name="submit">
 
-    <p>Users can be added to the group <a href="{% url 'generic:manage_cids' %}">here</a></p>
 
-    <h3>Users</h3>
+        {% if cidusergroup %}
+            <p>Users can be added to the group <a href="{% url 'generic:manage_cids' %}">here</a></p>
 
-        <ul>
-            {% for user in cidusergroup.ciduser_set.all %}
-                <li><a href="{% url 'generic:update_cid' user.pk %}">{{user.cid}}</a>: {{user.name}} [{{user.email}} {{user.last_name}}] {{user.userprofile.grade}}</li>
+            <h3>Users</h3>
 
-            {% empty %}
-                <li>Group currently has no users.</li>
-            {% endfor %}
-        </ul>
-        Count: {{cidusergroup.ciduser_set.count}}
-    
+            <ul>
+                {% for user in cidusergroup.ciduser_set.all %}
+                    <li><a href="{% url 'generic:update_cid' user.pk %}">{{user.cid}}</a>: {{user.name}} [{{user.email}} {{user.last_name}}] {{user.userprofile.grade}}</li>
 
-</form>
+                {% empty %}
+                    <li>Group currently has no users.</li>
+                {% endfor %}
+            </ul>
+            Count: {{cidusergroup.ciduser_set.count}}
+        {% endif %}
+
+
+    </form>
 {% endblock %}
\ No newline at end of file
diff --git a/generic/tests/test_trainees.py b/generic/tests/test_trainees.py
index cf22c0f9..1bb17491 100644
--- a/generic/tests/test_trainees.py
+++ b/generic/tests/test_trainees.py
@@ -44,6 +44,7 @@ def test_trainee_stuff(client, create_cid_manager, create_users):
     print(UserProfile.objects.all().count())
 
     assert UserProfile.objects.all().count() == 5
+    print(UserProfile.objects.filter(peninsula_trainee=True))
     assert UserProfile.objects.filter(peninsula_trainee=True).count() == 4
 
     response = client.get(reverse(f"trainees"))
@@ -59,9 +60,10 @@ def test_trainee_stuff(client, create_cid_manager, create_users):
     response = client.get(reverse(f"trainees"))
     assert response.status_code == 200
 
-    trainee_rows = BeautifulSoup(response.content, "html.parser").find(
+    trainee_rows = BeautifulSoup(response.content, "html.parser").find_all(
         "tr", {"class": "trainee"}
     )
+    print(trainee_rows)
 
     assert (
         len(trainee_rows) == UserProfile.objects.filter(peninsula_trainee=True).count()
diff --git a/longs/tests/test_longs_exams.py b/longs/tests/test_longs_exams.py
index c7c96869..4fa29872 100644
--- a/longs/tests/test_longs_exams.py
+++ b/longs/tests/test_longs_exams.py
@@ -442,11 +442,11 @@ def test_exams(db, client):
         search_exam = (
             cid_scores_soup.find("div", {"id": "exam-assigned"})
             .find("ul", {"class": exam.app_name})
-            .find_all("li", attrs={"data-exam-id": exam.pk})
+            .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
         assert exam.name in str(search_exam)
-        assert "Active" in str(search_exam)
+        assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
         invalid_exam = cid_scores_soup.find_all(
diff --git a/rad/static/css/anatomy.css b/rad/static/css/anatomy.css
index b7c9a798..9d4d8762 100644
--- a/rad/static/css/anatomy.css
+++ b/rad/static/css/anatomy.css
@@ -1057,7 +1057,7 @@ table .peninsula-trainee::before {
   user-select: none;
 }
 
-.form-control {
+.form-control, .form-control:focus, .form-control option {
   background-color: unset;
   color: unset
-}
\ No newline at end of file
+}
diff --git a/rad/tests/test_helpers.py b/rad/tests/test_helpers.py
index bc708918..e57e9025 100644
--- a/rad/tests/test_helpers.py
+++ b/rad/tests/test_helpers.py
@@ -340,11 +340,11 @@ class ExamTester:
             search_exam = (
                 cid_scores_soup.find("div", {"id": "exam-assigned"})
                 .find("ul", {"class": self.exam.app_name.lower()})
-                .find_all("li", attrs={"data-exam-id": self.exam.pk})
+                .find("li", attrs={"data-exam-id": self.exam.pk})
             )
             assert search_exam
             assert self.exam.name in str(search_exam)
-            assert "Active" in str(search_exam)
+            assert len(search_exam.find("button", {"class": "start-button"})) > 0
             # assert "Active" in assigned_exams # check it is active
 
             invalid_exam = cid_scores_soup.find_all(
diff --git a/rad/tests/test_user_access.py b/rad/tests/test_user_access.py
index e69de29b..39a64d00 100644
--- a/rad/tests/test_user_access.py
+++ b/rad/tests/test_user_access.py
@@ -0,0 +1,91 @@
+
+from django.urls import reverse
+
+from rich.pretty import pprint
+
+from bs4 import BeautifulSoup
+
+from django.contrib.auth.models import Group
+import pytest
+
+
+@pytest.fixture
+def create_users(db, django_user_model):
+    user1 = django_user_model.objects.create_user(
+        "user1", "user1@user.com", "password"
+    )
+    user2 = django_user_model.objects.create_user(
+        "user2", "user2@user.com", "password"
+    )
+    #g = Group.objects.create(name="cid_user_manager")
+    #g.save()
+    #user.groups.add(g)
+    return user1, user2
+
+@pytest.fixture
+def create_cid_manager(db, django_user_model):
+    user = django_user_model.objects.create_user(
+        "cid_user", "cid@user.com", "password1234"
+    )
+    g = Group.objects.create(name="cid_user_manager")
+    g.save()
+    user.groups.add(g)
+    return user
+
+def test_profile_access_and_management(db, client, create_users, create_cid_manager):
+
+    response = client.get(reverse(f"profile"))
+
+    # should redirect to login page
+    assert response.status_code == 302
+    assert "accounts/login/" in response.url
+    # Test login
+
+    client.login(username="user1", password="password")
+
+    response = client.get(reverse(f"profile"))
+
+    assert response.status_code == 200
+
+    soup = BeautifulSoup(response.content, "html.parser")
+
+    assert soup.find(id="username").text == "user1"
+    assert soup.find(id="email").text == "user1@user.com"
+
+    # Check the links to change password and update profile
+    password_url = soup.find(id="password-change")["href"]
+    print(password_url)
+    password_change_response = client.get(password_url)
+    assert password_change_response.status_code == 200
+
+    password_soup = BeautifulSoup(password_change_response.content, "html.parser")
+    assert "Old password" in password_soup.text
+    assert "New password" in password_soup.text
+
+    update_profile = soup.find(id="update-profile-link")["href"]
+
+    assert update_profile == reverse("account_profile_update", kwargs={"slug": "user1"})
+
+    # check we can't access another users profile 
+    response_fail = client.get(reverse("account_profile_update", kwargs={"slug": "user2"}))
+    assert response_fail.status_code == 404
+    print(response_fail.content)
+
+    # And that we can access our own
+    update_profile_response = client.get(reverse("account_profile_update", kwargs={"slug": "user1"}))
+    assert update_profile_response.status_code == 200
+
+    assert "peninsula_trainee" not in BeautifulSoup(update_profile_response.content, "html.parser").text
+
+    update_response = client.post(reverse("account_profile_update", kwargs={"slug": "user1"}), {
+        "registration_number": 1234567
+    })
+    assert update_response.status_code == 302
+    # we reirect back to profile page on form submission
+    assert update_response.url == reverse("profile")
+
+    # check that the form has updated
+    update_profile_response = client.get(reverse("account_profile_update", kwargs={"slug": "user1"}))
+    assert BeautifulSoup(update_profile_response.content, "html.parser").find(id="id_registration_number")["value"]
+
+
diff --git a/rad/views.py b/rad/views.py
index ce28068e..3c3b343e 100644
--- a/rad/views.py
+++ b/rad/views.py
@@ -636,6 +636,8 @@ class UpdateUserProfileView(UpdateView):
         if request.user.is_superuser or request.user.groups.filter(name="cid_user_manager").exists():
             self.fields = ["supervisor", "grade", "registration_number", "peninsula_trainee"]
         # Check permissions for the request.user here
+        elif request.user != self.get_object().user:
+            raise Http404
         elif request.user.userprofile.peninsula_trainee:
             self.fields = ["supervisor", "grade", "registration_number"]
 
@@ -645,9 +647,14 @@ class UpdateUserProfileView(UpdateView):
 
 
     def get_success_url(self):
-        view_name = "account_profile"
-        # No need for reverse_lazy here, because it's called inside the method
-        return reverse(view_name, kwargs={"slug": self.object.username})
+        if self.request.user.is_superuser or self.request.user.groups.filter(name="cid_user_manager").exists():
+            view_name = "account_profile"
+            # No need for reverse_lazy here, because it's called inside the method
+            return reverse(view_name, kwargs={"slug": self.object.username})
+        else:
+            return reverse("profile")
+
+
 
 # class UpdateUser(TemplateView):
 #
diff --git a/rapids/tests/test_rapids_exams.py b/rapids/tests/test_rapids_exams.py
index 418635f0..4feadba6 100644
--- a/rapids/tests/test_rapids_exams.py
+++ b/rapids/tests/test_rapids_exams.py
@@ -332,11 +332,11 @@ def test_exams(db, client):
         search_exam = (
             cid_scores_soup.find("div", {"id": "exam-assigned"})
             .find("ul", {"class": exam.app_name})
-            .find_all("li", attrs={"data-exam-id": exam.pk})
+            .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
         assert exam.name in str(search_exam)
-        assert "Active" in str(search_exam)
+        assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
         invalid_exam = cid_scores_soup.find_all(
diff --git a/rapids/tests/test_urls.py b/rapids/tests/test_urls.py
index fe06831d..712e2a0b 100644
--- a/rapids/tests/test_urls.py
+++ b/rapids/tests/test_urls.py
@@ -241,7 +241,10 @@ def test_cid_management(client, create_cid_manager, django_user_model):
 
     for url in urls:
         response = client.get(url)
-        assert response.status_code == 403
+        if response.status_code == 302:
+            assert "accounts/login/" in response.url
+        else:
+            assert response.status_code == 403
 
     pass
 
@@ -250,6 +253,7 @@ def test_cid_management(client, create_cid_manager, django_user_model):
     client.force_login(cid_manager)
 
     for url in urls:
+        print(url)
         response = client.get(url)
         assert response.status_code == 200
 
diff --git a/templates/accounts_bulk_create.html b/templates/accounts_bulk_create.html
index 64402909..7aaeac18 100644
--- a/templates/accounts_bulk_create.html
+++ b/templates/accounts_bulk_create.html
@@ -26,8 +26,8 @@
         <table>
 
             <tr><th>First name</th><th>Last name</th><th>Email</th><th>Grade</th><th>Supervisor</th><th>Supervisor email</th></tr>
-            <tr><td>name 1</td><td>last name 1</td><td>email1@email.com</td><td>grade 1</td><td>supervisor 1</td><td>Supervisor@email.com</td></tr>
-            <tr><td>name 2</td><td>last name 2</td><td>email2@email.com</td><td>grade 2</td><td>supervisor 2</td><td>Supervisor2@email.com</td></tr>
+            <tr><td>name 1</td><td>last name 1</td><td>email1@email.com</td><td>ST1</td><td>supervisor 1</td><td>Supervisor@email.com</td></tr>
+            <tr><td>name 2</td><td>last name 2</td><td>email2@email.com</td><td>ST2</td><td>supervisor 2</td><td>Supervisor2@email.com</td></tr>
         </table>
 
 
diff --git a/templates/cid_scores.html b/templates/cid_scores.html
index 781973c5..d7f89e1f 100644
--- a/templates/cid_scores.html
+++ b/templates/cid_scores.html
@@ -3,16 +3,38 @@
 {% block content %}
     <div class="">
         <h2>CID: {{ cid }}</h2>
+        <div class="alert alert-dark" role="alert">
+            <details>
+                <summary>Help</summary>
+                <p>This page shows the exam(s) to which you have access.</p>
+                <p>When an exam is available to take it will have a "Start" button next to it.</p>
+                <p>Once you have submitted answers you will be able to view them from the Exam results section. (Please note: although your answers will be visible as soon as they are submitted, correct answers will only be available when the exam results have been published.)</p>
+                <p>If you have not submitted any answer for an exam it will not appear in the Exam Results section below. In this case you can still review the pubilshed results by following the "Results Published" link in the assigend exams section.</p>
+            </details>
+        </div>
         <h3>Assigned exams</h3>
         <div id="exam-assigned">
             The following exams will be available to take when active.
             {% for exam_type, exams in available_exams %}
-                <h4>{{exam_type|title}}</h4>
-                <ul class='{{exam_type|lower}}'>
-                    {% for exam in exams  %}
-                        <li class="exam" data-exam-id="{{exam.pk}}"><a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank">{{exam.name}} {% if exam.active %}[Active]{% endif %}</a></li>
-                    {% endfor %}
-                </ul>
+                {% if exams %}
+                    <h4>{{exam_type|title}}</h4>
+                    <ul class='{{exam_type|lower}}'>
+                        {% for exam in exams  %}
+                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
+                                {% if exam.active %}
+                                    <a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank" title="Click to take exam">
+                                        <button class="small-url-button start-button">Start</button>
+                                    </a>
+                                {% endif %}
+                                {% if exam.publish_results %}
+                                    <a href= "{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}" title="Click to view results">
+                                        <button class="small-url-button results-button">Results Published</button>
+                                    </a>
+                                {% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endif %}
             {% endfor %}
         </div>
 
diff --git a/templates/profile.html b/templates/profile.html
index 8ee02904..e9540f26 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -5,14 +5,14 @@
     <div class="anatomy">
         <h1>Profile</h1>
         <div>
-            Username: {{ user.username }}
+            Username: <span id="username">{{ user.username }}</span>
         </div>
         <div>
-            Email: {{ user.email }}
+            Email: <span id="email">{{ user.email }}</span>
         </div>
         <div>
-            Name: {{ user.first_name }}
-            {{ user.last_name }}
+            Name: <span id="first-name">{{ user.first_name }}<span>
+            <span id="last-name">{{ user.last_name }}</span>
         </div>
         <div>
             Grade: {{ user.userprofile.grade }}
@@ -54,11 +54,11 @@
         </p>
 
 
-        <a href="{% url 'password_change'%}">Change password</a>
+        <a id="password-change" href="{% url 'password_change'%}">Change password</a>
 
         {% if request.user|has_group:"cid_user_manager" %}
             <a href="{% url 'account_update' user.username %}">Update user details</a>
         {% endif %}
-        <a href="{% url 'account_profile_update' user.username %}">Update user profile</a>
+        <a id="update-profile-link" href="{% url 'account_profile_update' user.username %}">Update user profile</a>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/user_scores.html b/templates/user_scores.html
index b87505c5..9b1a135e 100644
--- a/templates/user_scores.html
+++ b/templates/user_scores.html
@@ -21,8 +21,16 @@
                     <ul class='{{exam_type|lower}}'>
                         {% for exam in exams  %}
                             <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
-                                {% if exam.active %}<a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam"><button class="small-url-button">Start</button></a>{% endif %} 
-                                {% if exam.publish_results %}<a href= "{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results"><button class="small-url-button">Results Published</button></a>{% endif %}
+                                {% if exam.active %}
+                                    <a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
+                                        <button class="small-url-button start-button">Start</button>
+                                    </a>
+                                {% endif %}
+                                {% if exam.publish_results %}
+                                    <a href= "{% url exam_type|lower|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
+                                        <button class="small-url-button results-button">Results Published</button>
+                                    </a>
+                                {% endif %}
                             </li>
                         {% endfor %}
                     </ul>
diff --git a/templates/user_update_profile.html b/templates/user_update_profile.html
index 932d7203..925ec5c6 100644
--- a/templates/user_update_profile.html
+++ b/templates/user_update_profile.html
@@ -4,7 +4,7 @@
 
 {% block content %}
     <h2>Editing user: {{object.username}}</h2>
-    This form allows you to edit additional user details.
+    This form allows you to edit your profile details. If your supervisor is not available on the system please contact: ross.kruger@nhs.net.
 
     {% if request.user|has_group:"cid_user_manager" %}
         Name and emails can be edited <a href="{% url 'account_update' object.username %}">here</a>