diff --git a/res/app/control-panes/dashboard/browser/browser-controller.js b/res/app/control-panes/dashboard/browser/browser-controller.js
index a4f23d39..163bb0c3 100644
--- a/res/app/control-panes/dashboard/browser/browser-controller.js
+++ b/res/app/control-panes/dashboard/browser/browser-controller.js
@@ -2,32 +2,6 @@ var _ = require('lodash')
 
 module.exports = function BrowserCtrl($scope, $rootScope) {
 
-  function setCurrentBrowser(device) {
-    if (device && device.browser && device.browser.apps) {
-      var currentBrowser = {}
-      if (device.browser.selected) {
-        var selectedBrowser = _.first(device.browser.apps, 'selected')
-        if (!_.isEmpty(selectedBrowser)) {
-          currentBrowser = selectedBrowser[0]
-        }
-      } else {
-        currentBrowser = _.first(device.browser.apps)
-      }
-      $rootScope.browser = currentBrowser
-    }
-  }
 
-  setCurrentBrowser($scope.device)
-
-  $scope.$watch('device', function (newValue, oldValue) {
-    if (newValue !== oldValue) {
-      setCurrentBrowser(newValue)
-    }
-  })
-
-  $scope.clearSettings = function () {
-    var browser = $scope.browser
-    $scope.control.clearBrowser(browser)
-  }
 
 }
diff --git a/res/app/control-panes/dashboard/browser/browser.jade b/res/app/control-panes/dashboard/browser/browser.jade
index d1fa7c3b..28fad3a3 100644
--- a/res/app/control-panes/dashboard/browser/browser.jade
+++ b/res/app/control-panes/dashboard/browser/browser.jade
@@ -11,7 +11,7 @@
   .widget-content.padded
     //pre {{device.browser|json}}
     .btn-group
-      button.btn.btn-default-outline.dropdown-toggle
+      button.btn.btn-xs.btn-default-outline.dropdown-toggle
         //img(ng-src='/img/platforms/{{$root.browser}}.png').browser-icon
         //| {{$root.browser | browserName}}
         span(ng-show='$root.browser') {{$root.browser.name}} ({{$root.browser.type}})
diff --git a/res/app/control-panes/dashboard/dashboard.jade b/res/app/control-panes/dashboard/dashboard.jade
index 3ac6c2af..10fbc470 100644
--- a/res/app/control-panes/dashboard/dashboard.jade
+++ b/res/app/control-panes/dashboard/dashboard.jade
@@ -1,7 +1,7 @@
 .row
   .col-md-6
     div(ng-include='"control-panes/dashboard/navigation/navigation.jade"')
-  .col-md-6(ng-if='$root.platform == "web"')
+  //.col-md-6(ng-if='$root.platform == "web"')
     div(ng-include='"control-panes/dashboard/browser/browser.jade"')
   .col-md-6
     div(ng-include='"control-panes/dashboard/input/input.jade"')
diff --git a/res/app/control-panes/dashboard/navigation/navigation-controller.js b/res/app/control-panes/dashboard/navigation/navigation-controller.js
index 3c2204e9..1de6dc04 100644
--- a/res/app/control-panes/dashboard/navigation/navigation-controller.js
+++ b/res/app/control-panes/dashboard/navigation/navigation-controller.js
@@ -1,6 +1,6 @@
 var _ = require('lodash')
 
-module.exports = function NavigationCtrl($scope) {
+module.exports = function NavigationCtrl($scope, $rootScope) {
 
   $scope.urlHistory = []
 
@@ -43,4 +43,33 @@ module.exports = function NavigationCtrl($scope) {
     $scope.textURL = $url
     $scope.openURL()
   }
+
+
+  function setCurrentBrowser(device) {
+    if (device && device.browser && device.browser.apps) {
+      var currentBrowser = {}
+      if (device.browser.selected) {
+        var selectedBrowser = _.first(device.browser.apps, 'selected')
+        if (!_.isEmpty(selectedBrowser)) {
+          currentBrowser = selectedBrowser[0]
+        }
+      } else {
+        currentBrowser = _.first(device.browser.apps)
+      }
+      $rootScope.browser = currentBrowser
+    }
+  }
+
+  setCurrentBrowser($scope.device)
+
+  $scope.$watch('device', function (newValue, oldValue) {
+    if (newValue !== oldValue) {
+      setCurrentBrowser(newValue)
+    }
+  })
+
+  $scope.clearSettings = function () {
+    var browser = $scope.browser
+    $scope.control.clearBrowser(browser)
+  }
 }
diff --git a/res/app/control-panes/dashboard/navigation/navigation.jade b/res/app/control-panes/dashboard/navigation/navigation.jade
index 96c260ca..effc6a22 100644
--- a/res/app/control-panes/dashboard/navigation/navigation.jade
+++ b/res/app/control-panes/dashboard/navigation/navigation.jade
@@ -3,9 +3,13 @@
     i.fa.fa-globe
     span(translate) Navigation
     span
-      i.fa.fa-refresh.pull-right(ng-click='refresh()', title='{{"Reload"|translate}}', ng-if='$root.browser == "webview"')
-      i.fa.fa-step-forward.pull-right(ng-click='forward()', title='{{"Go Forward"|translate}}', ng-if='$root.browser == "webview"')
-      i.fa.fa-step-backward.pull-right(ng-click='back()', title='{{"Go Back"|translate}}', ng-if='$root.browser == "webview"')
+      button.btn.btn-xs.btn-danger-outline.pull-right(ng-click='clearSettings()', title='{{"Reset all browser settings"|translate}}')
+        i.fa.fa-trash-o
+        span(translate) Reset
+      .button-spacer.pull-right
+      i.fa.fa-refresh.pull-right(ng-click='refresh()', title='{{"Reload"|translate}}')
+      i.fa.fa-step-forward.pull-right(ng-click='forward()', title='{{"Go Forward"|translate}}')
+      i.fa.fa-step-backward.pull-right(ng-click='back()', title='{{"Go Back"|translate}}')
   .widget-content.padded
     form
       .input-group
@@ -21,3 +25,16 @@
             li.divider
             li
               a(ng-click='clearHistory()', type='button', translate).btn-link Clear
+
+    .btn-group
+      button.btn.btn-smx.btn-default-outline.dropdown-toggle
+        //img(ng-src='/img/platforms/{{$root.browser}}.png').browser-icon
+        //| {{$root.browser | browserName}}
+        span(ng-show='$root.browser') {{$root.browser.name}} ({{$root.browser.type}})
+        span.caret(ng-show='device.browser.apps.length > 1')
+      ul.dropdown-menu(ng-show='device.browser.apps.length > 1')
+        li(ng-repeat='b in device.browser.apps')
+          a(ng-click='$root.browser = b').pointer
+            span {{b.name}} ({{b.type}})
+            //img(ng-src='/img/platforms/{{b}}.png').browser-icon.pointer
+            //| {{ b | browserName }}
\ No newline at end of file