diff --git a/anatomy/templates/anatomy/exams.html b/anatomy/templates/anatomy/exams.html
index 2410ce0a..23de930f 100644
--- a/anatomy/templates/anatomy/exams.html
+++ b/anatomy/templates/anatomy/exams.html
@@ -1,7 +1,13 @@
 {% extends 'anatomy/base.html' %}
 
 {% block navigation %}
-{{block.super}}
-<br/>
-Exams: {{exam.name}}-> <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">Overview</a> / <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark</a> / <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a>
-{% endblock %}
\ No newline at end of file
+    {{block.super}}
+    <br/>
+    Exams: {{exam.name}}->
+    <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">Overview</a> /
+    {% if exam.exam_mode %}
+        <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark</a> /
+        <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a> /
+    {% endif %}
+    <a href="{% url 'anatomy:anatomy_create_exam' pk=exam.pk %}">Add New Question</a>
+{% endblock %}
diff --git a/anatomy/urls.py b/anatomy/urls.py
index 2160dd4c..0a730cc5 100644
--- a/anatomy/urls.py
+++ b/anatomy/urls.py
@@ -20,6 +20,7 @@ urlpatterns = [
         views.AnatomyQuestionCreate.as_view(),
         name="anatomy_question_create",
     ),
+    path("create/exam/<int:pk>", views.AnatomyQuestionCreate.as_view(), name="anatomy_create_exam"),
     path(
         "question/<int:pk>/update",
         views.AnatomyQuestionUpdate.as_view(),
diff --git a/anatomy/views.py b/anatomy/views.py
index 8e75e75e..ad21b6ab 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -730,7 +730,13 @@ class AnatomyQuestionCreate(AnatomyQuestionCreateBase):
     # initial = {'laterality': AnatomyQuestion.NONE}
 
     def get_initial(self):
-        pass
+        if "pk" in self.kwargs:
+            initial = super().get_initial()
+            exam = get_object_or_404(Exam, pk=self.kwargs["pk"])
+
+            initial["exams"] = [exam.id]
+
+            return initial
 
 
 #        # There has to be a better way...
diff --git a/rapids/templates/rapids/exams.html b/rapids/templates/rapids/exams.html
index d028b34b..ab8c5f66 100644
--- a/rapids/templates/rapids/exams.html
+++ b/rapids/templates/rapids/exams.html
@@ -1,7 +1,13 @@
 {% extends 'rapids/base.html' %}
 
 {% block navigation %}
-{{block.super}}
-<br/>
-Exams: {{exam.name}}-> <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">Overview</a> / <a href="{% url 'rapids:mark_overview' pk=exam.pk %}">Mark</a> / <a href="{% url 'rapids:exam_scores_cid' pk=exam.pk %}">Scores</a> / <a href="{% url 'rapids:rapid_create_exam' pk=exam.pk %}">Add Question</a>
-{% endblock %}
\ No newline at end of file
+    {{block.super}}
+    <br/>
+    Exams: {{exam.name}}->
+    <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">Overview</a> /
+    {% if exam.exam_mode %}
+        <a href="{% url 'rapids:mark_overview' pk=exam.pk %}">Mark</a> /
+        <a href="{% url 'rapids:exam_scores_cid' pk=exam.pk %}">Scores</a> /
+    {% endif %}
+    <a href="{% url 'rapids:rapid_create_exam' pk=exam.pk %}">Add New Question</a>
+{% endblock %}