diff --git a/Packages/ohif-hotkeys/client/components/dialog.html b/Packages/ohif-hotkeys/client/components/dialog.html
index 9df5d5ed8..8f9c51a41 100644
--- a/Packages/ohif-hotkeys/client/components/dialog.html
+++ b/Packages/ohif-hotkeys/client/components/dialog.html
@@ -1,5 +1,7 @@
 <template name="hotkeysDialog">
     {{#dialogSimple (extend this dialogClass='dialog-hotkeys' title='Keyboard Shortcuts')}}
         {{>hotkeysForm this}}
+        <hr>
+        {{>windowLevelPresetsForm this}}
     {{/dialogSimple}}
 </template>
diff --git a/Packages/ohif-hotkeys/client/components/form.js b/Packages/ohif-hotkeys/client/components/form.js
index fabbcc1eb..12379a9fe 100644
--- a/Packages/ohif-hotkeys/client/components/form.js
+++ b/Packages/ohif-hotkeys/client/components/form.js
@@ -120,13 +120,14 @@ Template.hotkeysForm.helpers({
         const commandsContext = OHIF.commands.getContext(contextName);
         if (!hotkeysContext || !commandsContext) return hotkeysInputInformation;
         const hotkeyDefinitions = hotkeysContext.definitions;
-        _.each(hotkeyDefinitions, (keyCombination, commandName) => {
+        const commands = Object.keys(OHIF.hotkeys.defaults[contextName] || {});
+        commands.forEach(commandName => {
             const commandDefinitions = commandsContext[commandName];
             if (!commandDefinitions) return;
             hotkeysInputInformation.push({
                 key: commandName,
                 label: commandDefinitions.name,
-                value: keyCombination
+                value: hotkeyDefinitions[commandName] || ''
             });
         });
         return hotkeysInputInformation;
diff --git a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
new file mode 100644
index 000000000..a46d1615c
--- /dev/null
+++ b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
@@ -0,0 +1,10 @@
+<template name="windowLevelPresetsForm">
+    {{#form (extend this class='form-themed' api=instance.api)}}
+        {{>inputText label='W/L Preset 1' key='WLPreset1'}}
+        <hr>
+        <div class="clearfix">
+            {{#button class='btn btn-primary pull-right' action='save'}}Save{{/button}}
+            {{#button class='btn btn-secondary pull-right m-r-1' action='resetDefaults'}}Reset to Defaults{{/button}}
+        </div>
+    {{/form}}
+</template>
diff --git a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js
new file mode 100644
index 000000000..a3b05db13
--- /dev/null
+++ b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.js
@@ -0,0 +1,25 @@
+import { Template } from 'meteor/templating';
+import { OHIF } from 'meteor/ohif:core';
+
+Template.windowLevelPresetsForm.onCreated(() => {
+    const instance = Template.instance();
+
+    instance.api = {
+        save() {
+            const form = instance.$('form').first().data('component');
+            const definitions = form.value();
+            // TODO: return save method with promise
+        },
+
+        resetDefaults() {
+            const dialogOptions = {
+                title: 'Reset Window Level Presets to Default',
+                message: 'Are you sure you want to reset all the window level presets to their defaults?'
+            };
+
+            return OHIF.ui.showDialog('dialogConfirm', dialogOptions).then(() => {
+                // TODO: return reset method with promise
+            });
+        }
+    };
+});
diff --git a/Packages/ohif-viewerbase/client/lib/toolManager.js b/Packages/ohif-viewerbase/client/lib/toolManager.js
index 38b85e142..ffb9acfc8 100644
--- a/Packages/ohif-viewerbase/client/lib/toolManager.js
+++ b/Packages/ohif-viewerbase/client/lib/toolManager.js
@@ -402,9 +402,6 @@ export const toolManager = {
             toolManager.init();
         }
 
-        // Prevent changing if tool is already active
-        if (tool === toolManager.getActiveTool()) return;
-
         /**
          * TODO: Add textMarkerDialogs template to OHIF's
          */
diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js
index d5cf77355..f594ab7e4 100644
--- a/Packages/ohif-viewerbase/package.js
+++ b/Packages/ohif-viewerbase/package.js
@@ -191,6 +191,9 @@ Package.onUse(function(api) {
     api.addFiles('client/components/viewer/studyTimepointBrowser/studyTimepointStudy.styl', 'client');
     api.addFiles('client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js', 'client');
 
+    api.addFiles('client/components/viewer/windowLevelPresets/form.html', 'client');
+    api.addFiles('client/components/viewer/windowLevelPresets/form.js', 'client');
+
     api.export('dialogPolyfill', 'client');
 
     api.mainModule('main.js', 'client');