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 1e69fba9..751dc32c 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
@@ -12,24 +12,24 @@
           textarea(readonly, rows='1', text-focus-select, ng-copy='focusAddKey = true'
           ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub
 
-        br
+      br
 
       .form-group
-        label.control-label.col-md-1
+        label.control-label(for='adb-device-key')
           i.fa.fa-key.fa-fw
           span(translate) Key
-        .col-md-11
-          textarea(rows='4', name='deviceKey', ng-model='addForm.key', ng-required='true',
-          autocorrect='off', autocapitalize='off', spellcheck='false',
-          focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control
+
+        textarea(id='adb-device-key', rows='4', name='deviceKey', ng-model='addForm.key', ng-required='true',
+        autocorrect='off', autocapitalize='off', spellcheck='false',
+        focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control
 
       .form-group
-        label.control-label.col-md-1
+        label.control-label(for='adb-device-title')
           i.fa.fa-laptop.fa-fw
           span(translate)  Device
-        .col-md-11
-          input(type='text', name='deviceTitle', ng-model='addForm.title', ng-required='true',
-          text-focus-select, focus-element='focusAddTitle').form-control
+        
+        input(id='adb-device-title', type='text', name='deviceTitle', ng-model='addForm.title', ng-required='true',
+        text-focus-select, focus-element='focusAddTitle').form-control
 
       button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
         i.fa.fa-plus.fa-fw
diff --git a/res/app/settings/adb-keys/adb-keys.jade b/res/app/settings/adb-keys/adb-keys.jade
deleted file mode 100644
index 31e43658..00000000
--- a/res/app/settings/adb-keys/adb-keys.jade
+++ /dev/null
@@ -1,111 +0,0 @@
-.row(ng-controller='AdbKeysCtrl')
-  .col-sm-12
-    .widget-container.fluid-height.stf-adb-keys
-      .heading
-        i.fa.fa-android
-        span(translate) ADB Keys
-
-        button.btn.pull-right.btn-sm(
-        ng-click='showAdd = !showAdd',
-        ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }')
-          //(tooltip='{{ "Add ADB Key" | translate }}')
-          i.fa.fa-plus.fa-fw
-
-      .widget-content.padded
-
-        add-adb-key(show-clipboard='true', show-add='showAdd')
-
-        nothing-to-show(icon='fa-key', message='{{"No ADB keys" | translate}}',
-        ng-if='!adbKeys.length && !showAdd')
-
-
-        //accordion(ng-if='showAdd').pointer
-          accordion-group(is-open='showAdd')
-            accordion-heading.pointer
-              i.fa.fa-fw.fa-key
-              span(translateX) Add ADB Key
-
-            form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)')
-
-              .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,
-                ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub
-                //<code>pbcopy < ~/.android/adbkey.pub</code>
-
-              br
-
-              .form-group
-                label.control-label.col-md-1
-                  i.fa.fa-key.fa-fw
-                  span(translate) Key
-                .col-md-11
-                  textarea(rows='4', ng-model='key', ng-required='true',
-                  autocorrect='off', autocapitalize='off', spellcheck='false',
-                  focus-element='focusAddKey').form-control
-
-              .form-group
-                label.control-label.col-md-1
-                  i.fa.fa-laptop.fa-fw
-                  span(translate)  Device
-                .col-md-11
-                  input(type='text', ng-model='title', ng-required='true',
-                  text-focus-select, focus-element='focusAddTitle').form-control
-
-              button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
-                i.fa.fa-plus.fa-fw
-                span(translate) Add Key
-
-        //.panel.panel-default(ng-show='showAdd')
-          .panel-heading
-            h3.panel-title(translate) Add ADB Key
-          .panel-body
-            form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)')
-
-              .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
-                //<code>pbcopy < ~/.android/adbkey.pub</code>
-
-              br
-
-              .form-group
-                label.control-label.col-md-1
-                  i.fa.fa-key.fa-fw
-                  span(translate) Key
-                .col-md-11
-                  textarea(rows='4', ng-model='key', ng-required='true',
-                  autocorrect='off', autocapitalize='off', spellcheck='false',
-                  focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control
-
-              .form-group
-                label.control-label.col-md-1
-                  i.fa.fa-laptop.fa-fw
-                  span(translate)  Device
-                .col-md-11
-                  input(type='text', ng-model='title', ng-required='true',
-                  text-focus-select, focus-element='focusAddTitle').form-control
-
-
-
-              button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
-                i.fa.fa-plus.fa-fw
-                span(translate) Add Key
-
-        //error-message(message='{{error}}')
-
-
-        ul.list-group.key-list
-          li.list-group-item(ng-repeat='key in adbKeys').animate-repeat
-            a
-              i.fa.fa-key.fa-2x.fa-fw.key-list-icon
-              .key-list-details.selectable
-                .key-list-title(ng-bind='key.title')
-                .key-list-fingerprint(ng-bind='key.fingerprint')
-
-              button.btn.btn-xs.btn-danger-outline.pull-right.key-list-remove(ng-click='removeKey(key)')
-                i.fa.fa-trash-o
-                span(translate) Remove
diff --git a/res/app/settings/index.js b/res/app/settings/index.js
index 49792e47..4f85b8c2 100644
--- a/res/app/settings/index.js
+++ b/res/app/settings/index.js
@@ -1,6 +1,6 @@
 module.exports = angular.module('ui-settings', [
   require('./general').name,
-  require('./adb-keys').name,
+  require('./keys').name,
   require('stf/common-ui/nice-tabs').name
   //require('./notifications').name
 ])
diff --git a/res/app/settings/keys/access-tokens/access-tokens-controller.js b/res/app/settings/keys/access-tokens/access-tokens-controller.js
new file mode 100644
index 00000000..3f457083
--- /dev/null
+++ b/res/app/settings/keys/access-tokens/access-tokens-controller.js
@@ -0,0 +1,3 @@
+module.exports = function AccessTokensCtrl($scope) {
+    
+}
diff --git a/res/app/settings/keys/access-tokens/access-tokens-spec.js b/res/app/settings/keys/access-tokens/access-tokens-spec.js
new file mode 100644
index 00000000..8d542dcb
--- /dev/null
+++ b/res/app/settings/keys/access-tokens/access-tokens-spec.js
@@ -0,0 +1,17 @@
+describe('AccessTokensCtrl', function () {
+
+  beforeEach(angular.mock.module(require('./index').name))
+
+  var scope, ctrl
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new()
+    ctrl = $controller('AccessTokensCtrl', {$scope: scope})
+  }))
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1)
+
+  }))
+
+})
diff --git a/res/app/settings/keys/access-tokens/access-tokens.css b/res/app/settings/keys/access-tokens/access-tokens.css
new file mode 100644
index 00000000..faeea397
--- /dev/null
+++ b/res/app/settings/keys/access-tokens/access-tokens.css
@@ -0,0 +1,3 @@
+.stf-access-tokens {
+
+}
\ No newline at end of file
diff --git a/res/app/settings/keys/access-tokens/access-tokens.jade b/res/app/settings/keys/access-tokens/access-tokens.jade
new file mode 100644
index 00000000..8ef5366e
--- /dev/null
+++ b/res/app/settings/keys/access-tokens/access-tokens.jade
@@ -0,0 +1,33 @@
+.widget-container.fluid-height.stf-access-tokens(ng-controller='AccessTokensCtrl')
+  .heading
+    i.fa.fa-key
+    span(translate) Access Tokens
+
+    button.btn.pull-right.btn-sm(
+    ng-click='showAdd = !showAdd',
+    ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }')
+      i.fa.fa-plus.fa-fw
+
+    a(ng-href='/#!/docs/access-tokens').pull-right.btn.btn-sm
+      i.fa.fa-question-circle(tooltip='{{"More about Access Tokens" | translate}}', tooltip-placement='left')
+
+  .widget-content.padded
+
+    //add-adb-key(show-clipboard='true', show-add='showAdd')
+
+    nothing-to-show(icon='fa-key', message='{{"No access tokens" | translate}}',
+    ng-if='!adbKeys.length && !showAdd')
+
+
+
+    ul.list-group.key-list
+      li.list-group-item(ng-repeat='key in adbKeys').animate-repeat
+        a
+          i.fa.fa-key.fa-2x.fa-fw.key-list-icon
+          .key-list-details.selectable
+            .key-list-title(ng-bind='key.title')
+            .key-list-fingerprint(ng-bind='key.fingerprint')
+
+          button.btn.btn-xs.btn-danger-outline.pull-right.key-list-remove(ng-click='removeKey(key)')
+            i.fa.fa-trash-o
+            span(translate) Remove
diff --git a/res/app/settings/keys/access-tokens/index.js b/res/app/settings/keys/access-tokens/index.js
new file mode 100644
index 00000000..d6ebb992
--- /dev/null
+++ b/res/app/settings/keys/access-tokens/index.js
@@ -0,0 +1,11 @@
+require('./access-tokens.css')
+
+module.exports = angular.module('stf.access-tokens', [
+  require('stf/common-ui').name
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put(
+      'settings/keys/access-tokens/access-tokens.jade', require('./access-tokens.jade')
+    )
+  }])
+  .controller('AccessTokensCtrl', require('./access-tokens-controller'))
diff --git a/res/app/settings/adb-keys/adb-keys-controller.js b/res/app/settings/keys/adb-keys/adb-keys-controller.js
similarity index 87%
rename from res/app/settings/adb-keys/adb-keys-controller.js
rename to res/app/settings/keys/adb-keys/adb-keys-controller.js
index a68ad2e1..8645ad84 100644
--- a/res/app/settings/adb-keys/adb-keys-controller.js
+++ b/res/app/settings/keys/adb-keys/adb-keys-controller.js
@@ -7,11 +7,11 @@ module.exports = function AdbKeysCtrl($scope, AddAdbKeyModalService) {
 
   $scope.adbKeys = [
     {
-      title: 'PC1264',
+      title: 'A11251@PC1264.local',
       fingerprint: 'bb:86:60:39:d7:a2:e3:09:93:09:cc:f6:e8:37:99:3f'
     },
     {
-      title: 'Mobile mac',
+      title: 'A11251@MobileMac.local',
       fingerprint: '97:ca:ae:fa:09:0b:c4:fe:22:94:7d:b2:be:77:66:a1'
     }
   ]
diff --git a/res/app/settings/adb-keys/adb-keys-service.js b/res/app/settings/keys/adb-keys/adb-keys-service.js
similarity index 100%
rename from res/app/settings/adb-keys/adb-keys-service.js
rename to res/app/settings/keys/adb-keys/adb-keys-service.js
diff --git a/res/app/settings/adb-keys/adb-keys-spec.js b/res/app/settings/keys/adb-keys/adb-keys-spec.js
similarity index 100%
rename from res/app/settings/adb-keys/adb-keys-spec.js
rename to res/app/settings/keys/adb-keys/adb-keys-spec.js
diff --git a/res/app/settings/adb-keys/adb-keys.css b/res/app/settings/keys/adb-keys/adb-keys.css
similarity index 100%
rename from res/app/settings/adb-keys/adb-keys.css
rename to res/app/settings/keys/adb-keys/adb-keys.css
diff --git a/res/app/settings/keys/adb-keys/adb-keys.jade b/res/app/settings/keys/adb-keys/adb-keys.jade
new file mode 100644
index 00000000..c37403ca
--- /dev/null
+++ b/res/app/settings/keys/adb-keys/adb-keys.jade
@@ -0,0 +1,114 @@
+.widget-container.fluid-height.stf-adb-keys(ng-controller='AdbKeysCtrl')
+  .heading
+    i.fa.fa-android
+    span(translate) ADB Keys
+
+
+
+    button.btn.pull-right.btn-sm(
+    ng-click='showAdd = !showAdd',
+    ng-class='{ "btn-primary-outline": !showAdd, "btn-primary": showAdd }')
+      //(tooltip='{{ "Add ADB Key" | translate }}')
+      i.fa.fa-plus.fa-fw
+
+    a(ng-href='/#!/docs/adb-keys').pull-right.btn.btn-sm
+      i.fa.fa-question-circle(tooltip='{{"More about ADB Keys" | translate}}', tooltip-placement='left')
+
+  .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')
+
+
+    //accordion(ng-if='showAdd').pointer
+      accordion-group(is-open='showAdd')
+        accordion-heading.pointer
+          i.fa.fa-fw.fa-key
+          span(translateX) Add ADB Key
+
+        form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)')
+
+          .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,
+            ).form-control.remote-debug-textarea pbcopy < ~/.android/adbkey.pub
+            //<code>pbcopy < ~/.android/adbkey.pub</code>
+
+          br
+
+          .form-group
+            label.control-label.col-md-1
+              i.fa.fa-key.fa-fw
+              span(translate) Key
+            .col-md-11
+              textarea(rows='4', ng-model='key', ng-required='true',
+              autocorrect='off', autocapitalize='off', spellcheck='false',
+              focus-element='focusAddKey').form-control
+
+          .form-group
+            label.control-label.col-md-1
+              i.fa.fa-laptop.fa-fw
+              span(translate)  Device
+            .col-md-11
+              input(type='text', ng-model='title', ng-required='true',
+              text-focus-select, focus-element='focusAddTitle').form-control
+
+          button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
+            i.fa.fa-plus.fa-fw
+            span(translate) Add Key
+
+    //.panel.panel-default(ng-show='showAdd')
+      .panel-heading
+        h3.panel-title(translate) Add ADB Key
+      .panel-body
+        form.form-horizontal(name='adbkeyform', ng-submit='addKey(key)')
+
+          .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
+            //<code>pbcopy < ~/.android/adbkey.pub</code>
+
+          br
+
+          .form-group
+            label.control-label.col-md-1
+              i.fa.fa-key.fa-fw
+              span(translate) Key
+            .col-md-11
+              textarea(rows='4', ng-model='key', ng-required='true',
+              autocorrect='off', autocapitalize='off', spellcheck='false',
+              focus-element='focusAddKey', ng-paste='focusAddTitle = true').form-control
+
+          .form-group
+            label.control-label.col-md-1
+              i.fa.fa-laptop.fa-fw
+              span(translate)  Device
+            .col-md-11
+              input(type='text', ng-model='title', ng-required='true',
+              text-focus-select, focus-element='focusAddTitle').form-control
+
+
+
+          button.btn.btn-primary-outline.btn-sm.pull-right(type='submit')
+            i.fa.fa-plus.fa-fw
+            span(translate) Add Key
+
+    //error-message(message='{{error}}')
+
+
+    ul.list-group.key-list
+      li.list-group-item(ng-repeat='key in adbKeys').animate-repeat
+        a
+          i.fa.fa-key.fa-2x.fa-fw.key-list-icon
+          .key-list-details.selectable
+            .key-list-title(ng-bind='key.title')
+            .key-list-fingerprint(ng-bind='key.fingerprint')
+
+          button.btn.btn-xs.btn-danger-outline.pull-right.key-list-remove(ng-click='removeKey(key)')
+            i.fa.fa-trash-o
+            span(translate) Remove
diff --git a/res/app/settings/adb-keys/index.js b/res/app/settings/keys/adb-keys/index.js
similarity index 81%
rename from res/app/settings/adb-keys/index.js
rename to res/app/settings/keys/adb-keys/index.js
index f71c91af..0ee60357 100644
--- a/res/app/settings/adb-keys/index.js
+++ b/res/app/settings/keys/adb-keys/index.js
@@ -6,7 +6,7 @@ module.exports = angular.module('stf.settings.adb-keys', [
 ])
   .run(["$templateCache", function ($templateCache) {
     $templateCache.put(
-      'settings/adb-keys/adb-keys.jade', require('./adb-keys.jade')
+      'settings/keys/adb-keys/adb-keys.jade', require('./adb-keys.jade')
     )
   }])
   .controller('AdbKeysCtrl', require('./adb-keys-controller'))
diff --git a/res/app/settings/keys/index.js b/res/app/settings/keys/index.js
new file mode 100644
index 00000000..6acdea3a
--- /dev/null
+++ b/res/app/settings/keys/index.js
@@ -0,0 +1,12 @@
+require('./keys.css')
+
+module.exports = angular.module('stf.keys', [
+  require('./adb-keys').name,
+  require('./access-tokens').name
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put(
+      'settings/keys/keys.jade', require('./keys.jade')
+    )
+  }])
+  .controller('KeysCtrl', require('./keys-controller'))
diff --git a/res/app/settings/keys/keys-controller.js b/res/app/settings/keys/keys-controller.js
new file mode 100644
index 00000000..91abf1e7
--- /dev/null
+++ b/res/app/settings/keys/keys-controller.js
@@ -0,0 +1,3 @@
+module.exports = function KeysCtrl($scope) {
+    
+}
diff --git a/res/app/settings/keys/keys-spec.js b/res/app/settings/keys/keys-spec.js
new file mode 100644
index 00000000..1509e65e
--- /dev/null
+++ b/res/app/settings/keys/keys-spec.js
@@ -0,0 +1,17 @@
+describe('KeysCtrl', function () {
+
+  beforeEach(angular.mock.module(require('./index').name))
+
+  var scope, ctrl
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new()
+    ctrl = $controller('KeysCtrl', {$scope: scope})
+  }))
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1)
+
+  }))
+
+})
diff --git a/res/app/settings/keys/keys.css b/res/app/settings/keys/keys.css
new file mode 100644
index 00000000..186571c6
--- /dev/null
+++ b/res/app/settings/keys/keys.css
@@ -0,0 +1,3 @@
+.stf-keys {
+
+}
\ No newline at end of file
diff --git a/res/app/settings/keys/keys.jade b/res/app/settings/keys/keys.jade
new file mode 100644
index 00000000..a5e4ac85
--- /dev/null
+++ b/res/app/settings/keys/keys.jade
@@ -0,0 +1,5 @@
+.row
+  .col-md-6
+    div(ng-include='"settings/keys/access-tokens/access-tokens.jade"')
+  .col-md-6
+    div(ng-include='"settings/keys/adb-keys/adb-keys.jade"')
diff --git a/res/app/settings/settings-controller.js b/res/app/settings/settings-controller.js
index f0e1fc56..84ff55f4 100644
--- a/res/app/settings/settings-controller.js
+++ b/res/app/settings/settings-controller.js
@@ -4,7 +4,7 @@ module.exports = function SettingsCtrl($scope, gettext) {
     {
       title: gettext('Keys'),
       icon: 'fa-key fa-fw',
-      templateUrl: 'settings/adb-keys/adb-keys.jade'
+      templateUrl: 'settings/keys/keys.jade'
     },
     {
       title: gettext('General'),