diff --git a/app/components/directive/directive.js b/app/components/directive/directive.js
index 3c24b02..51e65e0 100644
--- a/app/components/directive/directive.js
+++ b/app/components/directive/directive.js
@@ -5,6 +5,7 @@ angular.module('bansho.directive', [
     'bansho.textArea',
     'bansho.container',
     'bansho.hostTree',
+    'bansho.stateIcon',
     'bansho.table',
     'bansho.tabpanel',
     'bansho.tactical',
diff --git a/app/components/directive/hostTree/hostTree.html b/app/components/directive/host_tree/host_tree.html
similarity index 100%
rename from app/components/directive/hostTree/hostTree.html
rename to app/components/directive/host_tree/host_tree.html
diff --git a/app/components/directive/hostTree/hostTree.js b/app/components/directive/host_tree/host_tree.js
similarity index 91%
rename from app/components/directive/hostTree/hostTree.js
rename to app/components/directive/host_tree/host_tree.js
index 11c7a8d..163c8a6 100644
--- a/app/components/directive/hostTree/hostTree.js
+++ b/app/components/directive/host_tree/host_tree.js
@@ -8,7 +8,7 @@ angular.module('bansho.hostTree', ['bansho.datasource'])
             scope: {
                 options: '='
             },
-            templateUrl: 'components/directive/hostTree/hostTree.html',
+            templateUrl: 'components/directive/host_tree/host_tree.html',
             controller: ['$scope', 'sharedData',
                 function ($scope, sharedData) {
                     $scope.sources = {};
diff --git a/app/components/directive/state_icon/state_icon.js b/app/components/directive/state_icon/state_icon.js
index fda65a5..1e790a0 100644
--- a/app/components/directive/state_icon/state_icon.js
+++ b/app/components/directive/state_icon/state_icon.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('bansho.table')
+angular.module('bansho.stateIcon', [])
     .directive('banshoHostStateIcon', function () {
         return {
             restrict: 'EA',
diff --git a/app/components/directive/tabpanel/panel.html b/app/components/directive/tab_panel/panel.html
similarity index 100%
rename from app/components/directive/tabpanel/panel.html
rename to app/components/directive/tab_panel/panel.html
diff --git a/app/components/directive/tabpanel/tabpanel.html b/app/components/directive/tab_panel/tab_panel.html
similarity index 100%
rename from app/components/directive/tabpanel/tabpanel.html
rename to app/components/directive/tab_panel/tab_panel.html
diff --git a/app/components/directive/tabpanel/tabpanel.js b/app/components/directive/tab_panel/tab_panel.js
similarity index 91%
rename from app/components/directive/tabpanel/tabpanel.js
rename to app/components/directive/tab_panel/tab_panel.js
index c74aa1c..d91c21b 100644
--- a/app/components/directive/tabpanel/tabpanel.js
+++ b/app/components/directive/tab_panel/tab_panel.js
@@ -4,7 +4,7 @@ angular.module('bansho.tabpanel', [])
     .directive('banshoTabpanel', ['sharedData', function (sharedData) {
         return {
             restrict: 'E',
-            templateUrl: 'components/directive/tabpanel/tabpanel.html',
+            templateUrl: 'components/directive/tab_panel/tab_panel.html',
             scope: {
                 options: '='
             },
@@ -28,7 +28,7 @@ angular.module('bansho.tabpanel', [])
     .directive('banshoPanel', function () {
         return {
             restrict: 'E',
-            templateUrl: 'components/directive/tabpanel/panel.html',
+            templateUrl: 'components/directive/tab_panel/panel.html',
             scope: {
                   options: '='
             },
diff --git a/app/components/directive/table/pagingbar/pagingbar.html b/app/components/directive/table/paging_bar/paging_bar.html
similarity index 100%
rename from app/components/directive/table/pagingbar/pagingbar.html
rename to app/components/directive/table/paging_bar/paging_bar.html
diff --git a/app/components/directive/table/pagingbar/pagingbar.js b/app/components/directive/table/paging_bar/paging_bar.js
similarity index 94%
rename from app/components/directive/table/pagingbar/pagingbar.js
rename to app/components/directive/table/paging_bar/paging_bar.js
index 11cc4a7..80150ea 100644
--- a/app/components/directive/table/pagingbar/pagingbar.js
+++ b/app/components/directive/table/paging_bar/paging_bar.js
@@ -7,7 +7,7 @@ angular.module('bansho.table.pagingbar', ['bansho.datasource', 'bansho.surveil',
             scope: {
                 options: '='
             },
-            templateUrl: 'components/directive/table/pagingbar/pagingbar.html',
+            templateUrl: 'components/directive/table/paging_bar/paging_bar.html',
             controller: ['$scope', 'datasource',
                 function ($scope, datasource) {
                     $scope.datasourceId = $scope.options.attributes.datasourceId;
diff --git a/app/components/directive/textArea/textArea.html b/app/components/directive/text_area/text_area.html
similarity index 100%
rename from app/components/directive/textArea/textArea.html
rename to app/components/directive/text_area/text_area.html
diff --git a/app/components/directive/textArea/textArea.js b/app/components/directive/text_area/text_area.js
similarity index 90%
rename from app/components/directive/textArea/textArea.js
rename to app/components/directive/text_area/text_area.js
index 01485b0..ccf5864 100644
--- a/app/components/directive/textArea/textArea.js
+++ b/app/components/directive/text_area/text_area.js
@@ -10,7 +10,7 @@ angular.module('bansho.textArea', [])
                 scope: {
                     options: '='
                 },
-                templateUrl: 'components/directive/textArea/textArea.html',
+                templateUrl: 'components/directive/text_area/text_area.html',
                 controller:['$scope', '$window', 'configManager',
                     function ($scope, $window, configManager) {
                         $scope.configuration = JSON.stringify(configManager.readLayoutConfig(), null, 4);
diff --git a/app/index.html b/app/index.html
index 862add4..efd4d5b 100644
--- a/app/index.html
+++ b/app/index.html
@@ -4,140 +4,152 @@
 <!--[if IE 8]>         <html lang="en" class="no-js lt-ie9"> <![endif]-->
 <!--[if gt IE 8]><!--> <html lang="en" class="no-js"> <!--<![endif]-->
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>Bansho</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,400italic' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="assets/css/app.css">
-    <!-- build:css assets/css/app_ext_css.css -->
-    <link href="bower_components/fontawesome/css/font-awesome.min.css" media="all" rel="stylesheet" type="text/css">
-    <link href="bower_components/pnotify/pnotify.core.css" media="all" rel="stylesheet" type="text/css" />
-    <link href="bower_components/pnotify/pnotify.buttons.css" media="all" rel="stylesheet" type="text/css" />
-    <link href="bower_components/pnotify/pnotify.history.css" media="all" rel="stylesheet" type="text/css" />
-    <link href="bower_components/angular-material/angular-material.min.css" media="all" rel="stylesheet" type="text/css" />
-    <!-- endbuild -->
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title>Bansho</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href='http://fonts.googleapis.com/css?family=Roboto:400,700,400italic' rel='stylesheet' type='text/css'>
+  <link rel="stylesheet" href="assets/css/app.css">
+  <!-- build:css assets/css/app_ext_css.css -->
+  <link href="bower_components/fontawesome/css/font-awesome.min.css" media="all" rel="stylesheet" type="text/css">
+  <link href="bower_components/pnotify/pnotify.core.css" media="all" rel="stylesheet" type="text/css" />
+  <link href="bower_components/pnotify/pnotify.buttons.css" media="all" rel="stylesheet" type="text/css" />
+  <link href="bower_components/pnotify/pnotify.history.css" media="all" rel="stylesheet" type="text/css" />
+  <link href="bower_components/angular-material/angular-material.min.css" media="all" rel="stylesheet" type="text/css" />
+  <!-- endbuild -->
 
-    <meta name="description" content="">
+  <meta name="description" content="">
 
-    <!-- build:js js/app.min.js -->
-    <script src="bower_components/angular/angular.js"></script>
-    <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
-    <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
-    <script src="bower_components/angular-route/angular-route.js"></script>
-    <script src="bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="bower_components/angular-material/angular-material.min.js"></script>
-    <script src="bower_components/angular-animate/angular-animate.min.js"></script>
-    <script src="bower_components/angular-aria/angular-aria.min.js"></script>
-    <script src="bower_components/moment/moment.js"></script>
-    <script src="bower_components/raphael/raphael-min.js"></script>
-    <script src="bower_components/justgage-toorshia/justgage.js"></script>
-    <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script>
-    <script src="assets/js/scripts.js"></script>
+  <!-- build:js js/app.min.js -->
+  <script src="bower_components/angular/angular.js"></script>
+  <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
+  <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
+  <script src="bower_components/angular-route/angular-route.js"></script>
+  <script src="bower_components/jquery/dist/jquery.min.js"></script>
+  <script src="bower_components/angular-material/angular-material.min.js"></script>
+  <script src="bower_components/angular-animate/angular-animate.min.js"></script>
+  <script src="bower_components/angular-aria/angular-aria.min.js"></script>
+  <script src="bower_components/moment/moment.js"></script>
+  <script src="bower_components/raphael/raphael-min.js"></script>
+  <script src="bower_components/justgage-toorshia/justgage.js"></script>
+  <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script>
+  <script src="assets/js/scripts.js"></script>
 
-    <!-- pnotify js -->
-    <script src="bower_components/pnotify/pnotify.core.js"></script>
-    <script src="bower_components/pnotify/pnotify.buttons.js"></script>
-    <script src="bower_components/pnotify/pnotify.callbacks.js"></script>
-    <script src="bower_components/pnotify/pnotify.confirm.js"></script>
-    <script src="bower_components/pnotify/pnotify.desktop.js"></script>
-    <script src="bower_components/pnotify/pnotify.nonblock.js"></script>
+  <!-- pnotify js -->
+  <script src="bower_components/pnotify/pnotify.core.js"></script>
+  <script src="bower_components/pnotify/pnotify.buttons.js"></script>
+  <script src="bower_components/pnotify/pnotify.callbacks.js"></script>
+  <script src="bower_components/pnotify/pnotify.confirm.js"></script>
+  <script src="bower_components/pnotify/pnotify.desktop.js"></script>
+  <script src="bower_components/pnotify/pnotify.nonblock.js"></script>
 
-    <script src="app.js"></script>
-    <script src="components/config/config.js"></script>
+  <script src="app.js"></script>
+  <script src="components/config/config.js"></script>
 
-    <!-- Surveil API client -->
-    <script src="components/surveil/surveil.js"></script>
-    <script src="components/surveil/status.js"></script>
-    <script src="components/surveil/actions.js"></script>
-    <script src="components/surveil/config.js"></script>
-    <script src="components/surveil/query.js"></script>
 
-    <script src="components/authentication/authentication.js"></script>
-    <script src="components/ng-justgage/ng-justgage.js"></script>
-    <script src="components/filters/filters.js"></script>
-    <script src="components/notifications/notifications.js"></script>
-    <script src="components/sidebar/sidebar.js"></script>
-    <script src="components/topbar/topbar.js"></script>
-    <script src="components/datasource/datasource.js"></script>
+  <!-- Surveil API client -->
+  <script src="components/surveil/surveil.js"></script>
+  <script src="components/surveil/status.js"></script>
+  <script src="components/surveil/actions.js"></script>
+  <script src="components/surveil/config.js"></script>
+  <script src="components/surveil/query.js"></script>
 
-    <!-- Directives -->
-    <script src="components/directive/directive.js"></script>
-    <script src="components/directive/title/title.js"></script>
-    <script src="components/directive/tactical/tactical.js"></script>
-    <script src="components/directive/tactical/status_overview/status_overview.js"></script>
-    <script src="components/directive/tactical/current_health/current_health.js"></script>
-    <script src="components/directive/tactical/top_alert_producers/top_alert_producers.js"></script>
-    <script src="components/directive/tabpanel/tabpanel.js"></script>
+  <script src="components/authentication/authentication.js"></script>
+  <script src="components/ng-justgage/ng-justgage.js"></script>
+  <script src="components/filters/filters.js"></script>
+  <script src="components/notifications/notifications.js"></script>
+  <script src="components/sidebar/sidebar.js"></script>
+  <script src="components/topbar/topbar.js"></script>
+  <script src="components/datasource/datasource.js"></script>
+  <script src="components/grafana/grafana.js"></script>
 
-    <!-- Table components -->
 
-    <script src="components/directive/container/container.js"></script>
-    <script src="components/directive/actionbar/actionbar.js"></script>
-    <script src="components/directive/actionbar/component_acknowledge/acknowledge.js"></script>
-    <script src="components/directive/actionbar/component_downtime/downtime.js"></script>
-    <script src="components/directive/actionbar/component_filter/filter.js"></script>
-    <script src="components/directive/actionbar/component_more/more.js"></script>
-    <script src="components/directive/actionbar/component_recheck/recheck.js"></script>
-    <script src="components/directive/actionbar/component_search_filter/search_filter.js"></script>
-    <script src="components/directive/container/info/info.js"></script>
-    <script src="components/directive/textArea/textArea.js"></script>
-    <script src="components/directive/table/table.js"></script>
-    <script src="components/directive/table/pagingbar/pagingbar.js"></script>
-    <script src="components/directive/table/cell_status_duration/cell_status_duration.js"></script>
+  <!-- Directives -->
+  <script src="components/directive/directive.js"></script>
 
-    <script src="components/directive/table/cell_single/cell_single.js"></script>
-    <script src="components/directive/table/cell_config_host_register/cell_config_host_register.js"></script>
+  <!-- Table components -->
+  <script src="components/directive/table/table.js"></script>
 
-    <script src="components/directive/table/cell_other_fields/cell_other_fields.js"></script>
-    <script src="components/directive/table/cell_status_host/cell_status_host.js"></script>
-    <script src="components/directive/table/cell_status_last_check/cell_status_last_check.js"></script>
-    <script src="components/directive/table/cell_status_service_check/cell_status_service_check.js"></script>
-    <script src="components/directive/table/cell_status_host_status/cell_status_host_status.js"></script>
-    <script src="components/directive/state_icon/state_icon.js"></script>
-    <script src="components/grafana/grafana.js"></script>
+  <script src="components/directive/table/cell_single/cell_single.js"></script>
+  <script src="components/directive/table/cell_other_fields/cell_other_fields.js"></script>
 
-    <script src="components/directive/container/host_cpu/host_cpu.js"></script>
-    <script src="components/directive/container/host_load/host_load.js"></script>
-    <script src="components/directive/container/host_main/host_main.js"></script>
-    <script src="components/directive/container/host_live/host_live.js"></script>
-    <script src="components/directive/container/host_services_list/host_services_list.js"></script>
-    <script src="components/directive/hostTree/hostTree.js"></script>
-    <script src="components/directive/container/service_main/service_main.js"></script>
-    <script src="components/directive/container/service_live/service_live.js"></script>
-    <script src="components/directive/container/service_info/service_info.js"></script>
-    <script src="components/directive/container/service_graphs/service_graphs.js"></script>
-    <script src="components/directive/container/service_metrics/service_metrics.js"></script>
-    <script src="components/drupal/drupal.js"></script>
-    <script src="components/drupal/drupal_tile/drupal_tile.js"></script>
-    <script src="components/drupal/drupal_info/drupal_info.js"></script>
-    <script src="routing_view/routing_view.js"></script>
-    <script src="templates/template.js"></script>
-    <script src="templates/page/page.js"></script>
-    <script src="templates/drupal_dashboard/drupal_dashboard.js"></script>
-    <script src="templates/drupal/drupal.js"></script>
-    <!-- endbuild -->
-  </head>
+  <script src="components/directive/table/cell_status_duration/cell_status_duration.js"></script>
+  <script src="components/directive/table/cell_config_host_register/cell_config_host_register.js"></script>
+  <script src="components/directive/table/cell_status_host/cell_status_host.js"></script>
+  <script src="components/directive/table/cell_status_last_check/cell_status_last_check.js"></script>
+  <script src="components/directive/table/cell_status_service_check/cell_status_service_check.js"></script>
+  <script src="components/directive/table/cell_status_host_status/cell_status_host_status.js"></script>
 
-  <body class="layout" ng-class="[themeClass, themeClassSize]" ng-app="bansho">
-    <!--[if lt IE 7]> <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <![endif]-->
-    <div class="layout__container">
-      <aside class="layout__aside sidebar-wrapper collapse" id="sidebarWrapper">
-        <bansho-sidebar ng-show="isAuthenticated"></bansho-sidebar>
-      </aside>
+  <script src="components/directive/tab_panel/tab_panel.js"></script>
 
-      <div class="layout__main">
-        <div class="topbar-wrapper clearfix">
-          <bansho-topbar ng-show="isAuthenticated"></bansho-topbar>
-        </div>
+  <script src="components/directive/state_icon/state_icon.js"></script>
 
-        <main ng-view id="page" class="main" role="main"></main>
-        <footer class="footer" role="contentinfo"></footer>
+  <script src="components/directive/text_area/text_area.js"></script>
+
+  <script src="components/directive/host_tree/host_tree.js"></script>
+
+  <script src="components/directive/title/title.js"></script>
+
+  <script src="components/directive/tactical/tactical.js"></script>
+  <script src="components/directive/tactical/status_overview/status_overview.js"></script>
+  <script src="components/directive/tactical/current_health/current_health.js"></script>
+  <script src="components/directive/tactical/top_alert_producers/top_alert_producers.js"></script>
+
+  <script src="components/directive/container/container.js"></script>
+  <script src="components/directive/container/info/info.js"></script>
+  <script src="components/directive/container/host_cpu/host_cpu.js"></script>
+  <script src="components/directive/container/host_load/host_load.js"></script>
+  <script src="components/directive/container/host_main/host_main.js"></script>
+  <script src="components/directive/container/host_live/host_live.js"></script>
+  <script src="components/directive/container/host_services_list/host_services_list.js"></script>
+  <script src="components/directive/container/service_main/service_main.js"></script>
+  <script src="components/directive/container/service_live/service_live.js"></script>
+  <script src="components/directive/container/service_info/service_info.js"></script>
+  <script src="components/directive/container/service_graphs/service_graphs.js"></script>
+  <script src="components/directive/container/service_metrics/service_metrics.js"></script>
+
+  <script src="components/directive/actionbar/actionbar.js"></script>
+  <script src="components/directive/actionbar/component_acknowledge/acknowledge.js"></script>
+  <script src="components/directive/actionbar/component_downtime/downtime.js"></script>
+  <script src="components/directive/actionbar/component_filter/filter.js"></script>
+  <script src="components/directive/actionbar/component_more/more.js"></script>
+  <script src="components/directive/actionbar/component_recheck/recheck.js"></script>
+  <script src="components/directive/actionbar/component_search_filter/search_filter.js"></script>
+
+  <script src="components/directive/table/paging_bar/paging_bar.js"></script>
+
+  <script src="components/drupal/drupal.js"></script>
+  <script src="components/drupal/drupal_tile/drupal_tile.js"></script>
+  <script src="components/drupal/drupal_info/drupal_info.js"></script>
+
+  <script src="routing_view/routing_view.js"></script>
+
+  <script src="templates/template.js"></script>
+  <script src="templates/page/page.js"></script>
+  <script src="templates/drupal_dashboard/drupal_dashboard.js"></script>
+  <script src="templates/drupal/drupal.js"></script>
+  <!-- endbuild -->
+</head>
+
+<body class="layout" data-ng-class="[themeClass, themeClassSize]" data-ng-app="bansho">
+  <!--[if lt IE 7]> <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> <![endif]-->
+  <div class="layout__container">
+    <aside class="layout__aside sidebar-wrapper collapse" id="sidebarWrapper">
+      <bansho-sidebar data-ng-show="isAuthenticated"></bansho-sidebar>
+    </aside>
+
+    <div class="layout__main">
+      <div class="topbar-wrapper clearfix">
+        <bansho-topbar ng-show="isAuthenticated"></bansho-topbar>
       </div>
-    </div>
 
-    <!-- build:developmentOnly -->
-    <script src="//localhost:35729/livereload.js"></script>
-    <!-- endbuild -->
-  </body>
+      <main data-ng-view id="page" class="main" role="main"></main>
+      <footer class="footer" role="contentinfo"></footer>
+    </div>
+  </div>
+
+  <!-- build:developmentOnly -->
+  <script src="//localhost:35729/livereload.js"></script>
+  <!-- endbuild -->
+</body>
 </html>