diff --git a/res/app/device-list/device-status/index.js b/res/app/components/stf/device/device-info/index.js
similarity index 100%
rename from res/app/device-list/device-status/index.js
rename to res/app/components/stf/device/device-info/index.js
diff --git a/res/app/components/stf/device/index.js b/res/app/components/stf/device/index.js
index d7db49fd..eadea4b9 100644
--- a/res/app/components/stf/device/index.js
+++ b/res/app/components/stf/device/index.js
@@ -1,2 +1,4 @@
-module.exports = angular.module('stf/device', [])
+module.exports = angular.module('stf/device', [
+  require('./device-info').name
+])
   .factory('DeviceService', require('./device-service'))
diff --git a/res/app/control-panes/control-panes-controller.js b/res/app/control-panes/control-panes-controller.js
index db2347d4..3b9aac34 100644
--- a/res/app/control-panes/control-panes-controller.js
+++ b/res/app/control-panes/control-panes-controller.js
@@ -40,7 +40,15 @@ module.exports = function ($scope, gettext, $routeParams, $location, DeviceServi
       templateUrl: 'control-panes/dashboard/dashboard.jade',
       filters: ['native', 'web']
     }
-  ].concat(angular.copy(sharedTabs))
+  ].concat(angular.copy(sharedTabs), [
+      {
+        title: gettext('Info'),
+        icon: 'fa-info',
+        templateUrl: 'control-panes/info/info.jade',
+        filters: ['native', 'web']
+      }
+    ])
+
 
   $scope.belowTabs = [
     {
diff --git a/res/app/control-panes/index.js b/res/app/control-panes/index.js
index 24b5ad9c..5bb45a0a 100644
--- a/res/app/control-panes/index.js
+++ b/res/app/control-panes/index.js
@@ -14,7 +14,8 @@ module.exports = angular.module('control-panes', [
   require('./activity').name,
   require('./logs').name,
   require('./resources').name,
-  require('./screenshots').name
+  require('./screenshots').name,
+  require('./info').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/control/:serial', {
diff --git a/res/app/control-panes/info/index.js b/res/app/control-panes/info/index.js
new file mode 100644
index 00000000..29e0196b
--- /dev/null
+++ b/res/app/control-panes/info/index.js
@@ -0,0 +1,11 @@
+require('./info.css')
+
+module.exports = angular.module('stf.info', [
+
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put('control-panes/info/info.jade',
+      require('./info.jade')
+    )
+  }])
+  .controller('InfoCtrl', require('./info-controller'))
diff --git a/res/app/control-panes/info/info-controller.js b/res/app/control-panes/info/info-controller.js
new file mode 100644
index 00000000..5bdd1121
--- /dev/null
+++ b/res/app/control-panes/info/info-controller.js
@@ -0,0 +1,3 @@
+module.exports = function InfoCtrl($scope) {
+    
+}
diff --git a/res/app/control-panes/info/info-spec.js b/res/app/control-panes/info/info-spec.js
new file mode 100644
index 00000000..72aebc8e
--- /dev/null
+++ b/res/app/control-panes/info/info-spec.js
@@ -0,0 +1,17 @@
+describe('InfoCtrl', function () {
+
+  beforeEach(module('stf.info'));
+
+  var scope, ctrl;
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new();
+    ctrl = $controller('InfoCtrl', {$scope: scope});
+  }));
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1);
+
+  }));
+
+});
\ No newline at end of file
diff --git a/res/app/control-panes/info/info.css b/res/app/control-panes/info/info.css
new file mode 100644
index 00000000..942ae98d
--- /dev/null
+++ b/res/app/control-panes/info/info.css
@@ -0,0 +1,3 @@
+.stf-info {
+
+}
\ No newline at end of file
diff --git a/res/app/control-panes/info/info.jade b/res/app/control-panes/info/info.jade
new file mode 100644
index 00000000..d98f8982
--- /dev/null
+++ b/res/app/control-panes/info/info.jade
@@ -0,0 +1,70 @@
+.row.stf-info(ng-controller='InfoCtrl')
+  .col-md-6
+    .widget-container.fluid-height
+      .heading
+        i.fa.fa-bolt
+        span(translate) Battery
+      .widget-content.padded
+        dl
+          dt(translate) Health
+          dd {{device.battery.health | batteryHealth}}
+        dl
+          dt(translate) Source
+          dd {{device.battery.source | batterySource}}
+        dl
+          dt(translate) Status
+          dd {{device.battery.status | batteryStatus}}
+        dl
+          dt(translate) Level
+          dd
+            progressbar(value='device.battery.level', max='device.battery.scale', type='success')
+              span {{ device.battery.level / device.battery.scale * 100 }}%
+        dl
+          dt(translate) Temperature
+          dd {{device.battery.temp}}°C
+        dl
+          dt(translate) Voltage
+          dd {{device.battery.voltage}}v
+  .col-md-6
+    .widget-container.fluid-height
+      .heading
+        i.fa.fa-tablet
+        span(translate) Display
+      .widget-content.padded
+        table.table.table-bordered
+          tbody
+            tr
+              td Density
+              td {{device.display.density}}
+            tr
+              td FPS
+              td {{device.display.fps}}
+
+
+        dl
+          dt(translate) Density
+          dd {{device.display.density}}
+        dl
+          dt(translate) FPS
+          dd {{device.display.fps}}
+        dl
+          dt(translate) Width
+          dd {{device.display.width}}
+        dl
+          dt(translate) Height
+          dd {{device.display.height}}
+        dl
+          dt(translate) Id
+          dd {{device.display.id}}
+        dl
+          dt(translate) Orientation
+          dd {{device.display.orientation}}°
+        dl
+          dt(translate) Secure
+          dd {{device.display.secure}}
+        dl
+          dt(translate) DPI X
+          dd {{device.display.xdpi}}
+        dl
+          dt(translate) DPI Y
+          dd {{device.display.ydpi}}
diff --git a/res/app/device-list/index.js b/res/app/device-list/index.js
index b01e63c0..4b0cc0f5 100644
--- a/res/app/device-list/index.js
+++ b/res/app/device-list/index.js
@@ -3,8 +3,7 @@ require('./device-list.css')
 module.exports = angular.module('device-list', [
   require('stf/device').name,
   require('stf/user/group').name,
-  require('stf/common-ui').name,
-  require('./device-status').name
+  require('stf/common-ui').name
 ])
   .config(['$routeProvider', function ($routeProvider) {
     $routeProvider.when('/devices', {