diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 339de2d8..6e38c7bf 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -3,7 +3,9 @@
{% block content %}
Marking question {{question_details.current}} of {{question_details.total}}
-
View Edit Admin Edit
+
View
+
Edit
+ {% if request.user.is_superuser %}
Admin Edit{% endif %}
{{ question.question_type }}
{% if question.structure %}
Structure: {{question.structure}}
diff --git a/generic/templates/generic/exam_overview_headers.html b/generic/templates/generic/exam_overview_headers.html
index 1bfcabf1..3161ec17 100644
--- a/generic/templates/generic/exam_overview_headers.html
+++ b/generic/templates/generic/exam_overview_headers.html
@@ -13,15 +13,17 @@
{% if exam.exam_mode %}
- {% if not exam.cid_user_groups.count and not exam.user_user_groups.count %}
-
- This exam does not have any user / cid groups added.
-
+ {% if exam.exam_open_access %}
{% else %}
- {% if not candidate_count.0 and not candidate_count.1 %}
+ {% if not exam.cid_user_groups.count and not exam.user_user_groups.count %}
- This exam does not have any candidates.
+ This exam does not have any user / cid groups added.
+ {% if not candidate_count.0 and not candidate_count.1 %}
+
+ This exam does not have any candidates.
+
+ {% endif %}
{% endif %}
{% endif %}
{% endif %}
@@ -34,7 +36,12 @@ This exam has {{question_number}} questions.
Exam mode: {{ exam.exam_mode }}
{% if exam.exam_mode %}
- Cid candidates:
{{candidate_count.0}}, User candidates:
{{candidate_count.1}}
+ {% if exam.exam_open_access %}
+ This exam is available to all registered users.
+ {% else %}
+ Cid candidates:
{{candidate_count.0}}, User candidates:
{{candidate_count.1}}
+ {% endif %}
+
{% endif %}
Markers:
diff --git a/rapids/templates/rapids/mark.html b/rapids/templates/rapids/mark.html
index 2f379105..38607504 100644
--- a/rapids/templates/rapids/mark.html
+++ b/rapids/templates/rapids/mark.html
@@ -3,10 +3,9 @@
{% block content %}
{% if review %}Reviewing{% else %}Marking{% endif %} question {{question_details.current}} of {{question_details.total}}
-
View Edit Admin
- Edit
+
View
+
Edit
+ {% if request.user.is_superuser %}
Admin Edit{% endif %}
{% if unmarked_answers_bool %}
This questions has unmarked answers. Are you sure you want to review?