diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js
index 5acae061..6757c773 100644
--- a/anatomy/static/js/anatomy.js
+++ b/anatomy/static/js/anatomy.js
@@ -36,19 +36,15 @@ $(document).ready(function () {
 
     if($("#dicom-element").length) {
 
+$('#dicom-element').bind('contextmenu', function(e) {
+    return false;
+}); 
+
 cornerstoneBase64ImageLoader.external.cornerstone = cornerstone;
 cornerstoneWebImageLoader.external.cornerstone = cornerstone;
 cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
 
 cornerstoneTools.init();
-
-const element = document.getElementById('dicom-element');
-const imageId = element.dataset.url;
-
-cornerstone.enable(element);
-cornerstone.loadAndCacheImage(imageId).then(function(image) {
-  cornerstone.displayImage(element, image);
-
   const PanTool = cornerstoneTools.PanTool;
   const ZoomTool = cornerstoneTools.ZoomTool;
   const ZoomMouseWheelTool = cornerstoneTools.ZoomMouseWheelTool;
@@ -58,6 +54,15 @@ cornerstone.loadAndCacheImage(imageId).then(function(image) {
   const StackScrollTool = cornerstoneTools.StackScrollTool;
   const MagnifyTool = cornerstoneTools.MagnifyTool;
 
+
+
+const element = document.getElementById('dicom-element');
+const imageId = element.dataset.url;
+
+cornerstone.enable(element);
+cornerstone.loadAndCacheImage(imageId).then(function(image) {
+  cornerstone.displayImage(element, image);
+
   cornerstoneTools.addTool(PanTool);
   cornerstoneTools.addTool(ZoomTool);
   cornerstoneTools.addTool(ZoomMouseWheelTool);
@@ -67,11 +72,13 @@ cornerstone.loadAndCacheImage(imageId).then(function(image) {
   cornerstoneTools.addTool(StackScrollTool);
   cornerstoneTools.addTool(MagnifyTool);
   // Enable our tools
-
+  // Avoid incorrect aspect ratio
+  cornerstone.resize(element);
   cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
-  cornerstoneTools.setToolActive("WwwcTool", { mouseButtonMask: 2 });
+  cornerstoneTools.setToolActive("Wwwc", { mouseButtonMask: 2 });
   cornerstoneTools.setToolActive("ZoomMouseWheel", { mouseButtonMask: 3 });
   cornerstoneTools.setToolActive("Zoom", { mouseButtonMask: 4 });
+
 });
     }
 
diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 859a46dd..5769289e 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -5,6 +5,7 @@
 <p>{{ question.question_type }}</p>
 
 <div id="dicom-element" data-url="{{ question.image.url}}" />
+</div>
 <div class="marking">
 <form method="POST" class="post-form">{% csrf_token %}
     <div class="marking-list">Marked:
@@ -41,5 +42,4 @@
     </span>
 </form>
 </div>
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/anatomy/views.py b/anatomy/views.py
index 00fc8081..d0c559ee 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -358,7 +358,7 @@ def mark(request, pk, sk):
                 if ans == "":
                     continue
 
-                a = Answer.objects.filter(answer__iexact=ans).first()
+                a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
 
                 if a is None:
                     a = Answer()
@@ -375,7 +375,7 @@ def mark(request, pk, sk):
                 if ans == "":
                     continue
 
-                a = Answer.objects.filter(answer__iexact=ans).first()
+                a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
 
                 if a is None:
                     a = Answer()
@@ -390,7 +390,7 @@ def mark(request, pk, sk):
                 if ans == "":
                     continue
 
-                a = Answer.objects.filter(answer__iexact=ans).first()
+                a = Answer.objects.filter(answer__iexact=ans, question_id=question.pk).first()
 
                 if a is None:
                     a = Answer()