diff --git a/js/controllers.js b/js/controllers.js
index dbbca95d5d8..0cc87f4319d 100644
--- a/js/controllers.js
+++ b/js/controllers.js
@@ -96,6 +96,10 @@ angular.module('kibana.controllers', [])
     }
   }
 
+  $scope.send_render = function() {
+    $scope.$broadcast('render');
+  }
+
   $scope.add_panel = function(row,panel) {
     console.log(panel)
     $scope.row.panels.push(panel);
diff --git a/js/services.js b/js/services.js
index c3730ec0b1e..6fce70abd08 100644
--- a/js/services.js
+++ b/js/services.js
@@ -21,6 +21,7 @@ angular.module('kibana.services', [])
   // addressed to the scope in question and runs the registered function if it
   // is.
   this.register = function(scope,type,fn) {
+    console.log('registered:' + type + " for " + scope.panel.title + " " + scope.$id)
     scope.$on(type,function(event,packet){
       var _id     = scope.$id;
       var _to     = packet.to;
diff --git a/panels/histogram/editor.html b/panels/histogram/editor.html
index 543260ce9e6..eddb63a6947 100644
--- a/panels/histogram/editor.html
+++ b/panels/histogram/editor.html
@@ -1,4 +1,4 @@
-<div class="row-fluid" ng-controller="histogram">  
+<div class="row-fluid">  
   <div class="span3">
     <form style="margin-bottom: 0px">
       <h6>Label</h6>
diff --git a/panels/histogram/module.html b/panels/histogram/module.html
index dd94a34b7a9..0d194ae2a71 100644
--- a/panels/histogram/module.html
+++ b/panels/histogram/module.html
@@ -1,3 +1,5 @@
 <kibana-panel ng-controller='histogram' style="height:{{row.height}}">
-  <div histogram params="{{panel}}" style="height:{{row.height}}"></div>
+  <div>
+    <div histogram params="{{panel}} clearfix" style="height:{{row.height}}"></div>
+  </div>
 </kibana-panel>         
\ No newline at end of file
diff --git a/panels/map/editor.html b/panels/map/editor.html
index 4f87e9f207e..ef8762d7f50 100644
--- a/panels/map/editor.html
+++ b/panels/map/editor.html
@@ -1,4 +1,4 @@
-  <div class="row-fluid" ng-controller="map">    
+  <div class="row-fluid">    
     <div class="span6">
       <form class="input-append">
         <h6>Query</h6>
diff --git a/panels/pie/editor.html b/panels/pie/editor.html
index ddcc94bf87b..291307eade7 100644
--- a/panels/pie/editor.html
+++ b/panels/pie/editor.html
@@ -1,4 +1,4 @@
-<div class="row-fluid" ng-switch="panel.mode" ng-controller="pie">
+<div class="row-fluid" ng-switch="panel.mode">
   <div ng-switch-when="terms">
     <div class="row-fluid">    
       <div class="span4">
diff --git a/panels/table/editor.html b/panels/table/editor.html
index 1b6a7dc4e28..dc70b3fba5f 100644
--- a/panels/table/editor.html
+++ b/panels/table/editor.html
@@ -1,4 +1,4 @@
-  <div class="row-fluid" ng-controller="table">    
+  <div class="row-fluid">    
     <div class="span12">
       <form class="input-append">
         <h5>Query</h5>
diff --git a/panels/text/editor.html b/panels/text/editor.html
index add058a6232..9ad880192fc 100644
--- a/panels/text/editor.html
+++ b/panels/text/editor.html
@@ -1,4 +1,4 @@
-<div ng-controller="text">
+<div>
   <label class="small">Font Size</label> <select class="input-mini" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
   <label class=small>Content</label>
   <textarea ng-model="panel.content" rows="6" style="width:95%"></textarea>
diff --git a/panels/timepicker/editor.html b/panels/timepicker/editor.html
index c66b1dda710..a00aeeea138 100644
--- a/panels/timepicker/editor.html
+++ b/panels/timepicker/editor.html
@@ -1,4 +1,4 @@
-  <div class="row-fluid" ng-controller="timepicker">    
+  <div class="row-fluid">    
     <div class="span3">
       <h6>Default Mode</h6>
       <select style="width:85%" ng-model="panel.mode" ng-options="f for f in ['relative','absolute','since']"></select>
diff --git a/partials/paneleditor.html b/partials/paneleditor.html
index f5389aa1648..fd1572f83cf 100644
--- a/partials/paneleditor.html
+++ b/partials/paneleditor.html
@@ -13,5 +13,5 @@
   
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-success" ng-click="dismiss()">Close</button>
+  <button type="button" class="btn btn-success" ng-click="dismiss();$broadcast('render')">Close</button>
 </div>
\ No newline at end of file
diff --git a/partials/roweditor.html b/partials/roweditor.html
index ceed6fa2252..866a5144f86 100644
--- a/partials/roweditor.html
+++ b/partials/roweditor.html
@@ -45,5 +45,5 @@
   </div>
 </div>
 <div class="modal-footer">
-  <button type="button" class="btn btn-success" ng-click="dismiss();reset_panel();">Close</button>
+  <button type="button" class="btn btn-success" ng-click="dismiss();reset_panel();send_render()">Close</button>
 </div>
\ No newline at end of file