diff --git a/src/app/panels/column/module.html b/src/app/panels/column/module.html
index 864ec84b315a4..a1c29956f548a 100644
--- a/src/app/panels/column/module.html
+++ b/src/app/panels/column/module.html
@@ -1,16 +1,11 @@
 <div ng-controller="column" ng-init="init();">
-  <!-- Panels -->
-  <div ng-repeat="(name, panel) in panel.panels" ng-hide="panel.height == '0px' || panel.hide" class="row-fluid panel" style="min-height:{{panel.height}}; position:relative">
-    <!-- Error Panel -->
-    <div class="row-fluid">
-      <div class="span12 alert alert-error panel-error" ng-hide="!panel.error">
-        <a class="close" ng-click="panel.error=false">&times;</a>
-        <i class="icon-exclamation-sign"></i> <strong>Oops!</strong> {{panel.error}}
-      </div>
-    </div>
-    <!-- Content Panel -->
-    <div class="row-fluid">
-      <kibana-panel type="panel.type"></kibana-panel>
-    </div>
+  <!-- All the panels in the column -->
+  <div
+    ng-repeat="(name, panel) in panel.panels|filter:isPanel"
+    ng-cloak ng-hide="panel.height == '0px' || panel.hide"
+    kibana-panel type='panel.type'
+    class="row-fluid panel"
+    style="min-height:{{panel.height}}; position:relative"
+    ng-model="row.panels">
   </div>
-</div>
\ No newline at end of file
+</div>