diff --git a/config.js b/config.js
index 8d694bd8802..eb4678bd019 100644
--- a/config.js
+++ b/config.js
@@ -1,13 +1,13 @@
 /*
 
-elasticsearch:  URL to your elasticsearch server. You almost certainly don't 
+elasticsearch:  URL to your elasticsearch server. You almost certainly don't
                 want 'http://localhost:9200' here. Even if Kibana and ES are on
                 the same host
 kibana_index:   The default ES index to use for storing Kibana specific object
-                such as stored dashboards 
-modules:        Panel modules to load. In the future these will be inferred 
+                such as stored dashboards
+modules:        Panel modules to load. In the future these will be inferred
                 from your initial dashboard, though if you share dashboards you
-                will probably need to list them all here 
+                will probably need to list them all here
 
 If you need to configure the default dashboard, please see dashboards/default
 
@@ -17,9 +17,9 @@ var config = new Settings(
   // By default this will attempt to reach ES at the same host you have
   // elasticsearch installed on. You probably want to set it to the FQDN of your
   // elasticsearch host
-  elasticsearch:    "http://"+window.location.hostname+":9200",   
+  elasticsearch:    "http://"+window.location.hostname+":9200",
   // elasticsearch: 'http://localhost:9200',
-  kibana_index:     "kibana-int", 
+  kibana_index:     "kibana-int",
   modules:          ['histogram','map','pie','table','filtering',
                     'timepicker','text','fields','hits','dashcontrol',
                     'column','derivequeries','trends','bettermap','query',
diff --git a/panels/bettermap/editor.html b/panels/bettermap/editor.html
index 99d7d121e20..009ae2ac5fa 100644
--- a/panels/bettermap/editor.html
+++ b/panels/bettermap/editor.html
@@ -1,8 +1,8 @@
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span4">
       <form>
-        <h6>Coordinate Field <i class="icon-question-sign" bs-tooltip="'geoJSON array! Long,Lat NOT Lat,Long'"></i></h6>
-        <input  bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.field">
+        <h6>Coordinate Field <tip>geoJSON array! Long,Lat NOT Lat,Long</tip></h6>
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.field">
       </form>
     </div>
     <div class="span4">
@@ -11,7 +11,7 @@
         <input  bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.tooltip">
       </form>
     </div>
-    <div class="span2"><h6>Max Points</h6> 
+    <div class="span2"><h6>Max Points</h6>
       <input type="number" class="input-small" ng-model="panel.size">
     </div>
   </div>
diff --git a/panels/dashcontrol/editor.html b/panels/dashcontrol/editor.html
index 7c87e30d1d8..8faf8151c69 100644
--- a/panels/dashcontrol/editor.html
+++ b/panels/dashcontrol/editor.html
@@ -1,6 +1,6 @@
 <div>
   <h5>Allow saving to</h5>
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span2">
       <label class="small">Export</label><input type="checkbox" ng-model="panel.save.local" ng-checked="panel.save.local">
     </div>
@@ -8,14 +8,14 @@
       <label class="small">Defaults</label><input type="checkbox" ng-model="panel.save.default" ng-checked="panel.save.default">
     </div>
     <div class="span2">
-      <label class="small">Gist <i class="icon-question-sign" bs-tooltip="'Requires your domain to be OAUTH registered with Github'"></i></label><input type="checkbox" ng-model="panel.save.gist" ng-checked="panel.save.gist">
+      <label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github<tip></label><input type="checkbox" ng-model="panel.save.gist" ng-checked="panel.save.gist">
     </div>
     <div class="span2">
       <label class="small">Elasticsearch</label><input type="checkbox" ng-model="panel.save.elasticsearch" ng-checked="panel.save.elasticsearch">
     </div>
   </div>
   <h5>Allow loading from</h5>
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span2">
       <label class="small">Local file</label><input type="checkbox" ng-model="panel.load.local" ng-checked="panel.load.local">
     </div>
@@ -30,7 +30,7 @@
     </div>
   </div>
   <h5>Sharing</h5>
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span2" >
       <label class="small">Allow Sharing</label><input type="checkbox" ng-model="panel.temp" ng-checked="panel.temp">
     </div>
diff --git a/panels/histogram/editor.html b/panels/histogram/editor.html
index 8defd4a1db8..3cf132b6985 100644
--- a/panels/histogram/editor.html
+++ b/panels/histogram/editor.html
@@ -69,4 +69,4 @@
       <label class="small">Display Query <tip>If an alias is set, it will be shown in the tooltip. If not, should it show the query?</tip></label>
       <input type="checkbox" ng-model="panel.tooltip.query_as_alias" />
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/panels/map/editor.html b/panels/map/editor.html
index f18b6962eaf..292788bf3b1 100644
--- a/panels/map/editor.html
+++ b/panels/map/editor.html
@@ -1,11 +1,11 @@
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span3">
       <form>
-        <h6>Field</h6>
-        <input  bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.field">
+        <h6>Field <tip>2 letter country or state code</tip></h6>
+        <input bs-typeahead="fields.list" type="text" class="input-small" ng-model="panel.field">
       </form>
     </div>
-    <div class="span1"><h6>Map</h6> 
+    <div class="span1"><h6>Map</h6>
       <select ng-change="$emit('render')" class="input-small" ng-model="panel.map" ng-options="f for f in ['world','europe','usa']"></select>
     </div>
   </div>
diff --git a/panels/table/editor.html b/panels/table/editor.html
index bf77984002a..c09d9f198b9 100644
--- a/panels/table/editor.html
+++ b/panels/table/editor.html
@@ -1,4 +1,4 @@
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span4">
       <form class="input-append">
         <h6>Add Column</h6>
@@ -11,7 +11,7 @@
       <span style="margin-left:3px" ng-click="toggle_field(field)" ng-repeat="field in $parent.panel.fields" class="label pointer remove">{{field}} </span>
     </div>
   </div>
-  <div class="row-fluid">    
+  <div class="row-fluid">
     <div class="span4">
       <form class="input-append">
         <h6>Add field</h6>
@@ -26,10 +26,10 @@
   </div>
   <h5>Options</h5>
   <div class="row-fluid">
-    <div class="span1"> 
+    <div class="span1">
       <h6>Header</h6><input type="checkbox" ng-model="panel.header" ng-checked="panel.header">
     </div>
-    <div class="span1"> 
+    <div class="span1">
       <h6>Sorting</h6><input type="checkbox" ng-model="panel.sortable" ng-checked="panel.sortable">
     </div>
     <div class="span3" style="white-space:nowrap" ng-show='panel.sortable'>
@@ -38,11 +38,11 @@
       <select ng-show="all_fields.length>0"style="width:85%" ng-model="panel.sort[0]" ng-options="f for f in all_fields"></select>
       <i ng-click="set_sort(panel.sort[0])" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
     </div>
-    <div class="span2"><h6>Font Size</h6> 
+    <div class="span2"><h6>Font Size</h6>
       <select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
     </div>
     <div class="span2">
-      <h6>Trim Factor <i class="icon-question-sign" bs-tooltip="'Trim fields to this long divided by # of rows'"></i></h6>
+      <h6>Trim Factor <tip>Trim fields to this long divided by # of rows</tip></h6>
       <input type="number" class="input-small" ng-model="panel.trimFactor">
     </div>
   </div>
\ No newline at end of file