diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html
index bb1020b7..58986295 100644
--- a/anatomy/templates/anatomy/exam_overview.html
+++ b/anatomy/templates/anatomy/exam_overview.html
@@ -36,8 +36,8 @@
             <br />
             {{ question.question_type }}: {{ question.get_primary_answer }}
             <br />
-            Modality: {{ question.modality }}, <a href="{% url 'anatomy:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a> 
-                <span class="id">[id: {{question.pk}}]</span>
+            Modality: {{ question.modality }}, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a> 
+                <span class="id"><a href="{% url 'anatomy:question_detail' pk=question.pk %}">[id: {{question.pk}}]</a></span>
         </li>
         {% endfor %}
     </ol>
diff --git a/anatomy/templates/anatomy/question_detail.html b/anatomy/templates/anatomy/question_detail.html
index f392ec1b..3026dbd9 100644
--- a/anatomy/templates/anatomy/question_detail.html
+++ b/anatomy/templates/anatomy/question_detail.html
@@ -9,6 +9,8 @@
     <a href="{% url 'anatomy:anatomy_question_update' question.id %}" title="Edit the Question">Edit</a>
     <a href="{% url 'anatomy:question_clone' question.id %}" title="Clone the Question">Clone</a>
     <a href="{% url 'anatomy:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
+    <a href="{% url 'anatomy:question_delete' pk=question.pk %}" title="Delete the Question">Delete</a>
+    <a href="{% url 'feedback_create' question_type='anatomy' pk=question.pk %}"> Add Note</a>
     <a href="{% url 'admin:anatomy_anatomyquestion_change' question.id %}"
         title="Edit the Question using the admin interface">Admin Edit</a>
 {% if exam %}
@@ -64,6 +66,7 @@
     <div>
         Open access: {{ question.open_access }}
     </div>
+    {% include 'question_notes.html' %}
     <div>
         <span id="annotation-json-toggle">Annotation JSON (+/-):</span> <span id="annotation-json-content">
             <pre>{{ question.image_annotations }}</pre>
diff --git a/generic/views.py b/generic/views.py
index 3298abb9..daac31d8 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -35,7 +35,9 @@ from longs.models import Exam as LongExam
 from anatomy.models import AnatomyQuestion as AnatomyQuestion
 from anatomy.models import Exam as AnatomyExam
 from sbas.models import Question as SbasQuestion
-from sbas.models import Exam as SbasExam
+#from sbas.models import Exam as SbasExam
+from physics.models import Question as PhysicsQuestion
+#from physics.models import Exam as PhysicsExam
 
 from django.db.models import Case, When
 from django.conf import settings
@@ -58,6 +60,9 @@ def get_question_and_content_type(question_type):
     elif question_type == "sbas":
         question = SbasQuestion
         content_type = ContentType.objects.get(app_label="sbas", model="question")
+    elif question_type == "physics":
+        question = PhysicsQuestion
+        content_type = ContentType.objects.get(app_label="physics", model="question")
     else:
         raise PermissionError()
     
diff --git a/physics/templates/physics/exam_overview.html b/physics/templates/physics/exam_overview.html
index d32e5c65..d6f45f41 100644
--- a/physics/templates/physics/exam_overview.html
+++ b/physics/templates/physics/exam_overview.html
@@ -5,6 +5,9 @@
 {% load thumbnail %}
 <div class="physics">
     <h1>Exam: {{ exam.name }}</h1>
+
+    {% include 'exam_notes.html' %}
+
     This exam has {{question_number}} questions.
 
     <div class="parent-help" title="Click to enable / disable the exam">
diff --git a/physics/templates/physics/question_detail.html b/physics/templates/physics/question_detail.html
index e8303b92..4833e7c3 100644
--- a/physics/templates/physics/question_detail.html
+++ b/physics/templates/physics/question_detail.html
@@ -2,6 +2,7 @@
 
 {% block content %}
 <div class="question">
+<a href="{% url 'feedback_create' question_type='physics' pk=question.pk %}"> Add Note</a>
 <a href="{% url 'admin:physics_question_change' question.id %}" title="Edit the Question using the admin interface">Admin Edit</a>
     <div class="date">
         Created: {{ question.created_date|date:"d/m/Y" }}
@@ -32,5 +33,6 @@
     {{ author }}, 
     {% endfor %}
     </div>
+    {% include 'question_notes.html' %}
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/sbas/templates/sbas/base.html b/sbas/templates/sbas/base.html
index 1fed3782..1b4c0ea0 100644
--- a/sbas/templates/sbas/base.html
+++ b/sbas/templates/sbas/base.html
@@ -1,18 +1,18 @@
 {% extends 'base.html' %}
 
 {% block title %}
-Sbas
+    Sbas
 {% endblock %}
 
 {% block navigation %}
-Sbas: 
-{% if request.user.is_authenticated %}
-<a href="{% url 'sbas:exam_list' %}">Exams</a> /
-<a href="{% url 'sbas:question_view' %}">Questions</a>
-{% if request.user.is_superuser %}
-/ <a href="{% url 'sbas:user_answer_table_view' %}" title="User answers">Answers</a>
-{% endif %}
-{% endif %}
+    Sbas:
+    {% if request.user.is_authenticated %}
+        <a href="{% url 'sbas:exam_list' %}">Exams</a> /
+        <a href="{% url 'sbas:question_view' %}">Questions</a>
+        {% if request.user.is_superuser %}
+            / <a href="{% url 'sbas:user_answer_table_view' %}" title="User answers">Answers</a>
+        {% endif %}
+    {% endif %}
 {% endblock %}
 {% block content %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/sbas/templates/sbas/question_detail.html b/sbas/templates/sbas/question_detail.html
index f4b96027..d0535611 100644
--- a/sbas/templates/sbas/question_detail.html
+++ b/sbas/templates/sbas/question_detail.html
@@ -4,6 +4,7 @@
 <div class="question">
     <a href="{% url 'admin:sbas_question_change' question.id %}"
         title="Edit the Question using the admin interface">Admin Edit</a>
+    <a href="{% url 'feedback_create' question_type='sbas' pk=question.pk %}"> Add Note</a>
     <div class="date">
         Created: {{ question.created_date|date:"d/m/Y"}}
     </div>