diff --git a/app/components/live/get_services.js b/app/components/live/get_services.js
index 3375a8d..8d4da49 100644
--- a/app/components/live/get_services.js
+++ b/app/components/live/get_services.js
@@ -37,7 +37,7 @@ angular.module('adagios.live')
 
                 return $http.get('/rest/status/json/' + apiName + '/?fields=' + columns + filtersQuery)
                     .error(function (data, status, headers, config) {
-                        console.error('getServices : GET Request failed');
+                        throw new Error('getServices : GET Request failed');
                     });
             };
         }]);
diff --git a/app/components/table/cell_duration/cell_duration.html b/app/components/table/cell_duration/cell_duration.html
index ad877fa..9e0a6b4 100644
--- a/app/components/table/cell_duration/cell_duration.html
+++ b/app/components/table/cell_duration/cell_duration.html
@@ -1 +1 @@
-<div class="data-table__duration">{{entry.last_state_change | timeElapsed}}</div>
+<td class="data-table__duration">{{entry.last_state_change | timeElapsed}}</td>
diff --git a/app/components/table/cell_host/cell_host.html b/app/components/table/cell_host/cell_host.html
index a63408f..9ffffe7 100644
--- a/app/components/table/cell_host/cell_host.html
+++ b/app/components/table/cell_host/cell_host.html
@@ -1,3 +1,3 @@
-<span class="data-table__host {{state}}" ng-controller="CellHostCtrl">
+<td class="data-table__{{ cell }} {{state}}" ng-controller="CellHostCtrl">
   <a class="data-table__data" href="#">{{entry.host_name}}</a>
-</span>
+</td>
diff --git a/app/components/table/cell_host/cell_host.js b/app/components/table/cell_host/cell_host.js
index 0497256..5ec23c2 100644
--- a/app/components/table/cell_host/cell_host.js
+++ b/app/components/table/cell_host/cell_host.js
@@ -14,4 +14,5 @@ angular.module('adagios.table.cell_host', ['adagios.table'])
 
     .run(['tableConfig', function (tableConfig) {
         tableConfig.cellToFieldsMap.host = [ 'host_state', 'host_name' ];
+
     }]);
diff --git a/app/components/table/cell_host_address/cell_host_address.html b/app/components/table/cell_host_address/cell_host_address.html
index 6c161f0..6e4bf83 100644
--- a/app/components/table/cell_host_address/cell_host_address.html
+++ b/app/components/table/cell_host_address/cell_host_address.html
@@ -1 +1 @@
-<div ng-controller="CellHostAddressCtrl">{{entry.address}}</div>
+<td ng-controller="CellHostAddressCtrl">{{entry.address}}</td>
diff --git a/app/components/table/cell_host_status/cell_host_status.html b/app/components/table/cell_host_status/cell_host_status.html
index 8da8ea2..a7f2ed4 100644
--- a/app/components/table/cell_host_status/cell_host_status.html
+++ b/app/components/table/cell_host_status/cell_host_status.html
@@ -1 +1 @@
-<div class="{{alert_level}}" ng-controller="CellHostStatusCtrl">{{entry.host_status}}</div>
+<td class="{{alert_level}}" ng-controller="CellHostStatusCtrl">{{entry.host_status}}</td>
diff --git a/app/components/table/cell_hosts_host/cell_hosts_host.html b/app/components/table/cell_hosts_host/cell_hosts_host.html
index c7f91ba..5820cae 100644
--- a/app/components/table/cell_hosts_host/cell_hosts_host.html
+++ b/app/components/table/cell_hosts_host/cell_hosts_host.html
@@ -1 +1 @@
-<div ng-controller="CellHostsHostCtrl">{{entry.name}}</div>
+<td ng-controller="CellHostsHostCtrl">{{entry.name}}</td>
diff --git a/app/components/table/cell_last_check/cell_last_check.html b/app/components/table/cell_last_check/cell_last_check.html
index 55add3f..5436017 100644
--- a/app/components/table/cell_last_check/cell_last_check.html
+++ b/app/components/table/cell_last_check/cell_last_check.html
@@ -1 +1 @@
-<div class="data-table__lastcheck">{{entry.last_check * 1000 | date: medium}}</div>
+<td class="data-table__lastcheck">{{entry.last_check * 1000 | date: medium}}</td>
diff --git a/app/components/table/cell_service_check/cell_service_check.html b/app/components/table/cell_service_check/cell_service_check.html
index a5f501c..793dc91 100644
--- a/app/components/table/cell_service_check/cell_service_check.html
+++ b/app/components/table/cell_service_check/cell_service_check.html
@@ -1,6 +1,6 @@
-<div class="data-table__service {{state}}" ng-controller="CellServiceCheckCtrl">
+<td class="data-table__service {{state}}" ng-controller="CellServiceCheckCtrl">
   <dl class="data-table__data">
     <dt class="data-table__service__name">{{entry.description}}</dt>
     <dd class="data-table__service__summary">{{entry.plugin_output}}</dd>
   </dl>
-</div>
+</td>
diff --git a/app/components/table/table.html b/app/components/table/table.html
index 493421b..136fcbb 100644
--- a/app/components/table/table.html
+++ b/app/components/table/table.html
@@ -12,8 +12,7 @@
   <tbody class="" ng-repeat="entry in entries">
     <tr>
       <td><input type="checkbox"></td>
-      <td class="data-table__{{ cell }}" adg-cell type="{{cell}}" ng-repeat="cell in cellsName">
-      </td>
+      <td adg-cell cell-name="{{cell}}" ng-repeat="cell in cellsName"></td>
     </tr>
   </tbody>
 
diff --git a/app/components/table/table.js b/app/components/table/table.js
index 440c14b..32488cd 100644
--- a/app/components/table/table.js
+++ b/app/components/table/table.js
@@ -42,41 +42,55 @@ angular.module('adagios.table', ['adagios.live',
             });
     }])
 
-    .directive('adgTable', ['tableConfig', function (tableConfig) {
+    .directive('adgTable', ['$http', '$compile', 'tableConfig',  function ($http, $compile, tableConfig) {
         return {
             restrict: 'E',
-            link: function (scope, element, attrs) {
-                scope.generateTable = function () {
+            compile: function () {
+                return function (scope, element, attrs) {
 
-                    if (!!attrs.cellsText && !!attrs.cellsName && !!attrs.apiName) {
-                        tableConfig.cells.text = attrs.cellsText.split(',');
-                        tableConfig.cells.name = attrs.cellsName.split(',');
-                        tableConfig.apiName = attrs.apiName;
-
-                        if (!!attrs.filters) {
-                            tableConfig.filters = attrs.filters;
-                        }
-
-                        return 'components/table/table.html';
+                    if (!attrs.cellsText || !attrs.cellsName || !attrs.apiName) {
+                        throw new Error('<adg-table> "cells-text", "cells-name" and "api-name" attributes must be defined');
                     }
-                    console.error('<adg-table> "cells" and "api-name" attributes must be defined');
+
+                    tableConfig.cells.text = attrs.cellsText.split(',');
+                    tableConfig.cells.name = attrs.cellsName.split(',');
+                    tableConfig.apiName = attrs.apiName;
+
+                    if (!!attrs.filters) {
+                        tableConfig.filters = attrs.filters;
+                    }
+
+                    var template = 'components/table/table.html';
+
+                    $http.get(template, { cache: true })
+                        .success(function (data) {
+                            var elem = $compile(data)(scope);
+                            element.append(elem);
+                        });
                 };
-            },
-            template: '<div ng-include="generateTable()"></div>'
+            }
         };
     }])
 
-    .directive('adgCell', function () {
+    .directive('adgCell', function ($http, $compile, $templateCache) {
+
         return {
             restrict: 'A',
-            link: function (scope, element, attrs) {
-                scope.getTemplateUrl = function () {
-                    if (!!attrs.type) {
-                        return 'components/table/cell_' + attrs.type + '/cell_' + attrs.type + '.html';
+            compile: function () {
+                return function (scope, element, attrs) {
+                    if (!attrs.cellName) {
+                        throw new Error('<adg-cell> "cell-name" attribute must be defined');
                     }
-                    console.error('<adg-cell> "type" attribute is undefined');
+
+                    var template = 'components/table/cell_' + attrs.cellName + '/cell_' + attrs.cellName + '.html';
+
+                    $http.get(template, { cache: true })
+                        .success(function (data) {
+                            var td = $compile(data)(scope);
+                            // HACK : replaceWith is a necessary hack because <tr> only accepts <td> as a child
+                            element.replaceWith(td);
+                        });
                 };
-            },
-            template: '<div ng-include="getTemplateUrl()"></div>'
+            }
         };
     });
diff --git a/app/dashboard/dashboard.html b/app/dashboard/dashboard.html
index 01f7165..2727493 100644
--- a/app/dashboard/dashboard.html
+++ b/app/dashboard/dashboard.html
@@ -139,7 +139,7 @@
         <adg-table cells-text="{{dashboardCellsText}}"
                    cells-name="{{dashboardCellsName}}" 
                    api-name="{{dashboardApiName}}" 
-                   filters="{{dashboardFilters}}">
+                   filters="{{dashboardFilters}}"></adg-table>
 
       </div>
     </div>
diff --git a/app/hosts/hosts.html b/app/hosts/hosts.html
index 9ca9bf3..5e38764 100644
--- a/app/hosts/hosts.html
+++ b/app/hosts/hosts.html
@@ -13,7 +13,7 @@
     <adg-table cells-name="{{hostsCellsName}}"
                cells-text="{{hostsCellsText}}"
                api-name="{{hostsApiName}}" 
-               filters="{{hostsFilters}}">
+               filters="{{hostsFilters}}"></adg-table>
 
   </section>
 </article>
diff --git a/app/services/services.html b/app/services/services.html
index c2061f5..6e26f0e 100644
--- a/app/services/services.html
+++ b/app/services/services.html
@@ -13,7 +13,7 @@
     <adg-table cells-name="{{servicesCellsName}}"
                cells-text="{{servicesCellsText}}" 
                api-name="{{servicesApiName}}" 
-               filters="{{servicesFilters}}">
+               filters="{{servicesFilters}}"></adg-table>
 
   </section>
 </article>