diff --git a/.gitignore b/.gitignore
index 4a7c2faf..a4d8e1a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /node_modules/
-/res/lib/
+/res/bower_components/
 /doc/*.png
 /rethinkdb_data/
 /.env
diff --git a/bower.json b/bower.json
index d2eeb07f..b720812a 100644
--- a/bower.json
+++ b/bower.json
@@ -8,7 +8,8 @@
     "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git",
     "socket.io-client": "~0.9.16",
     "lodash": "~2.4.1",
-    "oboe": "~1.14.0"
+    "oboe": "~1.14.0",
+    "fa-borderlayout": "git@ghe.amb.ca.local:gunther-brunner/fa-borderlayout.git"
   },
   "private": true
 }
diff --git a/component.json b/component.json
new file mode 100644
index 00000000..7b3731e1
--- /dev/null
+++ b/component.json
@@ -0,0 +1,20 @@
+{
+  "name": "stf",
+  "repo": "stf/stf",
+  "description": "STF Main Component",
+  "version": "0.0.1",
+  "keywords": [],
+  "dependencies": {},
+  "development": {},
+  "license": "MIT",
+  "main": "res/app/app.js",
+  "scripts": [
+    "res/app/app.js"
+  ],
+  "remotes": [
+    "http://ghe.amb.ca.local"
+  ],
+  "paths": [
+    "res/components"
+  ]
+}
\ No newline at end of file
diff --git a/lib/middleware/webpack.js b/lib/middleware/webpack.js
index 911b1071..4564edb1 100644
--- a/lib/middleware/webpack.js
+++ b/lib/middleware/webpack.js
@@ -14,7 +14,7 @@ var webpackOptions = {
   },
   resolve: {
     modulesDirectories: [
-      pathutil.resource('lib'),
+      pathutil.resource('bower_components'),
         pathutil.resource('app') + '/components',
       'web_modules',
       './../../node_modules'
@@ -34,7 +34,7 @@ var webpackOptions = {
       { test: /oboe-browser\.js/, loader: 'imports?define=>false!exports?oboe'}
     ],
     noParse: [
-      //  pathutil.resource('lib')
+      //  pathutil.resource('bower_components')
     ]
   },
   plugins: [
diff --git a/lib/roles/app.js b/lib/roles/app.js
index 1bd33a4a..2d1b0245 100644
--- a/lib/roles/app.js
+++ b/lib/roles/app.js
@@ -40,7 +40,7 @@ module.exports = function(options) {
 
   app.use(cors())
 
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('app')))
 
   if (!options.disableWatch) {
diff --git a/lib/roles/auth/ldap.js b/lib/roles/auth/ldap.js
index faabb283..2e39e547 100644
--- a/lib/roles/auth/ldap.js
+++ b/lib/roles/auth/ldap.js
@@ -28,7 +28,7 @@ module.exports = function(options) {
   app.use(express.urlencoded())
   app.use(express.csrf())
   app.use(validator())
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('auth-ldap')))
 
   app.use(function(req, res, next) {
diff --git a/lib/roles/auth/mock.js b/lib/roles/auth/mock.js
index fda23047..d9443dc5 100644
--- a/lib/roles/auth/mock.js
+++ b/lib/roles/auth/mock.js
@@ -27,7 +27,7 @@ module.exports = function(options) {
   app.use(express.urlencoded())
   app.use(express.csrf())
   app.use(validator())
-  app.use('/static/lib', express.static(pathutil.resource('lib')))
+  app.use('/static/bower_components', express.static(pathutil.resource('bower_components')))
   app.use('/static', express.static(pathutil.resource('auth-mock')))
 
   app.use(function(req, res, next) {
diff --git a/res/app/app.js b/res/app/app.js
index 4ea1f4ec..2c0bc1ae 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -1,7 +1,10 @@
 require('angular')
 require('angular-route')
 
-//require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/se7en-font.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/style.css')
+require('style!raw!se7en-bootstrap-3/build/stylesheets/font-awesome.min.css')
 
 
 
diff --git a/res/auth-ldap/scripts/main.js b/res/auth-ldap/scripts/main.js
index 8fd793b2..f7a538f2 100644
--- a/res/auth-ldap/scripts/main.js
+++ b/res/auth-ldap/scripts/main.js
@@ -1,7 +1,7 @@
 require.config({
   paths: {
-    'angular': '../lib/angular/angular'
-  , 'angular-route': '../lib/angular-route/angular-route'
+    'angular': '../bower_components/angular/angular'
+  , 'angular-route': '../bower_components/angular-route/angular-route'
   }
 , shim: {
     'angular': {
diff --git a/res/auth-mock/scripts/main.js b/res/auth-mock/scripts/main.js
index 8fd793b2..f7a538f2 100644
--- a/res/auth-mock/scripts/main.js
+++ b/res/auth-mock/scripts/main.js
@@ -1,7 +1,7 @@
 require.config({
   paths: {
-    'angular': '../lib/angular/angular'
-  , 'angular-route': '../lib/angular-route/angular-route'
+    'angular': '../bower_components/angular/angular'
+  , 'angular-route': '../bower_components/angular-route/angular-route'
   }
 , shim: {
     'angular': {
diff --git a/webpack.config.js b/webpack.config.js
index 1bb8a429..618c79f3 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,7 +8,7 @@ module.exports = {
   , filename: 'bundle.js'
   }
 , resolve: {
-    modulesDirectories: ['./res/lib', 'node_modules']
+    modulesDirectories: ['./res/bower_components', 'node_modules']
   }
 , loaders: [
     { test: /\.css$/, loader: 'style!css' }