diff --git a/Packages/ohif-hotkeys/client/components/dialog.html b/Packages/ohif-hotkeys/client/components/dialog.html
deleted file mode 100644
index 8b233ab68..000000000
--- a/Packages/ohif-hotkeys/client/components/dialog.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<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/dialog.styl b/Packages/ohif-hotkeys/client/components/dialog.styl
deleted file mode 100644
index 9142edc82..000000000
--- a/Packages/ohif-hotkeys/client/components/dialog.styl
+++ /dev/null
@@ -1,3 +0,0 @@
-.dialog-hotkeys .modal-body
-  max-height: 80vh
-  overflow-y: auto
diff --git a/Packages/ohif-hotkeys/client/components/form.html b/Packages/ohif-hotkeys/client/components/form.html
index 04a008ebb..ca452b592 100644
--- a/Packages/ohif-hotkeys/client/components/form.html
+++ b/Packages/ohif-hotkeys/client/components/form.html
@@ -3,8 +3,7 @@
         {{#each hotkeyInputInformation in getHotkeyInputInformationList}}
             {{>inputText (extend hotkeyInputInformation class='hotkey')}}
         {{/each}}
-        <hr>
-        <div class="clearfix">
+        <div class="clearfix form-buttons">
             {{#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>
diff --git a/Packages/ohif-hotkeys/client/components/form.js b/Packages/ohif-hotkeys/client/components/form.js
index 12379a9fe..b1796bce0 100644
--- a/Packages/ohif-hotkeys/client/components/form.js
+++ b/Packages/ohif-hotkeys/client/components/form.js
@@ -71,11 +71,6 @@ Template.hotkeysForm.onCreated(() => {
     };
 });
 
-// >>>> REMOVE ME
-Meteor.startup(() => {
-    OHIF.ui.showDialog('hotkeysDialog', { contextName: 'viewer' });
-});
-
 Template.hotkeysForm.events({
     'keydown .hotkey'(event, instance) {
         if (instance.allowedKeys.indexOf(event.keyCode) > -1) {
diff --git a/Packages/ohif-hotkeys/client/components/index.js b/Packages/ohif-hotkeys/client/components/index.js
index 90bf0451b..67429ab28 100644
--- a/Packages/ohif-hotkeys/client/components/index.js
+++ b/Packages/ohif-hotkeys/client/components/index.js
@@ -1,5 +1,2 @@
-import './dialog.html';
-import './dialog.styl';
-
 import './form.html';
 import './form.js';
diff --git a/Packages/ohif-user/client/lib/data.js b/Packages/ohif-user/client/lib/data.js
index 5aafc1684..99e7b368f 100644
--- a/Packages/ohif-user/client/lib/data.js
+++ b/Packages/ohif-user/client/lib/data.js
@@ -13,8 +13,11 @@ OHIF.user.getData = key => {
     // Check if there is an user logged in
     OHIF.user.validate();
 
+    // Get the user object
+    const user = Meteor.user();
+
     // Get user profile data
-    const profile = Meteor.user().profile;
+    const profile = user && user.profile;
 
     // Get the user persistent data
     const data = profile && profile.persistent;
diff --git a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
index 6265d0117..4bba2ed3f 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
@@ -47,9 +47,6 @@ Template.viewerMain.onRendered(() => {
     OHIF.viewerbase.layoutManager = new LayoutManager(parentElement, studies);
     studyPrefetcher.setStudies(studies);
 
-    // Enable hotkeys
-    hotkeyUtils.enableHotkeys();
-
     Session.set('OHIFViewerMainRendered', Random.id());
 });
 
diff --git a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
index 5a0acba5c..02204ada6 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
+++ b/Packages/ohif-viewerbase/client/components/viewer/windowLevelPresets/form.html
@@ -4,7 +4,7 @@
             <thead>
                 <tr>
                     <th>Preset</th>
-                    <th>Name</th>
+                    <th>Description</th>
                     <th>Window Level (WL)</th>
                     <th>Window Width (WW)</th>
                 </tr>
@@ -20,8 +20,7 @@
                 {{/each}}
             </tbody>
         </table>
-        <hr>
-        <div class="clearfix">
+        <div class="clearfix form-buttons">
             {{#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>
diff --git a/Packages/ohif-viewerbase/client/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js
index 8ec741766..eae313a10 100644
--- a/Packages/ohif-viewerbase/client/lib/WLPresets.js
+++ b/Packages/ohif-viewerbase/client/lib/WLPresets.js
@@ -121,22 +121,24 @@ class WindowLevelPresetsManager {
     }
 
     store(wlPresets) {
+        const self = this;
         return new Promise((resolve, reject) => {
-            if (this.storeFunction) {
-                this.storeFunction(wlPresets).then(resolve).catch(reject);
+            if (self.storeFunction) {
+                self.storeFunction(wlPresets).then(resolve).catch(reject);
             } else if (Meteor.userId()) {
                 OHIF.user.setData(WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject);
             } else {
                 Session.setPersistent(WL_STORAGE_KEY, wlPresets);
                 resolve();
             }
-        }).then(() => this.setOHIFWLPresets(wlPresets));
+        }).then(() => self.setOHIFWLPresets(wlPresets));
     }
 
     retrieve() {
+        const self = this;
         return new Promise((resolve, reject) => {
-            if (this.retrieveFunction) {
-                this.retrieveFunction().then(resolve).catch(reject);
+            if (self.retrieveFunction) {
+                self.retrieveFunction().then(resolve).catch(reject);
             } else if (Meteor.userId()) {
                 try {
                     resolve(OHIF.user.getData(WL_STORAGE_KEY));
@@ -150,14 +152,15 @@ class WindowLevelPresetsManager {
     }
 
     load() {
+        const self = this;
         return new Promise((resolve, reject) => {
-            this.retrieve().then(wlPresets => {
+            self.retrieve().then(wlPresets => {
                 if (wlPresets) {
-                    this.setOHIFWLPresets(wlPresets);
+                    self.setOHIFWLPresets(wlPresets);
                 } else {
-                    this.loadDefauls();
+                    self.loadDefaults();
                 }
-            }).catch(this.loadDefauls);
+            }).catch(self.loadDefaults);
         });
     }
 
@@ -187,7 +190,7 @@ class WindowLevelPresetsManager {
         this.changeObserver.changed();
     }
 
-    loadDefauls() {
+    loadDefaults() {
         this.setOHIFWLPresets(OHIF.viewer.defaultWLPresets);
     }
 
@@ -196,11 +199,6 @@ class WindowLevelPresetsManager {
     }
 }
 
-// TODO: add this to a namespace definition
-Meteor.startup(function() {
-
-});
-
 /**
  * Export functions inside WLPresets namespace.
  */
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index be9f20860..b6ca87a5a 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -217,6 +217,9 @@ Meteor.startup(function() {
     OHIF.viewer.hotkeyFunctions = {};
 
     OHIF.viewer.loadedSeriesData = {};
+
+    // Enable hotkeys
+    hotkeyUtils.enableHotkeys();
 });
 
 // Define a jQuery reverse function