diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css
index 312910e9..9ccf48a0 100644
--- a/anatomy/static/css/anatomy.css
+++ b/anatomy/static/css/anatomy.css
@@ -97,4 +97,13 @@ button a {
 #stats-plot {
   width: 50%;
   float: right;
+}
+
+#dicom-element {
+  width: 60%;
+  float: left;
+}
+
+.marking {
+  float: right;
 }
\ No newline at end of file
diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js
index 7b86d9b6..5acae061 100644
--- a/anatomy/static/js/anatomy.js
+++ b/anatomy/static/js/anatomy.js
@@ -1,4 +1,3 @@
-var dwvapp = [];
 
 var marked_answers = {
     "correct": [],
@@ -50,13 +49,29 @@ 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;
+  const WwwcTool = cornerstoneTools.WwwcTool;
+  const WwwcRegionTool = cornerstoneTools.WwwcRegionTool;
+  const RotateTool = cornerstoneTools.RotateTool;
+  const StackScrollTool = cornerstoneTools.StackScrollTool;
+  const MagnifyTool = cornerstoneTools.MagnifyTool;
+
+  cornerstoneTools.addTool(PanTool);
+  cornerstoneTools.addTool(ZoomTool);
+  cornerstoneTools.addTool(ZoomMouseWheelTool);
+  cornerstoneTools.addTool(WwwcTool);
+  cornerstoneTools.addTool(WwwcRegionTool);
+  cornerstoneTools.addTool(RotateTool);
+  cornerstoneTools.addTool(StackScrollTool);
+  cornerstoneTools.addTool(MagnifyTool);
   // Enable our tools
-  cornerstoneTools.mouseInput.enable(element);
-  cornerstoneTools.mouseWheelInput.enable(element);
-  cornerstoneTools.wwwc.activate(element, 1); // Left Click
-  cornerstoneTools.pan.activate(element, 2); // Middle Click
-  cornerstoneTools.zoom.activate(element, 4); // Right Click
-  cornerstoneTools.zoomWheel.activate(element); // Mouse Wheel
+
+  cornerstoneTools.setToolActive("Pan", { mouseButtonMask: 1 });
+  cornerstoneTools.setToolActive("WwwcTool", { mouseButtonMask: 2 });
+  cornerstoneTools.setToolActive("ZoomMouseWheel", { mouseButtonMask: 3 });
+  cornerstoneTools.setToolActive("Zoom", { mouseButtonMask: 4 });
 });
     }
 
diff --git a/anatomy/templates/anatomy/exam.html b/anatomy/templates/anatomy/exam.html
index d98295ac..d9c59c6e 100644
--- a/anatomy/templates/anatomy/exam.html
+++ b/anatomy/templates/anatomy/exam.html
@@ -41,7 +41,7 @@
 <table>
     <tr>
         <td>
-            <div class=dwv-container data-url="{{ question.image.url}}" />
+            <div id="dicom-element" data-url="{{ question.image.url}}" />
             </div>
 
             <form method="POST" class="post-form">{% csrf_token %}
diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html
index 13330287..859a46dd 100644
--- a/anatomy/templates/anatomy/mark.html
+++ b/anatomy/templates/anatomy/mark.html
@@ -4,6 +4,8 @@
 <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
 <p>{{ question.question_type }}</p>
 
+<div id="dicom-element" data-url="{{ question.image.url}}" />
+<div class="marking">
 <form method="POST" class="post-form">{% csrf_token %}
     <div class="marking-list">Marked:
         <ul id="marked-answer-list" class="answer-list">
@@ -38,6 +40,6 @@
         {{ form.as_p }}
     </span>
 </form>
-<div id="dicom-element" data-url="{{ question.image.url}}" />
+</div>
 </div>
 {% endblock %}
\ No newline at end of file