diff --git a/atlas/models.py b/atlas/models.py
index 5777b00b..e5040463 100644
--- a/atlas/models.py
+++ b/atlas/models.py
@@ -747,16 +747,11 @@ class CaseDetail(models.Model):
         ordering = ("sort_order",)
 
 
-class CidReportAnswer(models.Model):
+class BaseReportAnswer(models.Model):
     question = models.ForeignKey(CaseDetail, on_delete=models.CASCADE)
 
     answer = models.TextField(blank=True)
 
-    cid = models.BigIntegerField(
-        blank=False,
-        help_text="Candidate ID",
-    )
-
     feedback = models.TextField(blank=True)
 
     created = models.DateTimeField(auto_now_add=True)
@@ -775,4 +770,18 @@ class CidReportAnswer(models.Model):
             self.answer = self.answer.strip()
 
     def get_answer_score(self):
-        return self.score
\ No newline at end of file
+        return self.score
+
+    class Meta:
+        abstract = True
+
+class CidReportAnswer(BaseReportAnswer):
+    cid = models.BigIntegerField(
+        blank=False,
+        help_text="Candidate ID",
+    )
+
+class UserReportAnswer(BaseReportAnswer):
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+    )
\ No newline at end of file
diff --git a/rapids/templates/rapids/exam_scores_user.html b/rapids/templates/rapids/exam_scores_user.html
index 7647439a..4535c4f6 100644
--- a/rapids/templates/rapids/exam_scores_user.html
+++ b/rapids/templates/rapids/exam_scores_user.html
@@ -59,6 +59,12 @@
                     .done(function (data) {
                     console.log(data);
 
+                    let images = data.images
+
+                    if ("feedback_images" in data) {
+                        images.push(...images.feedback_images)
+                    }
+
                     let event = new CustomEvent('loadDicomViewerUrls', {
                         "detail": { "images": data.images, "annotations": data.annotations }
                     });