diff --git a/res/app/control-panes/advanced/advanced.jade b/res/app/control-panes/advanced/advanced.jade
index 33289c49..3b369fd8 100644
--- a/res/app/control-panes/advanced/advanced.jade
+++ b/res/app/control-panes/advanced/advanced.jade
@@ -5,3 +5,5 @@
     div(ng-include='"control-panes/advanced/input/input.jade"')
   .col-md-6
     div(ng-include='"control-panes/advanced/port-forwarding/port-forwarding.jade"')
+  .col-md-6
+    div(ng-include='"control-panes/advanced/maintenance/maintenance.jade"')
diff --git a/res/app/control-panes/advanced/index.js b/res/app/control-panes/advanced/index.js
index 306d9eeb..1c535435 100644
--- a/res/app/control-panes/advanced/index.js
+++ b/res/app/control-panes/advanced/index.js
@@ -2,9 +2,10 @@ require('./advanced.css')
 
 module.exports = angular.module('stf.advanced', [
   require('./input').name,
-  require('./run-js').name,
-  require('./usb').name,
-  require('./port-forwarding').name
+//  require('./run-js').name,
+//  require('./usb').name,
+  require('./port-forwarding').name,
+  require('./maintenance').name
 ])
   .run(["$templateCache", function ($templateCache) {
     $templateCache.put('control-panes/advanced/advanced.jade',
diff --git a/res/app/control-panes/advanced/maintenance/index.js b/res/app/control-panes/advanced/maintenance/index.js
new file mode 100644
index 00000000..6dd386a6
--- /dev/null
+++ b/res/app/control-panes/advanced/maintenance/index.js
@@ -0,0 +1,8 @@
+module.exports = angular.module('stf.advanced.maintenance', [
+])
+  .run(["$templateCache", function ($templateCache) {
+    $templateCache.put('control-panes/advanced/maintenance/maintenance.jade',
+      require('./maintenance.jade')
+    )
+  }])
+  .controller('MaintenanceCtrl', require('./maintenance-controller'))
diff --git a/res/app/control-panes/advanced/maintenance/maintenance-controller.js b/res/app/control-panes/advanced/maintenance/maintenance-controller.js
new file mode 100644
index 00000000..acc5b3e6
--- /dev/null
+++ b/res/app/control-panes/advanced/maintenance/maintenance-controller.js
@@ -0,0 +1,17 @@
+module.exports = function ($scope, gettext, $filter) {
+
+  $scope.reboot = function (device) {
+    var config = {
+      rebootEnabled: true
+    }
+
+    if (config.rebootEnabled) {
+      if (confirm($filter('translate')(
+        gettext('Are you sure you want to reboot this device? \nThe device will be unavailable for a moment.')))) {
+        console.log('reboot')
+
+      }
+    }
+  }
+
+}
diff --git a/res/app/control-panes/advanced/maintenance/maintenance-spec.js b/res/app/control-panes/advanced/maintenance/maintenance-spec.js
new file mode 100644
index 00000000..c134c22e
--- /dev/null
+++ b/res/app/control-panes/advanced/maintenance/maintenance-spec.js
@@ -0,0 +1,17 @@
+describe('InputCtrl', function () {
+
+  beforeEach(module('stf.input'));
+
+  var scope, ctrl;
+
+  beforeEach(inject(function ($rootScope, $controller) {
+    scope = $rootScope.$new();
+    ctrl = $controller('InputCtrl', {$scope: scope});
+  }));
+
+  it('should ...', inject(function () {
+    expect(1).toEqual(1);
+
+  }));
+
+});
\ No newline at end of file
diff --git a/res/app/control-panes/advanced/maintenance/maintenance.jade b/res/app/control-panes/advanced/maintenance/maintenance.jade
new file mode 100644
index 00000000..33e96f3a
--- /dev/null
+++ b/res/app/control-panes/advanced/maintenance/maintenance.jade
@@ -0,0 +1,9 @@
+.widget-container.fluid-height(ng-controller='MaintenanceCtrl')
+  .heading
+    i.fa.fa-gears
+    span(translate) Maintenance
+    .pull-right
+  .widget-content.padded
+    button(ng-click='reboot()').btn.btn-sm.btn-danger
+      i.fa.fa-refresh
+      span(translate) Restart Device
diff --git a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
index 4fdaf0c8..2fd73808 100644
--- a/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
+++ b/res/app/control-panes/advanced/port-forwarding/port-forwarding.jade
@@ -6,8 +6,8 @@
 
     button(ng-click='forwarding = !forwarding', ng-class="{active: forwarding}").btn.btn-primary-outline.btn-xs.pull-right
       i.fa(ng-class="{'fa-arrow-circle-right': !forwarding, 'fa-times-circle': forwarding}")
-      span(ng-show='forwarding', translate) Unforward Ports
-      span(ng-hide='forwarding', translate) Forward Ports
+      span(ng-show='forwarding', translate) Unforward
+      span(ng-hide='forwarding', translate) Forward
   .widget-content.padded(collapse='isCollapsed')
 
     table(ng-table='portsTable').table.table-striped