diff --git a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
index 7f837956..a7e2b970 100644
--- a/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
+++ b/res/app/components/stf/common-ui/modals/fatal-message/fatal-message-service.js
@@ -1,6 +1,6 @@
 module.exports =
   function FatalMessageServiceFactory($modal, $location, $route, $interval,
-    StateClassesService, $timeout) {
+    StateClassesService) {
     var FatalMessageService = {}
 
     var intervalDeviceInfo
@@ -15,7 +15,7 @@ module.exports =
 
       function update() {
         $scope.device = device
-        $scope.stateColor = StateClassesService.stateButton(device.state)
+        $scope.stateColor = StateClassesService.stateColor(device.state)
       }
 
       update()
diff --git a/res/app/components/stf/device-context-menu/device-context-menu-directive.js b/res/app/components/stf/device-context-menu/device-context-menu-directive.js
index 6ff9b8e3..e5fe5baa 100644
--- a/res/app/components/stf/device-context-menu/device-context-menu-directive.js
+++ b/res/app/components/stf/device-context-menu/device-context-menu-directive.js
@@ -15,33 +15,6 @@ module.exports = function deviceContextMenuDirective($window) {
         $window.close()
       }
 
-      function saveToDisk(fileURL, fileName) {
-        // for non-IE
-        if (!$window.ActiveXObject) {
-          var save = document.createElement('a')
-          save.href = fileURL
-          save.target = '_blank'
-          save.download = fileName || 'unknown'
-
-          var event = document.createEvent('Event')
-          event.initEvent('click', true, true)
-          save.dispatchEvent(event)
-          if ($window.URL) {
-            $window.URL.revokeObjectURL(save.href)
-          } else if ($window.webkitURL) {
-            $window.webkitURL.revokeObjectURL(save.href)
-          }
-        }
-
-        // for IE
-        else if (!!$window.ActiveXObject && document.execCommand) {
-          var _window = $window.open(fileURL, '_blank')
-          _window.document.close()
-          _window.document.execCommand('SaveAs', true, fileName || fileURL)
-          _window.close()
-        }
-      }
-
       scope.saveScreenShot = function () {
         scope.control.screenshot().then(function (result) {
           location.href = result.body.href + '?download'
diff --git a/res/app/components/stf/keys/add-adb-key/add-adb-key.jade b/res/app/components/stf/keys/add-adb-key/add-adb-key.jade
index 751dc32c..8a1fbab2 100644
--- a/res/app/components/stf/keys/add-adb-key/add-adb-key.jade
+++ b/res/app/components/stf/keys/add-adb-key/add-adb-key.jade
@@ -7,8 +7,6 @@
       div(ng-show='showClipboard')
 
         .alert.alert-info.selectable <strong>Tip: </strong>Run this command to copy the key to your clipboard
-          a(ng-href='/#!/docs/adb-keys').pull-right
-            i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left')
           textarea(readonly, rows='1', text-focus-select, ng-copy='focusAddKey = true'
           ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub
 
@@ -27,7 +25,7 @@
         label.control-label(for='adb-device-title')
           i.fa.fa-laptop.fa-fw
           span(translate)  Device
-        
+
         input(id='adb-device-title', type='text', name='deviceTitle', ng-model='addForm.title', ng-required='true',
         text-focus-select, focus-element='focusAddTitle').form-control
 
diff --git a/res/app/settings/keys/access-tokens/access-tokens-controller.js b/res/app/settings/keys/access-tokens/access-tokens-controller.js
index 3f457083..b10320b4 100644
--- a/res/app/settings/keys/access-tokens/access-tokens-controller.js
+++ b/res/app/settings/keys/access-tokens/access-tokens-controller.js
@@ -1,3 +1,3 @@
-module.exports = function AccessTokensCtrl($scope) {
-    
+module.exports = function AccessTokensCtrl() {
+
 }
diff --git a/res/app/settings/keys/adb-keys/adb-keys-controller.js b/res/app/settings/keys/adb-keys/adb-keys-controller.js
index 61fa7e17..8f07e197 100644
--- a/res/app/settings/keys/adb-keys/adb-keys-controller.js
+++ b/res/app/settings/keys/adb-keys/adb-keys-controller.js
@@ -1,14 +1,29 @@
-module.exports = function AdbKeysCtrl($scope, $http, UserService) {
-  $scope.adbKeys = []
+module.exports =
+  function AdbKeysCtrl($scope, $http, UserService, AddAdbKeyModalService,
+    FatalMessageService) {
+    $scope.adbKeys = []
+
+    function updateKeys() {
+      $scope.adbKeys = UserService.getAdbKeys()
+    }
+
+    $scope.removeKey = function (key) {
+      UserService.removeAdbKey(key)
+    }
+
+    $scope.$on('user.keys.adb.updated', updateKeys)
+    updateKeys()
+
+    //AddAdbKeyModalService.open({
+    //  fingerprint: '9a:12:5b:14:e3:3e:c9:d3:59:be:4f:16:0d:4d:cd:26',
+    //  title: 'a12907@PC-5954.local'
+    //})
+
+    //FatalMessageService.open({
+    //  enhancedName: 'dev',
+    //  enhancedStatePassive: 'online',
+    //  likelyLeaveReason: 'Not good enough'
+    //})
+
 
-  function updateKeys() {
-    $scope.adbKeys = UserService.getAdbKeys()
   }
-
-  $scope.removeKey = function (key) {
-    UserService.removeAdbKey(key)
-  }
-
-  $scope.$on('user.keys.adb.updated', updateKeys)
-  updateKeys()
-}
diff --git a/res/app/settings/keys/adb-keys/adb-keys.jade b/res/app/settings/keys/adb-keys/adb-keys.jade
index c37403ca..3e2df587 100644
--- a/res/app/settings/keys/adb-keys/adb-keys.jade
+++ b/res/app/settings/keys/adb-keys/adb-keys.jade
@@ -16,11 +16,11 @@
 
   .widget-content.padded
 
-    add-adb-key(show-clipboard='true', show-add='showAdd')
-
     nothing-to-show(icon='fa-android', message='{{"No ADB keys" | translate}}',
     ng-if='!adbKeys.length && !showAdd')
 
+    add-adb-key(show-clipboard='true', show-add='showAdd')
+
 
     //accordion(ng-if='showAdd').pointer
       accordion-group(is-open='showAdd')
diff --git a/res/app/settings/keys/keys-controller.js b/res/app/settings/keys/keys-controller.js
index 91abf1e7..54493f0f 100644
--- a/res/app/settings/keys/keys-controller.js
+++ b/res/app/settings/keys/keys-controller.js
@@ -1,3 +1,3 @@
-module.exports = function KeysCtrl($scope) {
-    
+module.exports = function KeysCtrl() {
+
 }