diff --git a/rapids/templates/rapids/rapid_detail.html b/rapids/templates/rapids/rapid_detail.html
index ffb52dc9..742d02e9 100755
--- a/rapids/templates/rapids/rapid_detail.html
+++ b/rapids/templates/rapids/rapid_detail.html
@@ -1,6 +1,21 @@
 {% extends 'rapids/base.html' %}
 
 {% block content %}
+
+
+{% if exam %}
+<div>
+
+{% if previous > -1 %}
+<a href="{% url 'anatomy:exam_question_detail' exam.id previous %}">Previous question</a>
+{% endif %}
+ This question is part of exam: {{exam.name}} [{{pos}}/{{exam_length}}]
+{% if next %}
+<a href="{% url 'anatomy:exam_question_detail' exam.id next %}">Next question</a>
+{% endif %}
+</div>
+{% endif %}
+
 <a href="{% url 'rapids:rapid_update' pk=rapid.pk %}" title="Edit the Rapid">Edit</a>
 <a href="{% url 'rapids:rapid_clone' pk=rapid.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
 <a href="{% url 'rapids:rapid_add_note' pk=rapid.pk %}"> Add Note</a>
diff --git a/rapids/views.py b/rapids/views.py
index 9a523ee5..53611862 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -1038,7 +1038,7 @@ def exam_question_detail(request, pk, sk):
 
     return render(
         request,
-        "rapids/question_detail.html",
+        "rapids/rapid_detail.html",
         {
             "question": question,
             "exam": exam,