diff --git a/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js b/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
index b7212bad..ec2bcc99 100644
--- a/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
+++ b/res/app/components/stf/common-ui/nice-tabs/nice-tabs-directive.js
@@ -16,7 +16,11 @@ module.exports = function niceTabsDirective() {
       })
 
       scope.tabFound = function (tab) {
+        if (!tab.filters) {
+          return true
+        }
         var found = false
+
         angular.forEach(tab.filters, function (value) {
           if (value === scope.filter) {
             found = true
diff --git a/res/app/layout/index.js b/res/app/layout/index.js
index 22fbfbd0..d1e89110 100644
--- a/res/app/layout/index.js
+++ b/res/app/layout/index.js
@@ -6,7 +6,6 @@ require('./small.css')
 require('./stf-styles.css')
 
 module.exports = angular.module('layout', [
-  require('../settings/language').name,
   require('stf/landscape').name,
   require('stf/basic-mode').name,
   require('ui-bootstrap').name,
diff --git a/res/app/settings/adb-keys/adb-keys-controller.js b/res/app/settings/adb-keys/adb-keys-controller.js
new file mode 100644
index 00000000..0209e33f
--- /dev/null
+++ b/res/app/settings/adb-keys/adb-keys-controller.js
@@ -0,0 +1,3 @@
+module.exports = function AdbKeysCtrl($scope) {
+
+}
diff --git a/res/app/settings/adb-keys/adb-keys-spec.js b/res/app/settings/adb-keys/adb-keys-spec.js
new file mode 100644
index 00000000..c37ce1e1
--- /dev/null
+++ b/res/app/settings/adb-keys/adb-keys-spec.js
@@ -0,0 +1,17 @@
+describe('AdbKeysCtrl', function () {
+
+  beforeEach(angular.mock.module(require('./index').name))
+
+  var scope, ctrl
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new()
+    ctrl = $controller('AdbKeysCtrl', {$scope: scope})
+  }))
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1)
+
+  }))
+
+})
diff --git a/res/app/settings/adb-keys/adb-keys.css b/res/app/settings/adb-keys/adb-keys.css
new file mode 100644
index 00000000..6ee7c465
--- /dev/null
+++ b/res/app/settings/adb-keys/adb-keys.css
@@ -0,0 +1,3 @@
+.stf-adb-keys {
+
+}
\ No newline at end of file
diff --git a/res/app/settings/adb-keys/adb-keys.jade b/res/app/settings/adb-keys/adb-keys.jade
new file mode 100644
index 00000000..76f914f8
--- /dev/null
+++ b/res/app/settings/adb-keys/adb-keys.jade
@@ -0,0 +1,10 @@
+.row
+  .col-md-12
+    .widget-container.fluid-height.stf-adb-keys
+      .heading
+        i.fa.fa-key
+        span(translate) ADB Keys
+      .widget-content.padded
+        div
+
+
diff --git a/res/app/settings/adb-keys/index.js b/res/app/settings/adb-keys/index.js
new file mode 100644
index 00000000..467ab020
--- /dev/null
+++ b/res/app/settings/adb-keys/index.js
@@ -0,0 +1,12 @@
+require('./adb-keys.css')
+
+module.exports = angular.module('stf.settings.adb-keys', [
+
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put(
+      'settings/adb-keys/adb-keys.jade'
+      , require('./adb-keys.jade')
+    )
+  }])
+  .controller('AdbKeysCtrl', require('./adb-keys-controller'))
diff --git a/res/app/settings/general/general-controller.js b/res/app/settings/general/general-controller.js
new file mode 100644
index 00000000..aa3399e9
--- /dev/null
+++ b/res/app/settings/general/general-controller.js
@@ -0,0 +1,3 @@
+module.exports = function GeneralCtrl($scope) {
+    
+}
diff --git a/res/app/settings/general/general-spec.js b/res/app/settings/general/general-spec.js
new file mode 100644
index 00000000..9bda6dad
--- /dev/null
+++ b/res/app/settings/general/general-spec.js
@@ -0,0 +1,17 @@
+describe('GeneralCtrl', function () {
+
+  beforeEach(angular.mock.module(require('./index').name))
+
+  var scope, ctrl
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new()
+    ctrl = $controller('GeneralCtrl', {$scope: scope})
+  }))
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1)
+
+  }))
+
+})
diff --git a/res/app/settings/general/general.css b/res/app/settings/general/general.css
new file mode 100644
index 00000000..59dd8ad4
--- /dev/null
+++ b/res/app/settings/general/general.css
@@ -0,0 +1,3 @@
+.stf-general {
+
+}
\ No newline at end of file
diff --git a/res/app/settings/general/general.jade b/res/app/settings/general/general.jade
new file mode 100644
index 00000000..d2f5fc5c
--- /dev/null
+++ b/res/app/settings/general/general.jade
@@ -0,0 +1,5 @@
+.row
+  .col-md-6
+    div(ng-include='"settings/general/local/local-settings.jade"')
+  .col-md-6
+    div(ng-include='"settings/general/language/language.jade"')
diff --git a/res/app/settings/general/index.js b/res/app/settings/general/index.js
new file mode 100644
index 00000000..f49f90af
--- /dev/null
+++ b/res/app/settings/general/index.js
@@ -0,0 +1,13 @@
+require('./general.css')
+
+module.exports = angular.module('stf.settings.general', [
+  require('./language').name,
+  require('./local').name
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put(
+      'settings/general/general.jade'
+      , require('./general.jade')
+    )
+  }])
+  .controller('GeneralCtrl', require('./general-controller'))
diff --git a/res/app/settings/language/index.js b/res/app/settings/general/language/index.js
similarity index 78%
rename from res/app/settings/language/index.js
rename to res/app/settings/general/language/index.js
index e1a23027..7e83d400 100644
--- a/res/app/settings/language/index.js
+++ b/res/app/settings/general/language/index.js
@@ -4,7 +4,7 @@ module.exports = angular.module('stf-ui-language', [
 ])
   .run(["$templateCache", function ($templateCache) {
     $templateCache.put(
-      'settings/language/language.jade', require('./language.jade')
+      'settings/general/language/language.jade', require('./language.jade')
     )
   }])
   .controller('LanguageCtrl', require('./language-controller'))
diff --git a/res/app/settings/language/language-controller.js b/res/app/settings/general/language/language-controller.js
similarity index 100%
rename from res/app/settings/language/language-controller.js
rename to res/app/settings/general/language/language-controller.js
diff --git a/res/app/settings/language/language.jade b/res/app/settings/general/language/language.jade
similarity index 100%
rename from res/app/settings/language/language.jade
rename to res/app/settings/general/language/language.jade
diff --git a/res/app/settings/local/index.js b/res/app/settings/general/local/index.js
similarity index 88%
rename from res/app/settings/local/index.js
rename to res/app/settings/general/local/index.js
index a0f83ea5..bdef6d8c 100644
--- a/res/app/settings/local/index.js
+++ b/res/app/settings/general/local/index.js
@@ -7,7 +7,7 @@ module.exports = angular.module('ui-local-settings', [
 ])
   .run(["$templateCache", function ($templateCache) {
     $templateCache.put(
-      'settings/local/local-settings.jade'
+      'settings/general/local/local-settings.jade'
     , require('./local-settings.jade')
     )
   }])
diff --git a/res/app/settings/local/local-settings-controller.js b/res/app/settings/general/local/local-settings-controller.js
similarity index 100%
rename from res/app/settings/local/local-settings-controller.js
rename to res/app/settings/general/local/local-settings-controller.js
diff --git a/res/app/settings/local/local-settings.jade b/res/app/settings/general/local/local-settings.jade
similarity index 100%
rename from res/app/settings/local/local-settings.jade
rename to res/app/settings/general/local/local-settings.jade
diff --git a/res/app/settings/index.js b/res/app/settings/index.js
index 70d8df8b..49792e47 100644
--- a/res/app/settings/index.js
+++ b/res/app/settings/index.js
@@ -1,10 +1,12 @@
 module.exports = angular.module('ui-settings', [
-  require('./local').name,
-  require('./language').name,
-  require('./notifications').name
+  require('./general').name,
+  require('./adb-keys').name,
+  require('stf/common-ui/nice-tabs').name
+  //require('./notifications').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/settings', {
       template: require('./settings.jade')
     })
   }])
+  .controller('SettingsCtrl', require('./settings-controller'))
diff --git a/res/app/settings/settings-controller.js b/res/app/settings/settings-controller.js
new file mode 100644
index 00000000..6bb0645f
--- /dev/null
+++ b/res/app/settings/settings-controller.js
@@ -0,0 +1,15 @@
+module.exports = function SettingsCtrl($scope, gettext) {
+
+  $scope.settingTabs = [
+    {
+      title: gettext('General'),
+      icon: 'fa-gears fa-fw',
+      templateUrl: 'settings/general/general.jade'
+    },
+    {
+      title: gettext('ADB Keys'),
+      icon: 'fa-key fa-fw',
+      templateUrl: 'settings/adb-keys/adb-keys.jade'
+    }
+  ]
+}
diff --git a/res/app/settings/settings.jade b/res/app/settings/settings.jade
index 8ee2d115..9820c220 100644
--- a/res/app/settings/settings.jade
+++ b/res/app/settings/settings.jade
@@ -1,8 +1,53 @@
-div(pane='center')
+div(pane='center', ng-controller='SettingsCtrl')
+  br
+  .widget-container.fluid-height
+    nice-tabs(key='SettingsTabs', tabs='settingTabs', filter='')
+    //.heading-for-tabs.tabs
+      tabset
+        tab
+          tab-heading
+            i.fa.fa-gears
+            span(translate) General
+          div
+            .row
+              .col-md-6
+                div(ng-include='"settings/local/local-settings.jade"')
+              .col-md-6
+                div(ng-include='"settings/language/language.jade"')
+        tab
+          tab-heading
+            i.fa.fa-key
+            span(translate) ADB Keys
+          .widget-container.fluid-height
+            p Some big content
+            h1 More
+
+
+
+
+
+
+  br
   .row
-    .col-md-6
+    //.col-md-6
       div(ng-include='"settings/local/local-settings.jade"')
-    .col-md-6
+    //.col-md-6
       div(ng-include='"settings/language/language.jade"')
     //.col-md-4
       div(ng-include='"settings/notifications/notifications.jade"')
+
+    .col-sm-12
+      //tabset(vertical='true', type='pills')
+
+
+
+
+    //.col-sm-2
+      ul.list-group
+        li.list-group-item
+          a(ng-href='') General
+        li.list-group-item
+          a(ng-href='') ADB Keys
+    //.col-sm-10
+      .widget-container
+        p SOME