diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
index 4fa0a5c92..11830fde1 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
@@ -1,7 +1,9 @@
 Template.lesionTable.helpers({
     'measurement': function() {
+        // All Targets shall be listed first followed by Non-Targets
         return Measurements.find({}, {
             sort: {
+                isTarget: -1,
                 lesionNumberAbsolute: 1
             }
         });
diff --git a/Packages/viewerbase/lib/enableHotkeys.js b/Packages/viewerbase/lib/enableHotkeys.js
index 14d4ad134..878512afd 100644
--- a/Packages/viewerbase/lib/enableHotkeys.js
+++ b/Packages/viewerbase/lib/enableHotkeys.js
@@ -12,8 +12,8 @@ Meteor.startup(function() {
         stackScroll: "S",
         pan: "P",
         magnify: "M",
-        scrollDown: "DOWN",
-        scrollUp: "UP",
+        scrollDown: ["DOWN", "PAGEDOWN"],
+        scrollUp: ["UP", "PAGEUP"],
         nextPanel: "RIGHT",
         previousPanel: "LEFT",
         invert: "I",