diff --git a/res/app/components/stf/guest-browser/guest-browser-service.js b/res/app/components/stf/browser-info/browser-info-service.js
similarity index 96%
rename from res/app/components/stf/guest-browser/guest-browser-service.js
rename to res/app/components/stf/browser-info/browser-info-service.js
index 20cdadc4..c10181bb 100644
--- a/res/app/components/stf/guest-browser/guest-browser-service.js
+++ b/res/app/components/stf/browser-info/browser-info-service.js
@@ -1,8 +1,6 @@
 // NOTE: Most of the detections stuff from Modernizr 3.0
-
-module.exports = function GuestBrowserServiceFactory() {
-  var service = {
-  }
+module.exports = function BrowserInfoServiceFactory() {
+  var service = {}
 
   var domPrefixes = 'Webkit Moz O ms'.toLowerCase().split(' ')
 
@@ -51,7 +49,7 @@ module.exports = function GuestBrowserServiceFactory() {
   addTest('small', function () {
     var windowWidth = window.screen.width < window.outerWidth ?
       window.screen.width : window.outerWidth
-    return windowWidth < 500
+    return windowWidth < 800
 //    return !!(window.matchMedia &&
 //      window.matchMedia('only screen and (max-width: 760px)').matches)
   })
diff --git a/res/app/components/stf/guest-browser/guest-browser-spec.js b/res/app/components/stf/browser-info/browser-info-spec.js
similarity index 63%
rename from res/app/components/stf/guest-browser/guest-browser-spec.js
rename to res/app/components/stf/browser-info/browser-info-spec.js
index 84ae5fe1..784eb354 100644
--- a/res/app/components/stf/guest-browser/guest-browser-spec.js
+++ b/res/app/components/stf/browser-info/browser-info-spec.js
@@ -1,6 +1,6 @@
-describe('GuestBrowser', function() {
+describe('BrowserInfo', function() {
 
-  beforeEach(module('stf.guest-browser'));
+  beforeEach(module('stf.browser-info'));
 
   it('should ...', inject(function(GuestDeviceService) {
 
diff --git a/res/app/components/stf/browser-info/index.js b/res/app/components/stf/browser-info/index.js
new file mode 100644
index 00000000..7dbfac3c
--- /dev/null
+++ b/res/app/components/stf/browser-info/index.js
@@ -0,0 +1,4 @@
+module.exports = angular.module('stf.browser-info', [
+
+])
+  .factory('BrowserInfo', require('./browser-info-service'))
diff --git a/res/app/components/stf/guest-browser/index.js b/res/app/components/stf/guest-browser/index.js
deleted file mode 100644
index b0c1c86c..00000000
--- a/res/app/components/stf/guest-browser/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-module.exports = angular.module('stf.guest-browser', [
-
-])
-  .factory('GuestBrowser', require('./guest-browser-service'))
diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.jade
index 3d405981..24762974 100644
--- a/res/app/control-panes/control-panes.jade
+++ b/res/app/control-panes/control-panes.jade
@@ -1,4 +1,9 @@
-div
+div(ng-if='$root.basicMode')
+  div(style='width: 320px; height: 540px;')
+    .remote-control
+      div(ng-include='"control-panes/device-control/device-control.jade"').fill-height
+
+div(ng-if='!$root.basicMode')
   div(pane, pane-anchor='west', pane-size='30% + 2px', pane-min='200px', pane-max='100% + 2px', pane-handle='4', pane-no-toggle='false')
     //.stf-catch-all-keys(ng-controller='KeysCtrl')
       catch-all-keys(keys-down='keysDown($event)', keys-up='keysUp($event)')
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 08d343aa..ff68bfce 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -35,7 +35,7 @@ div.stf-device-list
                     button.btn.btn-default.btn-xs.device-status {{device.state|statusName}}
                   .clear-fix
 
-            tab(active='activeTabs.details')
+            tab(active='activeTabs.details', ng-if='!$root.basicMode')
               tab-heading
                 i.fa.fa-list(translate)
                 span(translate) Details
diff --git a/res/app/layout/index.js b/res/app/layout/index.js
index 4b5f76a2..e35a2d5a 100644
--- a/res/app/layout/index.js
+++ b/res/app/layout/index.js
@@ -23,7 +23,7 @@ module.exports = angular.module('layout', [
   'angular-loading-bar',
   require('stf/common-ui').name,
   require('stf/socket/socket-state').name,
-  require('stf/guest-browser').name
+  require('stf/browser-info').name
 ])
   .config(['$tooltipProvider', function ($tooltipProvider) {
     $tooltipProvider.options({
diff --git a/res/app/layout/layout-controller.js b/res/app/layout/layout-controller.js
index ea82f162..329051f0 100644
--- a/res/app/layout/layout-controller.js
+++ b/res/app/layout/layout-controller.js
@@ -1,3 +1,10 @@
-module.exports = function LayoutCtrl(FatalMessageService, GuestBrowser, $scope) {
-  $scope.guestBrowser = GuestBrowser
+module.exports = function LayoutCtrl(FatalMessageService, BrowserInfo, $rootScope) {
+
+  $rootScope.basicMode = false
+  if (BrowserInfo.small) {
+    $rootScope.basicMode = true
+  } else {
+    $rootScope.basicMode = false
+  }
+
 }
diff --git a/res/app/menu/menu.jade b/res/app/menu/menu.jade
index d5e81217..1055df85 100644
--- a/res/app/menu/menu.jade
+++ b/res/app/menu/menu.jade
@@ -5,19 +5,19 @@
       li(ng-cloak)
         a(ng-href='/#!/control')
           span.fa.fa-mobile
-          | {{"Control"|translate}}
+          | {{ !$root.basicMode ? "Control" : '' | translate }}
         a(ng-href='/#!/devices')
           span.fa.fa-sitemap
-          | {{"Devices"|translate}}
+          | {{ !$root.basicMode ? "Devices" : '' | translate }}
         a(ng-href='/#!/settings')
           span.fa.fa-gears
-          | {{"Settings"|translate}}
+          | {{ !$root.basicMode ? "Settings" : '' | translate }}
     ul.nav.stf-nav.stf-feedback.pull-right(ng-cloak)
-      li.stf-nav-web-native-button
+      li.stf-nav-web-native-button(ng-if='!$root.basicMode')
         .btn-group
           button(type='button', ng-model='$root.platform', btn-radio="'web'", translate).btn.btn-sm.btn-default-outline Web
           button(type='button', ng-model='$root.platform', btn-radio="'native'", translate).btn.btn-sm.btn-default-outline Native
       li
         a(ng-href='/#!/help')
           i.fa.fa-question-circle
-          | {{"Help"|translate}}
+          | {{ !$root.basicMode ? "Help" : '' | translate }}