diff --git a/v2/assets/css/chart.css b/v2/assets/css/chart.css
index b053dd2..49cd3e5 100644
--- a/v2/assets/css/chart.css
+++ b/v2/assets/css/chart.css
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* circle packing */
 
 text {
@@ -109,4 +110,4 @@ ganttchart .bar-successful {
 ganttchart .bar-unknown {
     fill: #33b5e5; /*blue*/
     /*fill: #B8B8B8; grey*/
-}
\ No newline at end of file
+}
diff --git a/v2/dash/config.js b/v2/dash/config.js
index fabe315..aa98083 100644
--- a/v2/dash/config.js
+++ b/v2/dash/config.js
@@ -13,7 +13,7 @@ function (Settings) {
     datasources: {
       metricsdb: {
         type: 'kairosdb',
-        url: "http://os-monit-serv:8080",
+        url: "http://metrics:8080",
         default: true
       },
 /*
@@ -36,6 +36,7 @@ function (Settings) {
     // used for storing and loading dashboards, optional
     // For Basic authentication use: http://username:password@domain.com:9200
     elasticsearch: "http://"+window.location.hostname+":9200",
+    // elasticsearch: "http://elasticsearch:9200",
 
     // default start dashboard
     default_route: '/dashboard/file/default.json',
@@ -64,7 +65,9 @@ function (Settings) {
 
     // Add your own custom pannels
     plugins: {
-      panels: []
+      panels: [
+
+      ]
     }
 
   });
diff --git a/v2/data/monitoring_nav.json b/v2/data/monitoring_nav.json
index a5ec16e..021827a 100644
--- a/v2/data/monitoring_nav.json
+++ b/v2/data/monitoring_nav.json
@@ -25,7 +25,7 @@
 }, {
     "name": "cluster.monitoring.charts",
     "url": "/charts",
-    "display": "Chart Grid",
+    "display": "Dashboards",
     "controller": "",
     "templateUrl": ""
 }]
diff --git a/v2/src/app/monitoring/alerts.tpl.html b/v2/src/app/monitoring/alerts.tpl.html
index 267ba57..a19d24e 100644
--- a/v2/src/app/monitoring/alerts.tpl.html
+++ b/v2/src/app/monitoring/alerts.tpl.html
@@ -6,7 +6,10 @@
 
 <div class="col-lg-10" ng-controller="alertsCtrl" style="width: 100%;">
     <tabset style="width: 100%;">
-        <tab heading="Alerts">
+        <tab>
+            <tab-heading>
+                <i class="ace-icon fa fa-bell"></i>Alarms
+            </tab-heading>
             <form class="form-inline">
                 <select class="form-control" ng-model="renderer" ng-change="rendererChanged(renderer)">
                     <option ng-repeat="render in renderers" value="{{render}}">{{render}}</option>
@@ -20,12 +23,6 @@
                 <ganttchart data="alerts" hosts="hosts"></ganttchart>
             </div>
         </tab>
-        <tab>
-            <tab-heading>
-                <i class="ace-icon fa fa-bell"></i>Alarms
-            </tab-heading>
-            Alarms - TBD
-        </tab>
         <tab>
             <tab-heading>
                 Event Viewer
diff --git a/v2/src/app/monitoring/monitoring.js b/v2/src/app/monitoring/monitoring.js
index 5b44668..dbf1a12 100644
--- a/v2/src/app/monitoring/monitoring.js
+++ b/v2/src/app/monitoring/monitoring.js
@@ -413,19 +413,22 @@ angular.module('compass.monitoring', [
         "state": "",
         "alerts": [{
             "type": "critical",
-            "name": "host-1"
+            "name": "os-keystone"
         }, {
             "type": "warning",
-            "name": "host-22",
+            "name": "os-mq",
         }, {
             "type": "warning",
-            "name": "host-13"
+            "name": "os-db-node"
         }, {
             "type": "critical",
-            "name": "host-20"
+            "name": "os-network"
         }, {
             "type": "warning",
-            "name": "host-20"
+            "name": "os-keystone"
+        }, {
+            "type": "warning",
+            "name": "os-compute2"
         }]
     }, {
         "name": "compute",
@@ -475,21 +478,44 @@ angular.module('compass.monitoring', [
                 "name": "os-compute1",
                 "state": "error",
                 "children": [{
-                    "name": "service1"
+                    "name": "nova-compute",
+                    "state": "ok"
                 }, {
-                    "name": "service2"
+                    "name": "nova-api-metadata",
                 }, {
-                    "name": "service3"
+                    "name": "nova-consoleauth",
+                    "state": "ok"
                 }, {
-                    "name": "service4"
+                    "name": "ceilometer-agent-compute",
+                    "state": "ok"
+                }, {
+                    "name": "neutron-openvswitch-agent",
+                    "state": "ok"
+                }, {
+                    "name": "nova-novncproxy",
+                    "state": "ok"
                 }]
             }, {
                 "name": "os-compute2",
                 "state": "error",
                 "children": [{
-                    "name": "service1"
+                    "name": "nova-compute",
+                    "state": "ok"
                 }, {
-                    "name": "service2"
+                    "name": "nova-api-metadata",
+                    "state": "ok"
+                }, {
+                    "name": "nova-consoleauth",
+                    "state": "ok"
+                }, {
+                    "name": "ceilometer-agent-compute",
+                    "state": "ok"
+                }, {
+                    "name": "neutron-openvswitch-agent",
+                    "state": "ok"
+                }, {
+                    "name": "nova-novncproxy",
+                    "state": "ok"
                 }]
             }]
         }, {
@@ -499,34 +525,67 @@ angular.module('compass.monitoring', [
                 "name": "os-controller",
                 "state": "ok",
                 "children": [{
-                    "name": "service5",
+                    "name": "glance-api",
+                    "state": "ok"
+                }, {
+                    "name": "glance-registry",
+                    "state": "ok"
+                }, {
+                    "name": "heat-api",
+                    "state": "ok"
+                }, {
+                    "name": "heat-api-cfn",
+                    "state": "ok"
+                }, {
+                    "name": "heat-engine",
+                    "state": "ok"
+                }, {
+                    "name": "keystone-all",
+                    "state": "ok"
+                }, {
+                    "name": "neutron-server",
+                    "state": "ok"
+                }, {
+                    "name": "nova-api",
+                    "state": "ok"
+                }, {
+                    "name": "nova-cert",
+                    "state": "ok"
+                }, {
+                    "name": "nova-conductor",
+                    "state": "ok"
+                }, {
+                    "name": "nova-consoleauth",
+                    "state": "ok"
+                }, {
+                    "name": "nova-novncproxy",
+                    "state": "ok"
+                }, {
+                    "name": "nova-objectstore",
+                    "state": "ok"
+                }, {
+                    "name": "nova-scheduler",
+                    "state": "ok"
+                }, {
+                    "name": "ceilometer-api",
+                    "state": "ok"
+                }, {
+                    "name": "ceilometer-agent-central",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "cpu"
                     }, {
-                        "name": "metric2"
+                        "name": "memory"
                     }]
                 }, {
-                    "name": "service6",
+                    "name": "ceilometer-collector",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "process count"
                     }, {
-                        "name": "metric2"
+                        "name": "load"
                     }]
                 }]
-            }, {
-                "name": "host8",
-                "state": "ok",
-                "children": [{
-                    "name": "service7",
-                    "state": "ok",
-                    "children": [{
-                        "name": "metric1"
-                    }]
-                }, {
-                    "name": "service8"
-                }]
             }]
         }, {
             "name": "network",
@@ -535,20 +594,20 @@ angular.module('compass.monitoring', [
                 "name": "os-network",
                 "state": "warning",
                 "children": [{
-                    "name": "service5",
+                    "name": "openvswitch",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "interface tx"
                     }, {
-                        "name": "metric2"
+                        "name": "interface xx"
                     }]
                 }, {
-                    "name": "service6",
+                    "name": "neutron",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "process status"
                     }, {
-                        "name": "metric2"
+                        "name": "memory"
                     }]
                 }]
             }]
@@ -559,21 +618,27 @@ angular.module('compass.monitoring', [
                 "name": "os-image",
                 "state": "warning",
                 "children": [{
-                    "name": "service5",
+                    "name": "glance",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "image count"
                     }, {
-                        "name": "metric2"
+                        "name": "process status"
                     }]
                 }, {
-                    "name": "service6",
+                    "name": "cinder-volume",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "storage capacity"
                     }, {
-                        "name": "metric2"
+                        "name": "process status"
                     }]
+                }, {
+                    "name": "cinder-api",
+                    "state": "ok"
+                }, {
+                    "name": "cinder-scheduler",
+                    "state": "ok"
                 }]
             }]
         }, {
@@ -582,20 +647,20 @@ angular.module('compass.monitoring', [
             "children": [{
                 "name": "os-db-node",
                 "children": [{
-                    "name": "service5",
+                    "name": "mysql",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "queries per second"
                     }, {
-                        "name": "metric2"
+                        "name": "response time"
                     }]
                 }, {
-                    "name": "service6",
+                    "name": "redis",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "queries per second"
                     }, {
-                        "name": "metric2"
+                        "name": "response time"
                     }]
                 }]
             }]
@@ -605,20 +670,20 @@ angular.module('compass.monitoring', [
             "children": [{
                 "name": "os-mq",
                 "children": [{
-                    "name": "service5",
+                    "name": "rabbit-mq",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "process count"
                     }, {
-                        "name": "metric2"
+                        "name": "messages tx"
                     }]
                 }, {
-                    "name": "service6",
+                    "name": "mysql",
                     "state": "ok",
                     "children": [{
-                        "name": "metric1"
+                        "name": "status"
                     }, {
-                        "name": "metric2"
+                        "name": "connection"
                     }]
                 }]
             }]