diff --git a/bower.json b/bower.json
index 66d35ae9..46b8923f 100644
--- a/bower.json
+++ b/bower.json
@@ -40,7 +40,8 @@
     "quick-ng-repeat": "~0.0.1",
     "angular-vs-repeat": "~1.0.0-rc3",
     "checklist-model": "~0.1.3",
-    "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.0"
+    "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.0",
+    "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git"
   },
   "private": true,
   "resolutions": {
diff --git a/res/app/app.js b/res/app/app.js
index 5afb9d65..99c74dc6 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -1,4 +1,4 @@
-require.ensure([], function (require) {
+require.ensure(['angular', 'angular-route'], function (require) {
 
   require('angular')
   require('angular-route')
diff --git a/res/auth-ldap/scripts/entry.js b/res/auth-ldap/scripts/entry.js
index 2e6bdc4b..40aa0daf 100644
--- a/res/auth-ldap/scripts/entry.js
+++ b/res/auth-ldap/scripts/entry.js
@@ -1,4 +1,4 @@
-require.ensure([], function (require) {
+require.ensure(['angular', 'angular-route'], function (require) {
   require('angular')
   require('angular-route')
 
diff --git a/res/auth-mock/scripts/entry.js b/res/auth-mock/scripts/entry.js
index 2e6bdc4b..40aa0daf 100644
--- a/res/auth-mock/scripts/entry.js
+++ b/res/auth-mock/scripts/entry.js
@@ -1,4 +1,4 @@
-require.ensure([], function (require) {
+require.ensure(['angular', 'angular-route'], function (require) {
   require('angular')
   require('angular-route')
 
diff --git a/res/web_modules/angular-borderlayoutX/index.js b/res/web_modules/angular-borderlayoutX/index.js
new file mode 100644
index 00000000..3977e881
--- /dev/null
+++ b/res/web_modules/angular-borderlayoutX/index.js
@@ -0,0 +1,4 @@
+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-borderlayoutX/style.css
new file mode 100644
index 00000000..117d1291
--- /dev/null
+++ b/res/web_modules/angular-borderlayoutX/style.css
@@ -0,0 +1,36 @@
+.fa-pane-handle {
+  background: rgba(153, 153, 153, 0.5);
+}
+
+.fa-pane:hover > .fa-pane-handle > .fa-pane-toggle {
+  background: rgba(29, 132, 223, 0.8);
+}
+
+.fa-pane-resizing > .fa-pane-handle,
+.fa-pane-handle:hover {
+  background-color: rgba(0, 0, 0, 0.3);
+}
+
+.fa-pane-scroller {
+  /*border: 1px solid #999;*/
+}
+
+.fa-pane-parent > .fa-pane-scroller {
+  border: none;
+}
+
+.fa-pane-constrained.fa-pane-resizing > .fa-pane-overlay {
+  background-color: rgba(0, 0, 0, 0.2);
+}
+
+/* TODO: CHECK THIS */
+.pane-top-bar {
+  box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+  z-index: 500;
+}
+
+.navbar {
+  height: 46px;
+  margin: 0;
+  border-radius: 0;
+}
diff --git a/webpack.config.js b/webpack.config.js
index ae0956c2..b6e869a6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,9 +20,9 @@ module.exports = {
   }
 , resolve: {
     modulesDirectories: [
-      pathutil.resource('bower_components')
-    , pathutil.resource('app/components')
+      pathutil.resource('app/components')
     , pathutil.resource('web_modules')
+    , pathutil.resource('bower_components')
     , './node_modules'
     ]
   , alias: {