diff --git a/src/kibana/components/listen.js b/src/kibana/components/listen.js
new file mode 100644
index 0000000000000..4954ec770c25e
--- /dev/null
+++ b/src/kibana/components/listen.js
@@ -0,0 +1,24 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('modules').get('kibana')
+  .run(function ($rootScope) {
+
+    /**
+     * Helper that registers an event listener, and removes that listener when
+     * the $scope is destroyed.
+     *
+     * @param  {EventEmitter} emitter - the event emitter to listen to
+     * @param  {string} eventName - the event name
+     * @param  {Function} handler - the event handler
+     * @return {undefined}
+     */
+    $rootScope.constructor.prototype.$listen = function (emitter, eventName, handler) {
+      emitter.on(eventName, handler);
+      this.$on('$destroy', function () {
+        emitter.off(eventName, handler);
+      });
+    };
+
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/notify/notify.js b/src/kibana/components/notify/notify.js
index c9aaca5997d14..b9e9b02f44b2c 100644
--- a/src/kibana/components/notify/notify.js
+++ b/src/kibana/components/notify/notify.js
@@ -20,6 +20,11 @@ define(function (require) {
     return Notifier;
   });
 
+  module.run(function ($timeout) {
+    // provide alternate methods for setting timeouts, which will properly trigger digest cycles
+    rootNotifier._setTimerFns($timeout, $timeout.cancel);
+  });
+
   /**
    * Global Angular exception handler (NOT JUST UNCAUGHT EXCEPTIONS)
    */
diff --git a/src/kibana/components/style_compile/style_compile.css.tmpl b/src/kibana/components/style_compile/style_compile.css.tmpl
new file mode 100644
index 0000000000000..d640d6f61d4dc
--- /dev/null
+++ b/src/kibana/components/style_compile/style_compile.css.tmpl
@@ -0,0 +1,6 @@
+.truncate-by-height {
+  max-height: <%= truncateMaxHeight %>;
+}
+.truncate-by-height::before {
+  top: <%= truncateGradientTop %>;
+}
\ No newline at end of file
diff --git a/src/kibana/components/style_compile/style_compile.js b/src/kibana/components/style_compile/style_compile.js
new file mode 100644
index 0000000000000..5ce60aca5acc1
--- /dev/null
+++ b/src/kibana/components/style_compile/style_compile.js
@@ -0,0 +1,32 @@
+define(function (require) {
+  var _ = require('lodash');
+  var $ = require('jquery');
+  var $style = $('<style>').appendTo('head').attr('id', 'style-compile');
+
+  require('modules')
+  .get('kibana')
+  .run(function ($rootScope, $compile, config) {
+    var truncateGradientHeight = 15;
+    var template = _.template(require('text!components/style_compile/style_compile.css.tmpl'));
+    var locals = {};
+
+    $rootScope.$on('$destroy', function () {
+      $style.remove();
+    });
+
+    // watch the value of the truncate:maxHeight config param
+    $rootScope.$watch(function () {
+      return config.get('truncate:maxHeight');
+    }, function (maxHeight) {
+      if (maxHeight > 0) {
+        locals.truncateMaxHeight = maxHeight + 'px !important';
+        locals.truncateGradientTop = maxHeight - truncateGradientHeight + 'px';
+      } else {
+        locals.truncateMaxHeight = 'none';
+        locals.truncateGradientTop = '-' + truncateGradientHeight + 'px';
+      }
+
+      $style.html(template(locals));
+    });
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/timepicker/timepicker.html b/src/kibana/components/timepicker/timepicker.html
index cf1a75c7ce970..e93554f31975b 100644
--- a/src/kibana/components/timepicker/timepicker.html
+++ b/src/kibana/components/timepicker/timepicker.html
@@ -83,7 +83,7 @@
             </div>
 
             <div class="kbn-timepicker-section">
-              <label>&nbsp</label><br>
+              <label>&nbsp;</label><br>
               <div class="form-group">
                 <button
                   type="submit"
diff --git a/src/kibana/partials/tooltip.html b/src/kibana/components/tooltip/tooltip.html
similarity index 100%
rename from src/kibana/partials/tooltip.html
rename to src/kibana/components/tooltip/tooltip.html
diff --git a/src/kibana/components/tooltip/tooltip.js b/src/kibana/components/tooltip/tooltip.js
new file mode 100644
index 0000000000000..81c003d75ddc5
--- /dev/null
+++ b/src/kibana/components/tooltip/tooltip.js
@@ -0,0 +1,28 @@
+define(function (require) {
+  var html = require('text!components/tooltip/tooltip.html');
+
+  require('modules').get('kibana')
+  .config(function ($tooltipProvider) {
+    $tooltipProvider.options({
+      placement: 'bottom',
+      animation: true,
+      popupDelay: 150,
+      appendToBody: false
+    });
+  })
+  .directive('kbnTooltip', function () {
+    return {
+      restrict: 'E',
+      template: html,
+      transclude: true,
+      replace: true,
+      scope: true,
+      link: function ($scope, $el, attr) {
+        $scope.text = attr.text;
+        $scope.placement = attr.placement || 'top';
+        $scope.delay = attr.delay || 400;
+        $scope.appendToBody = attr.appendToBody || 0;
+      }
+    };
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/components/watch_multi.js b/src/kibana/components/watch_multi.js
new file mode 100644
index 0000000000000..f15679f61630a
--- /dev/null
+++ b/src/kibana/components/watch_multi.js
@@ -0,0 +1,69 @@
+define(function (require) {
+  var _ = require('lodash');
+
+  require('modules').get('kibana')
+  .run(function ($rootScope) {
+
+    /**
+     * Watch multiple expressions with a single callback. Along
+     * with making code simpler it also merges all of the watcher
+     * handlers within a single tick.
+     *
+     * @param  {array[string|function]} expressions - the list of expressions to $watch
+     * @param  {Function} fn - the callback function
+     * @param  {boolean} deep - should the watchers be created as deep watchers?
+     * @return {undefined}
+     */
+    $rootScope.constructor.prototype.$watchMulti = function (expressions, fn, deep) {
+      if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
+      if (!_.isFunction(fn)) throw new TypeError('expexted a function that is triggered on each watch');
+
+      var $scope = this;
+      var initQueue = _.clone(expressions);
+      var fired = false;
+      var vals = {
+        new: new Array(expressions.length),
+        old: new Array(expressions.length)
+      };
+
+      expressions.forEach(function (expr, i) {
+        $scope.$watch(expr, function (newVal, oldVal) {
+          vals.new[i] = newVal;
+
+          if (initQueue) {
+            vals.old[i] = oldVal;
+
+            var qIdx = initQueue.indexOf(expr);
+            if (qIdx !== -1) initQueue.splice(qIdx, 1);
+            if (initQueue.length === 0) {
+              initQueue = false;
+              if (fn.length) {
+                fn(vals.new.slice(0), vals.old.slice(0));
+              } else {
+                fn();
+              }
+            }
+            return;
+          }
+
+          if (fired) return;
+          fired = true;
+          $scope.$evalAsync(function () {
+            fired = false;
+
+            if (fn.length) {
+              fn(vals.new.slice(0), vals.old.slice(0));
+            } else {
+              fn();
+            }
+
+            for (var i = 0; i < vals.new.length; i++) {
+              vals.old[i] = vals.new[i];
+            }
+          });
+        });
+      });
+    };
+
+  });
+});
\ No newline at end of file
diff --git a/src/kibana/controllers/kibana.js b/src/kibana/controllers/kibana.js
deleted file mode 100644
index 338da273566ff..0000000000000
--- a/src/kibana/controllers/kibana.js
+++ /dev/null
@@ -1,193 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-  var moment = require('moment');
-  var nextTick = require('utils/next_tick');
-  var qs = require('utils/query_string');
-  var rison = require('utils/rison');
-
-  require('components/config/config');
-  require('components/courier/courier');
-  require('components/filter_bar/filter_bar');
-  require('components/notify/notify');
-  require('components/persisted_log/persisted_log');
-  require('components/state_management/app_state');
-  require('components/storage/storage');
-  require('components/url/url');
-  require('components/doc_title/doc_title');
-  require('directives/click_focus');
-  require('directives/info');
-  require('directives/tooltip');
-  require('directives/spinner');
-  require('directives/paginate');
-  require('directives/pretty_duration');
-  require('directives/style_compile');
-  require('directives/rows');
-
-  require('angular-bootstrap');
-  require('services/private');
-
-  var module = require('modules').get('kibana', ['ui.bootstrap']);
-
-  module
-    .config(function ($tooltipProvider) {
-      $tooltipProvider.options({
-        placement: 'bottom',
-        animation: true,
-        popupDelay: 150,
-        appendToBody: false
-      });
-    })
-    .run(function ($rootScope) {
-      $rootScope.constructor.prototype.$watchMulti = function (expressions, fn, deep) {
-        if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
-        if (!_.isFunction(fn)) throw new TypeError('expexted a function that is triggered on each watch');
-
-        var $scope = this;
-        var initQueue = _.clone(expressions);
-        var fired = false;
-        var vals = {
-          new: new Array(expressions.length),
-          old: new Array(expressions.length)
-        };
-
-        expressions.forEach(function (expr, i) {
-          $scope.$watch(expr, function (newVal, oldVal) {
-            vals.new[i] = newVal;
-
-            if (initQueue) {
-              vals.old[i] = oldVal;
-
-              var qIdx = initQueue.indexOf(expr);
-              if (qIdx !== -1) initQueue.splice(qIdx, 1);
-              if (initQueue.length === 0) {
-                initQueue = false;
-                fn(vals.new.slice(0), vals.old.slice(0));
-              }
-              return;
-            }
-
-            if (fired) return;
-            fired = true;
-            $scope.$evalAsync(function () {
-              fired = false;
-
-              if (fn.length) {
-                fn(vals.new.slice(0), vals.old.slice(0));
-              } else {
-                fn();
-              }
-
-              for (var i = 0; i < vals.new.length; i++) {
-                vals.old[i] = vals.new[i];
-              }
-            });
-          });
-        });
-      };
-
-      $rootScope.constructor.prototype.$listen = function (emitter, eventName, handler) {
-        emitter.on(eventName, handler);
-        this.$on('$destroy', function () {
-          emitter.off(eventName, handler);
-        });
-      };
-    })
-    .controller('kibana', function ($rootScope, $location, $scope, Notifier, $injector, $q, $http, config, kbnSetup, Private) {
-      var notify = new Notifier();
-
-      $scope.appEmbedded = $location.search().embed;
-      $scope.httpActive = $http.pendingRequests;
-      window.$kibanaInjector = $injector;
-
-      // this is the only way to handle uncaught route.resolve errors
-      $rootScope.$on('$routeChangeError', function (event, next, prev, err) {
-        notify.fatal(err);
-      });
-
-      $q.all([
-        kbnSetup(),
-        config.init()
-      ]).then(function () {
-        $scope.setupComplete = true;
-        $injector.invoke(function ($rootScope, courier, config, configFile, sessionStorage, $timeout, $location, timefilter, globalState) {
-
-          $rootScope.globalState = globalState;
-
-          // get/set last path for an app
-          var lastPathFor = function (app, path) {
-            var key = 'lastPath:' + app.id;
-            if (path === void 0) {
-              app.lastPath = sessionStorage.get(key) || '/' + app.id;
-              return app.lastPath;
-            } else {
-              app.lastPath = path;
-              return sessionStorage.set(key, path);
-            }
-          };
-
-          $scope.apps = Private(require('registry/apps'));
-          // initialize each apps lastPath (fetch it from storage)
-          $scope.apps.forEach(function (app) { lastPathFor(app); });
-
-          function onRouteChange() {
-            var route = $location.path().split(/\//);
-            var app = $rootScope.activeApp = _.find($scope.apps, {id: route[1]});
-
-            if (!app) return;
-
-            // Record the last URL w/ state of the app, use for tab.
-            lastPathFor(app, globalState.removeFromUrl($location.url()));
-          }
-
-          $rootScope.$on('$routeChangeSuccess', onRouteChange);
-          $rootScope.$on('$routeUpdate', onRouteChange);
-
-          var writeGlobalStateToLastPaths = function () {
-            var currentUrl = $location.url();
-
-            $scope.apps.forEach(function (app) {
-              var url = lastPathFor(app);
-              if (!url || url === currentUrl) return;
-
-              lastPathFor(app, globalState.replaceParamInUrl(url));
-            });
-          };
-
-          $scope.$listen(timefilter, 'update', function (newVal, oldVal) {
-            globalState.time = _.clone(timefilter.time);
-            globalState.save();
-          });
-
-          $scope.$on('application.load', function () {
-            courier.start();
-          });
-
-          $scope.opts = {
-            timefilter: timefilter
-          };
-
-          $scope.configure = function () {
-            $scope.configureTemplateUrl = require('text!partials/global_config.html');
-          };
-
-          // expose the notification services list of notifs on the $scope so that the
-          // notification directive can show them on the screen
-          $scope.notifList = notify._notifs;
-          // provide alternate methods for setting timeouts, which will properly trigger digest cycles
-          notify._setTimerFns($timeout, $timeout.cancel);
-
-          $scope.toggleTimepicker = function () {
-            var timepickerHtml = '<kbn-timepicker from="opts.timefilter.time.from"' +
-              ' to="opts.timefilter.time.to" mode="opts.timefilter.time.mode"></kbn-timepicker>';
-            // Close if already open
-            if ($scope.globalConfigTemplate === timepickerHtml) {
-              delete $scope.globalConfigTemplate;
-            } else {
-              $scope.globalConfigTemplate = timepickerHtml;
-            }
-          };
-        });
-      });
-    });
-});
diff --git a/src/kibana/directives/style_compile.js b/src/kibana/directives/style_compile.js
deleted file mode 100644
index f4e3abc9915f3..0000000000000
--- a/src/kibana/directives/style_compile.js
+++ /dev/null
@@ -1,36 +0,0 @@
-define(function (require) {
-  var _ = require('lodash');
-  var $ = require('jquery');
-
-  require('modules')
-  .get('kibana')
-  .directive('styleCompile', function ($compile, config) {
-    return {
-      restrict: 'E',
-      link: function ($scope, $el) {
-
-        var truncateGradientHeight = 15;
-
-        // watch the value of the truncate:maxHeight config param
-        $scope.$watch(function () {
-          return config.get('truncate:maxHeight');
-        }, function (maxHeight) {
-          if (maxHeight > 0) {
-            $scope.truncateMaxHeight = maxHeight + 'px !important';
-            $scope.truncateGradientTop = maxHeight - truncateGradientHeight + 'px';
-          } else {
-            $scope.truncateMaxHeight = 'none';
-            $scope.truncateGradientTop = '-' + truncateGradientHeight + 'px';
-          }
-        });
-
-        var $style = $('<style>');
-        $el.after($style);
-
-        $scope.$watch(function () { return $el.html(); }, function (stagedCss) {
-          $style.html(stagedCss);
-        });
-      }
-    };
-  });
-});
\ No newline at end of file
diff --git a/src/kibana/directives/tooltip.js b/src/kibana/directives/tooltip.js
deleted file mode 100644
index 781f73a8dde03..0000000000000
--- a/src/kibana/directives/tooltip.js
+++ /dev/null
@@ -1,21 +0,0 @@
-define(function (require) {
-  var html = require('text!partials/tooltip.html');
-
-  require('modules')
-    .get('kibana')
-    .directive('kbnTooltip', function () {
-      return {
-        restrict: 'E',
-        template: html,
-        transclude: true,
-        replace: true,
-        scope: true,
-        link: function ($scope, $el, attr) {
-          $scope.text = attr.text;
-          $scope.placement = attr.placement || 'top';
-          $scope.delay = attr.delay || 400;
-          $scope.appendToBody = attr.appendToBody || 0;
-        }
-      };
-    });
-});
\ No newline at end of file
diff --git a/src/kibana/index.html b/src/kibana/index.html
index c24ecbf7c771a..1f7a62c8c2292 100644
--- a/src/kibana/index.html
+++ b/src/kibana/index.html
@@ -25,67 +25,5 @@
       require(['kibana'], function (kibana) { kibana.init(); });
     </script>
   </head>
-  <body ng-controller="kibana" ng-class="'application-' + activeApp.id">
-    <kbn-notifications list="notifList"></kbn-notifications>
-    <div class="content" style="display: none;">
-      <nav ng-hide="appEmbedded" bindonce class="navbar navbar-inverse navbar-static-top">
-        <div class="container-fluid">
-
-          <div class="navbar-header">
-            <button ng-click="showCollapsed = !showCollapsed" type="button" class="navbar-toggle">
-              <span class="sr-only">Toggle navigation</span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-              <span class="icon-bar"></span>
-            </button>
-            <span class="navbar-brand visible-xs">{{ activeApp.name }}
-              <span ng-show="httpActive.length" class="spinner">
-              </span>
-            </span>
-          </div>
-
-
-          <!-- Full navbar -->
-          <div collapse="!showCollapsed" class="navbar-collapse" id="kibana-primary-navbar">
-            <ul class="nav navbar-nav">
-              <li ng-repeat="app in apps.inOrder" ng-class="{active: activeApp === app}">
-                <a ng-href="#{{app.lastPath}}" bo-text="app.name"></a>
-              </li>
-            </ul>
-
-            <ul class="nav navbar-nav navbar-right">
-              <li ng-show="httpActive.length" class="navbar-text">
-                <div class="spinner">
-                </div>
-              </li>
-              <li ng-if="setupComplete" ng-show="opts.timefilter.enabled" class="navbar-timepicker-display">
-                <a ng-click="toggleTimepicker()">
-                  <pretty-duration from="opts.timefilter.time.from" to="opts.timefilter.time.to"></pretty-duration>
-                  &nbsp;
-                  <i class="fa fa-clock-o"></i>
-                </a>
-              </li>
-            </ul>
-          </div>
-          <!-- /Full navbar -->
-
-
-        </div>
-      </nav>
-
-      <config ng-show="opts.timefilter.enabled"
-        config-template="globalConfigTemplate" config-object="opts">
-      </config>
-
-      <div class="application" ng-view></div>
-    </div>
-    <style-compile>
-      .truncate-by-height {
-        max-height: {{ truncateMaxHeight }};
-      }
-      .truncate-by-height::before {
-        top: {{ truncateGradientTop }};
-      }
-    </style-compile>
-  </body>
+  <body kibana ng-class="'application-' + activeApp.id"></body>
 </html>
diff --git a/src/kibana/index.js b/src/kibana/index.js
index 287a595cb8ca8..fbbdb3196b6f6 100644
--- a/src/kibana/index.js
+++ b/src/kibana/index.js
@@ -52,10 +52,10 @@ define(function (require) {
   modules.link(kibana);
 
   kibana.load = _.onceWithCb(function (cb) {
-    require([
-      'controllers/kibana'
-    ], function loadApps() {
-      require(configFile.plugins, cb);
+    var firstLoad = [ 'plugins/kibana/index' ];
+    var thenLoad = _.difference(configFile.plugins, firstLoad);
+    require(firstLoad, function loadApps() {
+      require(thenLoad, cb);
     });
   });
 
diff --git a/src/kibana/plugins/kibana/_apps.js b/src/kibana/plugins/kibana/_apps.js
new file mode 100644
index 0000000000000..c0e948f58450a
--- /dev/null
+++ b/src/kibana/plugins/kibana/_apps.js
@@ -0,0 +1,36 @@
+define(function (require) {
+  return function KbnControllerApps(Private, $rootScope, $scope, $location, globalState, sessionStorage) {
+    var _ = require('lodash');
+
+    function appKey(app) {
+      return 'lastPath:' + app.id;
+    }
+
+    function getLastPath(app) {
+      app.lastPath = sessionStorage.get(appKey(app)) || '/' + app.id;
+      return app.lastPath;
+    }
+
+    function setLastPath(app, path) {
+      app.lastPath = path;
+      return sessionStorage.set(appKey(app), path);
+    }
+
+    $scope.apps = Private(require('registry/apps'));
+    // initialize each apps lastPath (fetch it from storage)
+    $scope.apps.forEach(getLastPath);
+
+    function onRouteChange() {
+      var route = $location.path().split(/\//);
+      var app = $rootScope.activeApp = _.find($scope.apps, { id: route[1] });
+
+      if (!app) return;
+
+      // Record the last URL w/ state of the app, use for tab.
+      setLastPath(app, globalState.removeFromUrl($location.url()));
+    }
+
+    $rootScope.$on('$routeChangeSuccess', onRouteChange);
+    $rootScope.$on('$routeUpdate', onRouteChange);
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/kibana/_init.js b/src/kibana/plugins/kibana/_init.js
new file mode 100644
index 0000000000000..505eab4c66881
--- /dev/null
+++ b/src/kibana/plugins/kibana/_init.js
@@ -0,0 +1,16 @@
+define(function (require) {
+  return function KibanaControllerInit($rootScope, $scope, $location, courier, $http, globalState, notify) {
+    // expose some globals
+    $rootScope.globalState = globalState;
+
+    // and some local values
+    $scope.appEmbedded = $location.search().embed;
+    $scope.httpActive = $http.pendingRequests;
+    $scope.notifList = notify._notifs;
+
+    // wait for the application to finish loading
+    $scope.$on('application.load', function () {
+      courier.start();
+    });
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/kibana/_timepicker.html b/src/kibana/plugins/kibana/_timepicker.html
new file mode 100644
index 0000000000000..6d6aaef2fa600
--- /dev/null
+++ b/src/kibana/plugins/kibana/_timepicker.html
@@ -0,0 +1,5 @@
+<kbn-timepicker
+  from="timefilter.time.from"
+  to="timefilter.time.to"
+  mode="timefilter.time.mode">
+</kbn-timepicker>
\ No newline at end of file
diff --git a/src/kibana/plugins/kibana/_timepicker.js b/src/kibana/plugins/kibana/_timepicker.js
new file mode 100644
index 0000000000000..c3519bacc9fcb
--- /dev/null
+++ b/src/kibana/plugins/kibana/_timepicker.js
@@ -0,0 +1,24 @@
+define(function (require) {
+  return function KbnControllerTimefilter(notify, $scope, timefilter, globalState) {
+    var _ = require('lodash');
+
+    $scope.notifList = notify._notifs;
+    $scope.timefilter = timefilter;
+
+    $scope.$listen(timefilter, 'update', function (newVal, oldVal) {
+      globalState.time = _.clone(timefilter.time);
+      globalState.save();
+    });
+
+    var timepickerHtml = require('text!plugins/kibana/_timepicker.html');
+    $scope.toggleTimepicker = function () {
+      // Close if already open
+      if ($scope.globalConfigTemplate === timepickerHtml) {
+        delete $scope.globalConfigTemplate;
+      } else {
+        $scope.globalConfigTemplate = timepickerHtml;
+      }
+    };
+
+  };
+});
\ No newline at end of file
diff --git a/src/kibana/plugins/kibana/index.js b/src/kibana/plugins/kibana/index.js
new file mode 100644
index 0000000000000..6471ea4a4fd0a
--- /dev/null
+++ b/src/kibana/plugins/kibana/index.js
@@ -0,0 +1,56 @@
+define(function (require) {
+  // base angular components/directives we expect to be loaded
+  require('angular-bootstrap');
+  require('services/private');
+  require('components/config/config');
+  require('components/courier/courier');
+  require('components/filter_bar/filter_bar');
+  require('components/notify/notify');
+  require('components/persisted_log/persisted_log');
+  require('components/state_management/app_state');
+  require('components/storage/storage');
+  require('components/url/url');
+  require('components/doc_title/doc_title');
+  require('components/tooltip/tooltip');
+  require('components/style_compile/style_compile');
+  require('components/watch_multi');
+  require('components/listen');
+  require('directives/click_focus');
+  require('directives/info');
+  require('directives/spinner');
+  require('directives/paginate');
+  require('directives/pretty_duration');
+  require('directives/rows');
+
+  var Notifier = require('components/notify/_notifier');
+
+  // ensure that the kibana module requires ui.bootstrap
+  require('modules').get('kibana', ['ui.bootstrap'])
+  .directive('kibana', function ($rootScope, $injector, Promise, config, kbnSetup) {
+    return {
+      template: require('text!plugins/kibana/kibana.html'),
+      controller: function ($scope) {
+        var self = $rootScope.kibana = this;
+        var notify = new Notifier({ location: 'Kibana' });
+
+        // this is the only way to handle uncaught route.resolve errors
+        $rootScope.$on('$routeChangeError', function (event, next, prev, err) {
+          notify.fatal(err);
+        });
+
+        // run init functions before loading the mixins, so that we can ensure that
+        // the environment is ready for them to get and use their dependencies
+        self.ready = Promise.all([ kbnSetup(), config.init() ])
+        .then(function () {
+          // load some "mixins"
+          var mixinLocals = { $scope: $scope, notify: notify };
+          $injector.invoke(require('plugins/kibana/_init'), self, mixinLocals);
+          $injector.invoke(require('plugins/kibana/_apps'), self, mixinLocals);
+          $injector.invoke(require('plugins/kibana/_timepicker'), self, mixinLocals);
+
+          $scope.setupComplete = true;
+        });
+      }
+    };
+  });
+});
diff --git a/src/kibana/plugins/kibana/kibana.html b/src/kibana/plugins/kibana/kibana.html
new file mode 100644
index 0000000000000..728f8f131fbfd
--- /dev/null
+++ b/src/kibana/plugins/kibana/kibana.html
@@ -0,0 +1,51 @@
+<kbn-notifications list="notifList"></kbn-notifications>
+<div class="content" style="display: none;">
+  <nav ng-hide="appEmbedded" bindonce class="navbar navbar-inverse navbar-static-top">
+    <div class="container-fluid">
+
+      <div class="navbar-header">
+        <button ng-click="showCollapsed = !showCollapsed" type="button" class="navbar-toggle">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <span class="navbar-brand visible-xs">{{ activeApp.name }}
+          <span ng-show="httpActive.length" class="spinner"></span>
+        </span>
+      </div>
+
+      <!-- Full navbar -->
+      <div collapse="!showCollapsed" class="navbar-collapse" id="kibana-primary-navbar">
+        <ul class="nav navbar-nav">
+          <li ng-repeat="app in apps.inOrder" ng-class="{active: activeApp === app}">
+            <a ng-href="#{{app.lastPath}}" bo-text="app.name"></a>
+          </li>
+        </ul>
+
+        <ul class="nav navbar-nav navbar-right">
+          <li ng-show="httpActive.length" class="navbar-text">
+            <div class="spinner">
+            </div>
+          </li>
+          <li ng-if="setupComplete" ng-show="timefilter.enabled" class="navbar-timepicker-display">
+            <a ng-click="toggleTimepicker()">
+              <pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
+              &nbsp;
+              <i class="fa fa-clock-o"></i>
+            </a>
+          </li>
+        </ul>
+      </div>
+      <!-- /Full navbar -->
+    </div>
+  </nav>
+
+  <config
+    ng-show="timefilter.enabled"
+    config-template="globalConfigTemplate"
+    config-object="timefilter">
+  </config>
+
+  <div class="application" ng-view></div>
+</div>
\ No newline at end of file
diff --git a/src/kibana/utils/routes/_setup.js b/src/kibana/utils/routes/_setup.js
index e1124dfa1e74b..a8d28ca0341e8 100644
--- a/src/kibana/utils/routes/_setup.js
+++ b/src/kibana/utils/routes/_setup.js
@@ -1,5 +1,5 @@
 define(function (require) {
-  return function routeSetup(Promise, kbnSetup, config, $route, kbnUrl, courier, Notifier, Private) {
+  return function routeSetup(Promise, kbnSetup, config, $route, kbnUrl, courier, Notifier, Private, $rootScope) {
     var errors = require('errors');
     var NoDefaultIndexPattern = errors.NoDefaultIndexPattern;
     var NoDefinedIndexPatterns = errors.NoDefinedIndexPatterns;
@@ -12,7 +12,8 @@ define(function (require) {
         return Promise.all([
           kbnSetup(),
           config.init(),
-          courier.SearchSource.ready
+          courier.SearchSource.ready,
+          $rootScope.kibana.ready
         ])
         .then(function () {
           if (!$route.current.$$route.originalPath.match(/settings\/indices/)) {
diff --git a/test/unit/specs/components/listen/listen.js b/test/unit/specs/components/listen/listen.js
new file mode 100644
index 0000000000000..06c7691a522e6
--- /dev/null
+++ b/test/unit/specs/components/listen/listen.js
@@ -0,0 +1,75 @@
+define(function (require) {
+  describe('listen component', function () {
+    var sinon = require('test_utils/auto_release_sinon');
+
+    var $rootScope;
+    var Events;
+
+    require('components/listen');
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function ($injector, Private) {
+      $rootScope = $injector.get('$rootScope');
+      Events = Private(require('factories/events'));
+    }));
+
+    it('exposes the $listen method on all scopes', function () {
+      expect($rootScope.$listen).to.be.a('function');
+      expect($rootScope.$new().$listen).to.be.a('function');
+    });
+
+    it('binds to an event emitter', function () {
+      var emitter = new Events();
+      var $scope = $rootScope.$new();
+
+      function handler() {}
+      $scope.$listen(emitter, 'hello', handler);
+
+      expect(emitter._listeners.hello).to.have.length(1);
+      expect(emitter._listeners.hello[0].handler).to.be(handler);
+    });
+
+    it('binds to $scope, waiting for the destroy event', function () {
+      var emitter = new Events();
+      var $scope = $rootScope.$new();
+
+      sinon.stub($scope, '$on');
+      sinon.stub($rootScope, '$on');
+
+      function handler() {}
+      $scope.$listen(emitter, 'hello', handler);
+
+      expect($rootScope.$on).to.have.property('callCount', 0);
+      expect($scope.$on).to.have.property('callCount', 1);
+
+      var call = $scope.$on.firstCall;
+      expect(call.args[0]).to.be('$destroy');
+      expect(call.args[1]).to.be.a('function');
+    });
+
+    it('unbinds the event handler when $destroy is triggered', function () {
+      var emitter = new Events();
+      var $scope = $rootScope.$new();
+
+      sinon.stub($scope, '$on');
+      sinon.stub(emitter, 'off');
+
+      // set the listener
+      function handler() {}
+      $scope.$listen(emitter, 'hello', handler);
+
+      // get the unbinder that was registered to $scope
+      var unbinder = $scope.$on.firstCall.args[1];
+
+      // call the unbinder
+      expect(emitter.off).to.have.property('callCount', 0);
+      unbinder();
+      expect(emitter.off).to.have.property('callCount', 1);
+
+      // check that the off args were as expected
+      var call = emitter.off.firstCall;
+      expect(call.args[0]).to.be('hello');
+      expect(call.args[1]).to.be(handler);
+    });
+  });
+});
\ No newline at end of file
diff --git a/test/unit/specs/components/style_compile/style_compile.js b/test/unit/specs/components/style_compile/style_compile.js
new file mode 100644
index 0000000000000..1b00489a8527f
--- /dev/null
+++ b/test/unit/specs/components/style_compile/style_compile.js
@@ -0,0 +1,40 @@
+define(function (require) {
+  describe('styleCompile directive', function () {
+    var $ = require('jquery');
+
+    var config;
+    var $rootScope;
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function ($injector) {
+      config = $injector.get('config');
+      $rootScope = $injector.get('$rootScope');
+    }));
+
+    it('exports a few config values as css', function () {
+      var $style = $('#style-compile');
+
+      config.set('truncate:maxHeight', 0);
+      $rootScope.$apply();
+      expect($style.html().trim()).to.be([
+        '.truncate-by-height {',
+        '  max-height: none;',
+        '}',
+        '.truncate-by-height::before {',
+        '  top: -15px;',
+        '}'
+      ].join('\n'));
+
+      config.set('truncate:maxHeight', 15);
+      $rootScope.$apply();
+      expect($style.html().trim()).to.be([
+        '.truncate-by-height {',
+        '  max-height: 15px !important;',
+        '}',
+        '.truncate-by-height::before {',
+        '  top: 0px;',
+        '}'
+      ].join('\n'));
+    });
+  });
+});
\ No newline at end of file
diff --git a/test/unit/specs/components/watch_multi.js b/test/unit/specs/components/watch_multi.js
new file mode 100644
index 0000000000000..6f5f8c0b77670
--- /dev/null
+++ b/test/unit/specs/components/watch_multi.js
@@ -0,0 +1,104 @@
+define(function (require) {
+  describe('$scope.$watchMulti', function () {
+    var sinon = require('test_utils/auto_release_sinon');
+
+    var $rootScope;
+    var $scope;
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function ($injector) {
+      $rootScope = $injector.get('$rootScope');
+      $scope = $rootScope.$new();
+    }));
+
+    it('exposes $watchMulti on all scopes', function () {
+      expect($rootScope.$watchMulti).to.be.a('function');
+      expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
+
+      var $isoScope = $scope.$new(true);
+      expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
+    });
+
+    it('only triggers a single watch on initialization', function () {
+      var stub = sinon.stub();
+
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+      $rootScope.$apply();
+
+      expect(stub.callCount).to.be(1);
+    });
+
+    it('only triggers a single watch when multiple values change', function () {
+      var stub = sinon.spy(function (a, b) {});
+
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+
+      $rootScope.$apply();
+      expect(stub.callCount).to.be(1);
+
+      $scope.one = 'a';
+      $scope.two = 'b';
+      $scope.three = 'c';
+      $rootScope.$apply();
+
+      expect(stub.callCount).to.be(2);
+    });
+
+    it('passes an array of the current values as the first arg, and an array of the previous values as the second',
+    function () {
+      var stub = sinon.spy(function (a, b) {});
+
+      $scope.one = 'a';
+      $scope.two = 'b';
+      $scope.three = 'c';
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], stub);
+
+      $rootScope.$apply();
+      expect(stub.firstCall.args).to.eql([
+        ['a', 'b', 'c'],
+        ['a', 'b', 'c']
+      ]);
+
+      $scope.one = 'do';
+      $scope.two = 're';
+      $scope.three = 'mi';
+      $rootScope.$apply();
+
+      expect(stub.secondCall.args).to.eql([
+        ['do', 're', 'mi'],
+        ['a', 'b', 'c']
+      ]);
+    });
+
+    it('does not pass args unless the function will use them', function () {
+      var calls = 0;
+
+      $scope.one = 'a';
+      $scope.two = 'b';
+      $scope.three = 'c';
+      $scope.$watchMulti([
+        'one',
+        'two',
+        'three'
+      ], function () {
+        calls ++;
+        expect(arguments).to.have.length(0);
+      });
+      $rootScope.$apply();
+
+      expect(calls).to.be(1);
+    });
+  });
+});
\ No newline at end of file
diff --git a/test/unit/specs/services/url.js b/test/unit/specs/services/url.js
index 9f9ab763b6418..d5943ff6b9a09 100644
--- a/test/unit/specs/services/url.js
+++ b/test/unit/specs/services/url.js
@@ -14,12 +14,6 @@ define(function (require) {
   require('components/url/url');
 
   function init() {
-    globalStateMock = {
-      removeFromUrl: function (url) {
-        return url;
-      }
-    };
-
     module('kibana/url', 'kibana', function ($provide) {
       $provide.service('$route', function () {
         return {
@@ -28,6 +22,12 @@ define(function (require) {
       });
 
       $provide.service('globalState', function () {
+        globalStateMock = {};
+        globalStateMock.on = globalStateMock.off = _.noop;
+        globalStateMock.removeFromUrl = function (url) {
+          return url;
+        };
+
         return globalStateMock;
       });
     });