diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html
index 5522d50..c397797 100644
--- a/app/components/sidebar/sidebar.html
+++ b/app/components/sidebar/sidebar.html
@@ -6,7 +6,7 @@
       <li class="menu-title">
         <a href="#"> Shortcut <span class="arrow"></span></a>
         <ul class="sub-menu" id="shortcut">
-          <li><a href="#/tactical">Dashboard</a></li>
+          <li><a href="#/dashboard">Dashboard</a></li>
           <li><a href="#/hosts">Hosts</a></li>
           <li><a href="#">Services</a></li>
           <li><a href="#">Networks parents</a></li>
diff --git a/app/components/tactical/tactical.html b/app/components/tactical/tactical.html
index 1595bfe..0bf9a08 100644
--- a/app/components/tactical/tactical.html
+++ b/app/components/tactical/tactical.html
@@ -1,6 +1,5 @@
 <div ng-app="adagios.tactical" ng-controller="TacticalCtrl" id="tactical" class="">
 
-
     <h2>Tactical Overview</h2>
 
     <div id="summary" class="jumbotron">
@@ -19,6 +18,4 @@
 
     </div>
 
-    <adg-table cells="host,service_check,duration,last_check"></adg-table>
-
 </div>
diff --git a/app/components/tactical/tactical.js b/app/components/tactical/tactical.js
index 55f551d..30c817b 100644
--- a/app/components/tactical/tactical.js
+++ b/app/components/tactical/tactical.js
@@ -1,19 +1,11 @@
 'use strict';
 
-angular.module('adagios.tactical', ['ngRoute',
-                                    'adagios.tactical.status_overview',
+angular.module('adagios.tactical', ['adagios.tactical.status_overview',
                                     'adagios.tactical.current_health',
                                     'adagios.tactical.top_alert_producers',
                                     'adagios.table'
                                     ])
 
-    .config(['$routeProvider', function ($routeProvider) {
-        $routeProvider.when('/tactical', {
-            templateUrl: 'components/tactical/tactical.html',
-            controller: 'TacticalCtrl'
-        });
-    }])
-
     .controller('TacticalCtrl', ['$scope', '$http', function ($scope, $http) {
         return;
     }]);
diff --git a/app/dashboard/dashboard.html b/app/dashboard/dashboard.html
new file mode 100644
index 0000000..aec222e
--- /dev/null
+++ b/app/dashboard/dashboard.html
@@ -0,0 +1,23 @@
+<div ng-app="adagios.tactical" ng-controller="DashboardCtrl" id="tactical" class="">
+
+    <h2>Tactical Overview</h2>
+
+    <div id="summary" class="jumbotron">
+
+      <div class="row">
+        <div class="col-md-4">
+          <adg-status-overview></adg-status-overview>
+        </div>
+        <div class="col-md-4">
+          <adg-current-health></adg-current-health>
+        </div>
+        <div class="col-md-4">
+          <adg-top-alert-producers></adg-top-alert-producers>
+        </div>
+      </div>
+
+    </div>
+
+    <adg-table cells="host,service_check,duration,last_check"></adg-table>
+
+</div>
diff --git a/app/dashboard/dashboard.js b/app/dashboard/dashboard.js
new file mode 100644
index 0000000..3d258df
--- /dev/null
+++ b/app/dashboard/dashboard.js
@@ -0,0 +1,19 @@
+'use strict';
+
+angular.module('adagios.tactical', ['ngRoute',
+                                    'adagios.tactical.status_overview',
+                                    'adagios.tactical.current_health',
+                                    'adagios.tactical.top_alert_producers',
+                                    'adagios.table'
+                                    ])
+
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/dashboard', {
+            templateUrl: 'dashboard/dashboard.html',
+            controller: 'DashboardCtrl'
+        });
+    }])
+
+    .controller('DashboardCtrl', ['$scope', '$http', function ($scope, $http) {
+        return;
+    }]);
diff --git a/app/index.html b/app/index.html
index 663befd..5078722 100644
--- a/app/index.html
+++ b/app/index.html
@@ -43,6 +43,9 @@
 
 	  <script src="bower_components/html5-boilerplate/js/vendor/modernizr-2.6.2.min.js"></script>    
 	  <script src="bower_components/moment/moment.js"></script>    
+
+    <!-- VIEWS -->
+    <script src="dashboard/dashboard.js"></script>
   </head>
 
   <body class="layout color-scheme--dark">