diff --git a/app/components/live/surveil.js b/app/components/live/surveil.js
index d0f74ef..10e2135 100644
--- a/app/components/live/surveil.js
+++ b/app/components/live/surveil.js
@@ -48,7 +48,7 @@ angular.module('bansho.live', [])
                     filters = {
                         'is': {
                             'host_name': [hostName],
-                            'description': [description]
+                            'service_description': [description]
                         }
                     };
 
@@ -70,7 +70,7 @@ angular.module('bansho.live', [])
                     .error(function () {
                         throw new Error('getService : POST Request failed');
                     });
-            }
+            };
 
             var getHostOpenProblems = function () {
                 var fields = ['state'],
diff --git a/app/components/service/service.html b/app/components/service/service.html
index 3bda5b6..79db5ab 100644
--- a/app/components/service/service.html
+++ b/app/components/service/service.html
@@ -1,8 +1,10 @@
 <article ng-controller="ServiceCtrl">
-  <h2>Service</h2>
-  <section class="main__content tabpanel" ng-if="data">
-    <bansho-service-main></bansho-service-main>
-    <bansho-service-info></bansho-service-info>
-    <bansho-service-metrics></bansho-service-metrics>
+  <section class="main__content tabpanel">
+    <h1>{{service.service_description}}</h1>
+    <bansho-service-main service='service'></bansho-service-main>
+    <h2> Info</h2>
+    <bansho-service-info service='service'></bansho-service-info>
+    <h2> Metrics</h2>
+    <bansho-service-metrics service='service'></bansho-service-metrics>
   </section>
 </article>
diff --git a/app/components/service/service.js b/app/components/service/service.js
index 0e5f937..a148313 100644
--- a/app/components/service/service.js
+++ b/app/components/service/service.js
@@ -13,7 +13,7 @@ angular.module('bansho.service', ['bansho.live',
                 description = serviceConfig.description;
 
             backendClient.getService(hostName, description).success(function (data) {
-                $scope.data = data;
+                $scope.service = data[0];
             });
         }])
 
diff --git a/app/components/service/service_info/service_info.html b/app/components/service/service_info/service_info.html
index b502e55..5157169 100644
--- a/app/components/service/service_info/service_info.html
+++ b/app/components/service/service_info/service_info.html
@@ -1,38 +1,5 @@
 <div ng-controller="ServiceInfoCtrl">
-  <table>
-    <tbody>
-      <tr>
-        <td>Handled :</td>
-        <td>{{data.0.handled}}</td>
-      </tr>
-      <tr>
-        <td>Tags :</td>
-        <td>{{data.0.tags}}</td>
-      </tr>
-      <tr>
-        <td>Tags :</td>
-        <td>{{data.0.tags}}</td>
-      </tr>
-      <tr>
-        <td>Backend :</td>
-        <td>{{data.0.backend}}</td>
-      </tr>
-      <tr>
-        <td>Last check :</td>
-        <td>{{data.0.last_check|timeElapsed}}</td>
-      </tr>
-      <tr>
-        <td>Last state change :</td>
-        <td>{{data.0.last_state_change|timeElapsed}}</td>
-      </tr>
-      <tr>
-        <td>Tags :</td>
-        <td>{{data.0.tags}}</td>
-      </tr>
-      <tr>
-        <td>Acknowledged :</td>
-        <td>{{acknowledged}}</td>
-      </tr>
-    </tbody>
-  </table>
+  <p>Last check: {{service.last_check|timeElapsed}}</p>
+  <p>Last state change: {{service.last_state_change|timeElapsed}}</p>
+  <p>Acknowledged: {{isAcknowledged}}</p>
 </div>
diff --git a/app/components/service/service_info/service_info.js b/app/components/service/service_info/service_info.js
index 9241e2c..8c7be4c 100644
--- a/app/components/service/service_info/service_info.js
+++ b/app/components/service/service_info/service_info.js
@@ -3,12 +3,15 @@
 angular.module('bansho.service.info', [])
 
     .controller('ServiceInfoCtrl', ['$scope', function ($scope) {
-        $scope.acknowledged = $scope.data[0].acknowledged === "1" ? "Yes" : "No";
+        $scope.isAcknowledged = $scope.acknowledged === "1" ? "Yes" : "No";
     }])
 
     .directive('banshoServiceInfo', function () {
         return {
             restrict: 'E',
+            scope: {
+              service: '=service'
+            },
             templateUrl: 'components/service/service_info/service_info.html'
         };
     });
diff --git a/app/components/service/service_main/service_main.html b/app/components/service/service_main/service_main.html
index 91a9c4c..d1bca7f 100644
--- a/app/components/service/service_main/service_main.html
+++ b/app/components/service/service_main/service_main.html
@@ -1,10 +1,6 @@
 <div ng-controller="ServiceMainCtrl">
-  <ul>
-    <li>{{data.0.host_name}}</li>
-    <li>{{data.0.description}}</li>
-    <li>{{data.0.state}}</li>
-    <li>{{data.0.plugin_output}}</li>
-    <li>{{data.0.backend}}</li>
-    <li>{{data.0.status}}</li>
-  </ul>
+  <p>Description: {{service.description}}</p>
+  <p>Host Name: {{service.host_name}}</p>
+  <p>Current state: <bansho-table-state-icon service-state="{{service.state}}"></bansho-table-state-icon>{{service.state}}
+  <p>Live plugin output: {{service.plugin_output}}</p>
 </div>
diff --git a/app/components/service/service_main/service_main.js b/app/components/service/service_main/service_main.js
index 3fb2a3e..5548a3c 100644
--- a/app/components/service/service_main/service_main.js
+++ b/app/components/service/service_main/service_main.js
@@ -9,6 +9,11 @@ angular.module('bansho.service.main', [])
     .directive('banshoServiceMain', function () {
         return {
             restrict: 'E',
-            templateUrl: 'components/service/service_main/service_main.html'
+            scope: {
+              service: '=service'
+            },
+            templateUrl: 'components/service/service_main/service_main.html',
+            controller: 'ServiceMainCtrl'
+
         };
     });
diff --git a/app/components/service/service_metrics/service_metrics.js b/app/components/service/service_metrics/service_metrics.js
index bdadbd9..489cdbc 100644
--- a/app/components/service/service_metrics/service_metrics.js
+++ b/app/components/service/service_metrics/service_metrics.js
@@ -9,6 +9,9 @@ angular.module('bansho.service.metrics', [])
     .directive('banshoServiceMetrics', function () {
         return {
             restrict: 'E',
+            scope: {
+              service: '=service'
+            },
             templateUrl: 'components/service/service_metrics/service_metrics.html'
         };
     });
diff --git a/app/components/table/cell_host/cell_host.css b/app/components/table/cell_host/cell_host.css
index 0b10c82..de20a20 100644
--- a/app/components/table/cell_host/cell_host.css
+++ b/app/components/table/cell_host/cell_host.css
@@ -27,7 +27,7 @@
   margin: 0px;
   line-height: 35px;
   cursor: pointer;
-  /*    
+  /*
     .collapsed{
        .arrow:before{
                  font-family: FontAwesome;
@@ -143,4 +143,3 @@ body {
   margin: 0px;
   padding: 0px;
 }
-
diff --git a/app/components/table/cell_service_check/cell_service_check.css b/app/components/table/cell_service_check/cell_service_check.css
index 0b10c82..de20a20 100644
--- a/app/components/table/cell_service_check/cell_service_check.css
+++ b/app/components/table/cell_service_check/cell_service_check.css
@@ -27,7 +27,7 @@
   margin: 0px;
   line-height: 35px;
   cursor: pointer;
-  /*    
+  /*
     .collapsed{
        .arrow:before{
                  font-family: FontAwesome;
@@ -143,4 +143,3 @@ body {
   margin: 0px;
   padding: 0px;
 }
-