diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index e03f569a..bb9b9d36 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -21,12 +21,6 @@ module.exports =
 //      icon: 'fa-globe',
 //      templateUrl: 'control-panes/resources/resources.jade',
 //      filters: ['web']
-//    },
-//    {
-//      title: gettext('CPU'),
-//      icon: 'fa-bar-chart-o',
-//      templateUrl: 'control-panes/cpu/cpu.jade',
-//      filters: ['native', 'web']
 //    },
       {
         title: gettext('Automation'),
@@ -34,11 +28,23 @@ module.exports =
         templateUrl: 'control-panes/automation/automation.jade',
         filters: ['native', 'web']
       },
+      {
+        title: gettext('Performance'),
+        icon: 'fa-bar-chart',
+        templateUrl: 'control-panes/performance/performance.jade',
+        filters: ['native', 'web']
+      },
       {
         title: gettext('Advanced'),
         icon: 'fa-bolt',
         templateUrl: 'control-panes/advanced/advanced.jade',
         filters: ['native', 'web']
+      },
+      {
+        title: gettext('Info'),
+        icon: 'fa-info',
+        templateUrl: 'control-panes/info/info.jade',
+        filters: ['native', 'web']
       }
     ]
 
@@ -49,14 +55,7 @@ module.exports =
         templateUrl: 'control-panes/dashboard/dashboard.jade',
         filters: ['native', 'web']
       }
-    ].concat(angular.copy(sharedTabs), [
-        {
-          title: gettext('Info'),
-          icon: 'fa-info',
-          templateUrl: 'control-panes/info/info.jade',
-          filters: ['native', 'web']
-        }
-      ])
+    ].concat(angular.copy(sharedTabs))
 
 
     $scope.belowTabs = [
diff --git a/res/app/control-panes/index.js b/res/app/control-panes/index.js
index d92a7669..b802d6e7 100644
--- a/res/app/control-panes/index.js
+++ b/res/app/control-panes/index.js
@@ -6,12 +6,12 @@ module.exports = angular.module('control-panes', [
   require('./device-control').name,
   require('./advanced').name,
   require('./automation').name,
-  require('./cpu').name,
+  require('./performance').name,
   require('./dashboard').name,
-  require('./inspect').name,
-  require('./activity').name,
+  //require('./inspect').name,
+  //require('./activity').name,
   require('./logs').name,
-  require('./resources').name,
+  //require('./resources').name,
   require('./screenshots').name,
   require('./info').name
 ])
diff --git a/res/app/control-panes/performance/index.js b/res/app/control-panes/performance/index.js
new file mode 100644
index 00000000..fb8d6e3e
--- /dev/null
+++ b/res/app/control-panes/performance/index.js
@@ -0,0 +1,11 @@
+require('./performance.css')
+
+module.exports = angular.module('stf.performance', [
+
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put('control-panes/performance/performance.jade',
+      require('./performance.jade')
+    )
+  }])
+  .controller('PerformanceCtrl', require('./performance-controller'))
diff --git a/res/app/control-panes/performance/performance-controller.js b/res/app/control-panes/performance/performance-controller.js
new file mode 100644
index 00000000..5361252b
--- /dev/null
+++ b/res/app/control-panes/performance/performance-controller.js
@@ -0,0 +1,3 @@
+module.exports = function PerformanceCtrl($scope) {
+    
+}
diff --git a/res/app/control-panes/performance/performance-spec.js b/res/app/control-panes/performance/performance-spec.js
new file mode 100644
index 00000000..ab525f8b
--- /dev/null
+++ b/res/app/control-panes/performance/performance-spec.js
@@ -0,0 +1,17 @@
+describe('PerformanceCtrl', function () {
+
+  beforeEach(angular.mock.module(require('./index').name))
+
+  var scope, ctrl
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new()
+    ctrl = $controller('PerformanceCtrl', {$scope: scope})
+  }))
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1)
+
+  }))
+
+})
diff --git a/res/app/control-panes/performance/performance.css b/res/app/control-panes/performance/performance.css
new file mode 100644
index 00000000..d7e86dd2
--- /dev/null
+++ b/res/app/control-panes/performance/performance.css
@@ -0,0 +1,3 @@
+.stf-performance {
+
+}
\ No newline at end of file
diff --git a/res/app/control-panes/performance/performance.jade b/res/app/control-panes/performance/performance.jade
new file mode 100644
index 00000000..6b1d1109
--- /dev/null
+++ b/res/app/control-panes/performance/performance.jade
@@ -0,0 +1,6 @@
+.widget-container.fluid-height.stf-performance
+  .heading
+    i.fa
+    span(translate) Performance
+  .widget-content.padded
+    div
\ No newline at end of file