diff --git a/panels/dashcontrol/module.js b/panels/dashcontrol/module.js
index 4b06e3a4b4790..71b3d075ea890 100644
--- a/panels/dashcontrol/module.js
+++ b/panels/dashcontrol/module.js
@@ -32,7 +32,6 @@ angular.module('kibana.dashcontrol', [])
     // Long ugly if statement for figuring out which dashboard to load on init
     // If there is no dashboard defined, find one
     if(_.isUndefined($scope.dashboards)) {
-      console.log('ok, defining')
       // First check the URL for a path to a dashboard
       if(!(_.isUndefined($routeParams.type)) && !(_.isUndefined($routeParams.id))) {
         var _type = $routeParams.type;
diff --git a/panels/histogram/module.html b/panels/histogram/module.html
index 743260ca7c8c1..ee65f24e2b363 100644
--- a/panels/histogram/module.html
+++ b/panels/histogram/module.html
@@ -1,3 +1,3 @@
-<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{row.height}}">
-  <div histogram params="{{panel}}" style="height:{{panel.height}};position:relative"></div>
+<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{panel.height || row.height}}">
+  <div histogram params="{{panel}}" style="height:{{panel.height || row.height}};position:relative"></div>
 </kibana-panel>         
\ No newline at end of file
diff --git a/panels/histogram/module.js b/panels/histogram/module.js
index 493a470ab637f..ae3fcfe69a2fd 100644
--- a/panels/histogram/module.js
+++ b/panels/histogram/module.js
@@ -7,7 +7,6 @@ angular.module('kibana.histogram', [])
     interval: secondsToHms(calculate_interval($scope.from,$scope.to,40,0)/1000),
     show    : ['bars','y-axis','x-axis','legend'],
     fill    : 3,
-    height  : $scope.panel.height || $scope.row.height,
     timezone: 'browser', // browser, utc or a standard timezone
     group   : "default",
   }
diff --git a/panels/map/module.html b/panels/map/module.html
index 7ca54ab8b968e..5f9537b8ea1cc 100644
--- a/panels/map/module.html
+++ b/panels/map/module.html
@@ -1,3 +1,3 @@
 <kibana-panel ng-controller='map' ng-init="init()">
-  <div map params="{{panel}}" style="height:{{panel.height}}"></div>
+  <div map params="{{panel}}" style="height:{{panel.height || row.height}}"></div>
 </kibana-panel>
\ No newline at end of file
diff --git a/panels/map/module.js b/panels/map/module.js
index f43839fd55f25..477381f9a021f 100644
--- a/panels/map/module.js
+++ b/panels/map/module.js
@@ -8,7 +8,6 @@ angular.module('kibana.map', [])
     colors  : ['#C8EEFF', '#0071A4'],
     size    : 100,
     exclude : [],
-    height  : $scope.panel.height || $scope.row.height,
     group   : "default",
   }
   _.defaults($scope.panel,_d)
diff --git a/panels/pie/module.html b/panels/pie/module.html
index 38bda51a41c7e..ed7782c2e57c8 100644
--- a/panels/pie/module.html
+++ b/panels/pie/module.html
@@ -1,3 +1,3 @@
 <kibana-panel ng-controller='pie' ng-init="init()">
-  <div pie params="{{panel}}" style="height:{{panel.height}};position:relative"></div>
+  <div pie params="{{panel}}" style="height:{{panel.height || row.height}};position:relative"></div>
 </kibana-panel>         
\ No newline at end of file
diff --git a/panels/pie/module.js b/panels/pie/module.js
index 56bc4402301b6..4ba8ef05d5917 100644
--- a/panels/pie/module.js
+++ b/panels/pie/module.js
@@ -4,7 +4,6 @@ angular.module('kibana.pie', [])
   // Set and populate defaults
   var _d = {
     query   : { field:"_all", query:"*", goal: 1}, 
-    height  : $scope.panel.height || $scope.row.height,
     size    : 10,
     exclude : [],
     donut   : false,
diff --git a/panels/table/module.html b/panels/table/module.html
index 37198de031e14..495a38d8e42a5 100644
--- a/panels/table/module.html
+++ b/panels/table/module.html
@@ -1,5 +1,5 @@
 <kibana-panel ng-controller='table' ng-init='init()'>
-  <div style="height:{{panel.height}};overflow-y:auto;overflow-x:auto">
+  <div style="height:{{panel.height || row.height}};overflow-y:auto;overflow-x:auto">
     <div class="row-fluid">
       <div class="span1 offset3" style="text-align:right">
         <i ng-click="panel.offset = 0;get_data();" ng-show="panel.offset > 0" class='icon-circle-arrow-left pointer'></i>
diff --git a/panels/table/module.js b/panels/table/module.js
index 558055378302a..24c6ee3970415 100644
--- a/panels/table/module.js
+++ b/panels/table/module.js
@@ -6,7 +6,6 @@ angular.module('kibana.table', [])
     query   : "*",
     size    : 100,
     offset  : 0,
-    height  : $scope.panel.height || $scope.row.height,
     sort    : ['@timestamp','desc'],
     group   : "default",
     style   : {},
diff --git a/panels/timepicker/editor.html b/panels/timepicker/editor.html
index 05195f3f0bedd..aca2a76b3b1c4 100644
--- a/panels/timepicker/editor.html
+++ b/panels/timepicker/editor.html
@@ -12,13 +12,16 @@ <h6>Time Field</h6>
     <h5>Index Settings</h5>
     <div ng-show="panel.timed_indices" class="row-fluid"> 
        <div class="span12">
-        <p>
-          Time stamped indices use a dated index pattern instead of pointing directly 
-          to one specific index. For example, to match the default logstash index pattern
-          you might use <code>"logstash-"yyyy.mm.dd</code>. The quotes around "logstash-"
-          are important as they instruct Kibana not to treat those letters as a pattern.
+        <p class="small">
+          Time stamped indices use your selected time range to create a list of 
+          indices that match a specified timestamp pattern. This can be very 
+          efficient for some data sets (eg, logs) For example, to match the 
+          default logstash index pattern you might use 
+          <code>"logstash-"yyyy.mm.dd</code>. The quotes around "logstash-" are 
+          important as they instruct Kibana not to treat those letters as a 
+          pattern.
         </p>
-        <p>
+        <p class="small">
           See <a href="http://blog.stevenlevithan.com/archives/date-time-format">http://blog.stevenlevithan.com/archives/date-time-format</a>
           for documentation on date formatting.
         </p>