diff --git a/res/app/app.js b/res/app/app.js
index 99c74dc6..5afb9d65 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -1,4 +1,4 @@
-require.ensure(['angular', 'angular-route'], function (require) {
+require.ensure([], function (require) {
 
   require('angular')
   require('angular-route')
diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js
index be144c0f..8e879677 100644
--- a/res/app/components/stf/screen/screen-directive.js
+++ b/res/app/components/stf/screen/screen-directive.js
@@ -1,4 +1,5 @@
 var FastImageRender = require('./fast-image-render').FastImageRender
+var _ = require('lodash')
 
 module.exports = function DeviceScreenDirective($document, ScalingService, VendorUtil, PageVisibilityService, BrowserInfo, $timeout) {
   return {
@@ -24,7 +25,9 @@ module.exports = function DeviceScreenDirective($document, ScalingService, Vendo
         , seq = 0
         , cssTransform = VendorUtil.style(['transform', 'webkitTransform'])
 
-      scope.$on('panelsResized', updateBounds)
+      // NOTE: instead of fa-pane-resize, a fa-child-pane-resize could be better
+      var onPanelResizeThrottled = _.throttle(updateBounds, 16)
+      scope.$on('fa-pane-resize', onPanelResizeThrottled)
 
       function setDisplayDensity(forRetina) {
         // FORCE
diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.jade
index 1e8083e4..4995af4e 100644
--- a/res/app/control-panes/control-panes.jade
+++ b/res/app/control-panes/control-panes.jade
@@ -4,16 +4,16 @@ div(ng-if='$root.basicMode').fill-height
       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')
+  div(fa-pane, pane-id='control-device', 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)')
     .remote-control
       //include control-screen
       div(ng-include='"control-panes/device-control/device-control.jade"').fill-height
 
-  div(pane, pane-anchor='south', pane-size='30% + 2px', pane-handle='4').pane-bottom-p
+  div(fa-pane, pane-id='control-bottom-tabs', pane-anchor='south', pane-size='30% + 2px', pane-handle='4').pane-bottom-p
     .widget-container.fluid-height
       nice-tabs(key='ControlBottomTabs', direction='below', tabs='belowTabs', filter='$root.platform')
-  div(pane, pane-anchor='')
+  div(fa-pane, pane-id='control-top-tabs', pane-anchor='')
     .widget-container.fluid-height
       nice-tabs(key='ControlBottomTabs', tabs='topTabs', filter='$root.platform')
diff --git a/res/app/control-panes/index.js b/res/app/control-panes/index.js
index 5bb45a0a..e8c5cea7 100644
--- a/res/app/control-panes/index.js
+++ b/res/app/control-panes/index.js
@@ -1,6 +1,3 @@
-require('fa-borderlayout')
-require('fa-borderlayout/build-0.3.1/borderLayout.css')
-require('fa-borderlayout/build-0.3.1/stf-style.css')
 
 module.exports = angular.module('control-panes', [
   require('stf/common-ui/nice-tabs').name,
diff --git a/res/app/layout/index.js b/res/app/layout/index.js
index 331929a0..2022d309 100644
--- a/res/app/layout/index.js
+++ b/res/app/layout/index.js
@@ -1,35 +1,21 @@
-require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
-//require('bootstrap/dist/css/bootstrap.css')
-
-require('se7en-bootstrap-3/build/stylesheets/se7en-font.css')
-require('se7en-bootstrap-3/build/stylesheets/style.css')
-
-require('font-awesome-bower/css/font-awesome.css')
-
-require('font-lato-2-subset')
-//require('se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
+require('se7en-bootstrap-3')
 
 require('angular-bootstrap')
 
-require('fa-borderlayout')
-require('fa-borderlayout/build-0.3.1/borderLayout.css')
-require('fa-borderlayout/build-0.3.1/stf-style.css')
+require('angular-borderlayout')
+
 
 require('./cursor.css')
 require('./stf-se7en.css')
 require('./small.css')
 require('./stf-styles.css')
 
-//require('angular-loading-bar/src/loading-bar.js')
-//require('angular-loading-bar/src/loading-bar.css')
-
 module.exports = angular.module('layout', [
   require('../settings/language').name,
   require('stf/landscape').name,
   require('stf/basic-mode').name,
   'ui.bootstrap',
   'fa.directive.borderLayout',
-  //'angular-loading-bar',
   require('stf/common-ui').name,
   require('stf/socket/socket-state').name,
   require('stf/browser-info').name
@@ -40,4 +26,3 @@ module.exports = angular.module('layout', [
     })
   }])
   .controller('LayoutCtrl', require('./layout-controller'))
-
diff --git a/res/app/views/index.jade b/res/app/views/index.jade
index 1bdbb020..6c7002f0 100644
--- a/res/app/views/index.jade
+++ b/res/app/views/index.jade
@@ -13,11 +13,11 @@ html
     title STF
   body(ng-app='app', ng-cloak).bg-1.fill-height
     div(ng-controller='LayoutCtrl', basic-mode, landscape).fill-height
-      .pane-top(pane).fill-height
-        .pane-top-bar(pane, pane-anchor='north', pane-size='44px', pane-min='44px', pane-max='44px', pane-handle='')
+      .pane-top(fa-pane).fill-height
+        .pane-top-bar(fa-pane, pane-id='menu', pane-anchor='north', pane-size='44px', pane-min='44px', pane-max='44px', pane-handle='')
           div(ng-include='"menu.jade"')
 
-        .pane-center(pane, pane-anchor='center').fill-height
+        .pane-center(fa-pane, pane-id='main', pane-anchor='center').fill-height
           socket-state
           div(growl)
           div(ng-view).fill-height
diff --git a/res/web_modules/angular-borderlayoutX/index.js b/res/web_modules/angular-borderlayout/index.js
similarity index 87%
rename from res/web_modules/angular-borderlayoutX/index.js
rename to res/web_modules/angular-borderlayout/index.js
index 3977e881..3cb41e8c 100644
--- a/res/web_modules/angular-borderlayoutX/index.js
+++ b/res/web_modules/angular-borderlayout/index.js
@@ -1,4 +1,3 @@
 require('angular-borderlayout/src/borderLayout.js')
 require('angular-borderlayout/src/borderLayout.css')
 require('./style.css')
-console.log('fe')
diff --git a/res/web_modules/angular-borderlayoutX/style.css b/res/web_modules/angular-borderlayout/style.css
similarity index 100%
rename from res/web_modules/angular-borderlayoutX/style.css
rename to res/web_modules/angular-borderlayout/style.css
diff --git a/res/web_modules/se7en-bootstrap-3/index.js b/res/web_modules/se7en-bootstrap-3/index.js
new file mode 100644
index 00000000..094f684d
--- /dev/null
+++ b/res/web_modules/se7en-bootstrap-3/index.js
@@ -0,0 +1,10 @@
+require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
+//require('bootstrap/dist/css/bootstrap.css')
+
+require('se7en-bootstrap-3/build/stylesheets/se7en-font.css')
+require('se7en-bootstrap-3/build/stylesheets/style.css')
+
+require('font-awesome-bower/css/font-awesome.css')
+
+require('font-lato-2-subset')
+//require('se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')