diff --git a/src/app/panels/dashcontrol/editor.html b/src/app/panels/dashcontrol/editor.html
index 8faf8151c69d0..43ab492179df0 100644
--- a/src/app/panels/dashcontrol/editor.html
+++ b/src/app/panels/dashcontrol/editor.html
@@ -8,7 +8,7 @@ <h5>Allow saving to</h5>
       <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 <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">
+      <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">
diff --git a/src/app/panels/fields/editor.html b/src/app/panels/fields/editor.html
index 42ddee0315e4c..0b3344255b1b2 100644
--- a/src/app/panels/fields/editor.html
+++ b/src/app/panels/fields/editor.html
@@ -1,10 +1,11 @@
   <div class="row-fluid">    
     <div class="span3"><h6>Popup Position</h6> 
-      <select class="input-small" ng-model="panel.micropanel_position" ng-options="f for f in ['top','right','bottom','left']" ng-change="reload_list();"></select></span>
+      <select class="input-small" ng-model="panel.micropanel_position" ng-options="f for f in ['top','right','bottom','left']" ng-change="reload_list();"></select>
     </div>
     <div class="span3"><h6>List Arrangement</h6> 
-      <select class="input-small" ng-model="panel.arrange" ng-options="f for f in ['horizontal','vertical']"></select></span>
+      <select class="input-small" ng-model="panel.arrange" ng-options="f for f in ['horizontal','vertical']"></select>
     </div>
     <div class="span3"><h6>Font Size</h6> 
-      <select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select></span>
-  </div>
+      <select class="input-small" ng-model="panel.style['font-size']" ng-options="f for f in ['6pt','7pt','8pt','9pt','10pt','12pt','14pt','16pt','18pt','20pt','24pt','28pt','32pt','36pt','42pt','48pt','52pt','60pt','72pt']"></select>
+    </div>
+  </div>
\ No newline at end of file
diff --git a/src/app/panels/goal/editor.html b/src/app/panels/goal/editor.html
index 0e76189e28b6f..52112684d3b96 100644
--- a/src/app/panels/goal/editor.html
+++ b/src/app/panels/goal/editor.html
@@ -23,7 +23,7 @@ <h5>View Options</h5>
       </div>
       <div class="editor-option">
         <label class="small">Legend</label>
-        <select class="input-small" ng-model="panel.legend" ng-options="f for f in ['above','below','none']"></select></span>
+        <select class="input-small" ng-model="panel.legend" ng-options="f for f in ['above','below','none']"></select>
       </div>
     </div>
 
diff --git a/src/app/panels/goal/module.html b/src/app/panels/goal/module.html
index ae4a3b80d6069..e9d4619884d9e 100644
--- a/src/app/panels/goal/module.html
+++ b/src/app/panels/goal/module.html
@@ -3,13 +3,13 @@
     .goal-label { pointer-events: none }
   </style>
   <div ng-show="panel.legend == 'above'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
-    <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
+    <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span>
   </div>
   <div style="clear:both"></div>
 
   <div goal params="{{panel}}" style="position:relative"></div>
 
   <div ng-show="panel.legend == 'below'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
-    <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
+    <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/histogram/styleEditor.html b/src/app/panels/histogram/styleEditor.html
index 874a22640b5ae..102523063610b 100644
--- a/src/app/panels/histogram/styleEditor.html
+++ b/src/app/panels/histogram/styleEditor.html
@@ -52,7 +52,7 @@ <h5>Multiple Series</h5>
 
 <div class="editor-row">
   <div class="section">
-    <h5>Header<h5>
+    <h5>Header</h5>
     <div class="editor-option">
       <label class="small">Zoom</label><input type="checkbox" ng-model="panel.zoomlinks" ng-checked="panel.zoomlinks" />
     </div>
@@ -61,7 +61,7 @@ <h5>Header<h5>
     </div>
   </div>
   <div class="section">
-    <h5>Legend<h5>
+    <h5>Legend</h5>
     <div class="editor-option">
       <label class="small">Legend</label><input type="checkbox" ng-model="panel.legend" ng-checked="panel.legend">
     </div>
@@ -74,7 +74,7 @@ <h5>Legend<h5>
   </div>
 
   <div class="section">
-    <h5>Grid<h5>
+    <h5>Grid</h5>
     <div class="editor-option">
       <label class="small">Min / <a href='' ng-click="panel.grid.min = _.toggle(panel.grid.min,null,0)">Auto <i class="icon-star" ng-show="_.isNull(panel.grid.min)"></i></a></label>
       <input type="number" class="input-small" ng-model="panel.grid.min"/>
diff --git a/src/app/panels/hits/editor.html b/src/app/panels/hits/editor.html
index 084631fca5b0e..3fa1d803256e8 100644
--- a/src/app/panels/hits/editor.html
+++ b/src/app/panels/hits/editor.html
@@ -2,19 +2,19 @@
   <div class="section">
     <div class="editor-option">
       <label class="small">Style</label>
-      <select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','list','total']"></select></span>
+      <select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','list','total']"></select>
     </div>
     <div class="editor-option" ng-show="panel.chart == 'total' || panel.chart == 'list'">
       <label class="small">Font Size</label>
-      <select class="input-mini" 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>
+      <select class="input-mini" 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>
     </div>
     <div class="editor-option" ng-show="panel.chart == 'bar' || panel.chart == 'pie'">
       <label class="small">Legend</label>
-      <select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select></span>
+      <select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select>
     </div>
     <div class="editor-option" ng-show="panel.chart != 'total' && panel.counter_pos != 'none'">
       <label class="small" >List Format</label>
-      <select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select></span>
+      <select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select>
     </div>
     <div class="editor-option" ng-show="panel.chart == 'pie'">
       <label class="small">Donut</label><input type="checkbox" ng-model="panel.donut" ng-checked="panel.donut">
diff --git a/src/app/panels/hits/module.html b/src/app/panels/hits/module.html
index 92283dbab8cf2..abb19da32a57d 100644
--- a/src/app/panels/hits/module.html
+++ b/src/app/panels/hits/module.html
@@ -28,7 +28,7 @@
 
     <!-- horizontal legend -->
     <div class="small" ng-show="panel.arrangement == 'horizontal'" ng-repeat="query in data" style="float:left;padding-left: 10px;">
-     <span><i class="icon-circle" ng-style="{color:query.info.color}"></i></span> {{query.info.alias}} ({{query.data[0][1]}}) </span>
+     <span><i class="icon-circle" ng-style="{color:query.info.color}"></i> {{query.info.alias}} ({{query.data[0][1]}}) </span>
     </div><br>
 
   </div>
diff --git a/src/app/panels/query/meta.html b/src/app/panels/query/meta.html
index 3adf2d1a4d2fe..7563bec4915ee 100644
--- a/src/app/panels/query/meta.html
+++ b/src/app/panels/query/meta.html
@@ -29,6 +29,6 @@
   <div class="pull-right">
     <a class="btn btn-mini" ng-click="dashboard.current.services.query.list[id].enable=false;dashboard.refresh();dismiss();" class="pointer">Deactivate</a>
     <a class="btn btn-mini" ng-class="{active:dashboard.current.services.query.list[id].pin}" ng-click="toggle_pin(id);dismiss();" class="pointer">Pin <i class="icon-pushpin"></i></a>
-    <input class="btn btn-mini" ng-click="dashboard.refresh();dismiss();" type="submit"/ value="Close">
+    <input class="btn btn-mini" ng-click="dashboard.refresh();dismiss();" type="submit" value="Close">
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/panels/stats/editor.html b/src/app/panels/stats/editor.html
index 08e93e6d75dc2..9bc48f00f4d3f 100644
--- a/src/app/panels/stats/editor.html
+++ b/src/app/panels/stats/editor.html
@@ -18,18 +18,18 @@ <h5>Columns</h5>
       <label class="small">{{stat}}</label><input type="checkbox" ng-model="panel.show[stat]" ng-checked="panel.show[stat]">
     </div>
 
-    <h5>Formating</h5>
+    <h5>Formatting</h5>
     <div class="editor-option">
       <label class="small">Format</label>
       <select ng-change="set_refresh(true)" class="input-small" ng-model="panel.format" ng-options="f for f in ['number','float','money','bytes']"></select>
     </div>
     <div class="editor-option">
       <label class="small">Font Size</label>
-      <select class="input-mini" 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>
+      <select class="input-mini" 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>
     </div>
     <div class="editor-option">
       <label class="small">Display Breakdowns</label>
-      <select class="input-mini" ng-model="panel.display_breakdown" ng-options="f for f in ['yes', 'no']"></select></span>
+      <select class="input-mini" ng-model="panel.display_breakdown" ng-options="f for f in ['yes', 'no']"></select>
     </div>
     <div class="editor-option">
       <label class="small">Query column name</label>
diff --git a/src/app/panels/table/editor.html b/src/app/panels/table/editor.html
index 8988a9aebd1ec..bbbd834472f89 100644
--- a/src/app/panels/table/editor.html
+++ b/src/app/panels/table/editor.html
@@ -9,11 +9,11 @@ <h5>Options</h5>
       </div>
       <div class="editor-option" style="white-space:nowrap" ng-show='panel.sortable'>
         <label class="small">Sort</label>
-        <input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text"></input>
+        <input class="input-small" bs-typeahead="fields.list" ng-model="panel.sort[0]" type="text">
         <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="editor-option"><label class="small">Font Size</label>
-        <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>
+        <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>
       </div>
       <div class="editor-option">
         <label class="small">Trim Factor <tip>Trim fields to this long divided by # of rows. Requires data refresh.</tip></label>
diff --git a/src/app/panels/table/pagination.html b/src/app/panels/table/pagination.html
index 8eee4cc0e153b..ef77a4adf49c2 100644
--- a/src/app/panels/table/pagination.html
+++ b/src/app/panels/table/pagination.html
@@ -16,7 +16,7 @@ <h6>Per Page</h6>
       </div>
       <div class="editor-option">
         <h6>&nbsp;</h6>
-        <center><i class='icon-remove'></i><center>
+        <center><i class='icon-remove'></i></center>
       </div>
       <div class="editor-option">
         <h6>Page limit</h6>
diff --git a/src/app/panels/terms/editor.html b/src/app/panels/terms/editor.html
index ee849a66313a5..fa9df0f161dea 100644
--- a/src/app/panels/terms/editor.html
+++ b/src/app/panels/terms/editor.html
@@ -28,7 +28,7 @@ <h5>Parameters</h5>
       </div>
       <div class="editor-option" ng-show="panel.tmode == 'terms'">
         <label class="small">Exclude Terms(s) (comma separated)</label>
-        <input array-join type="text" ng-model='panel.exclude'></input>
+        <input array-join type="text" ng-model='panel.exclude'>
       </div>
     </div>
   </div>
@@ -37,19 +37,19 @@ <h5>Parameters</h5>
       <h5>View Options</h5>
       <div class="editor-option">
         <label class="small">Style</label>
-        <select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','table']"></select></span>
+        <select class="input-small" ng-model="panel.chart" ng-options="f for f in ['bar','pie','table']"></select>
       </div>
       <div class="editor-option" ng-show="panel.chart == 'table'">
         <label class="small">Font Size</label>
-        <select class="input-mini" 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>
+        <select class="input-mini" 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>
       </div>
       <div class="editor-option" ng-show="panel.chart == 'bar' || panel.chart == 'pie'">
         <label class="small">Legend</label>
-        <select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select></span>
+        <select class="input-small" ng-model="panel.counter_pos" ng-options="f for f in ['above','below','none']"></select>
       </div>
       <div class="editor-option" ng-show="panel.chart != 'table' && panel.counter_pos != 'none'">
         <label class="small" >Legend Format</label>
-        <select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select></span>
+        <select class="input-small" ng-model="panel.arrangement" ng-options="f for f in ['horizontal','vertical']"></select>
       </div>
       <div class="editor-option">
         <label class="small">Missing</label><input type="checkbox" ng-model="panel.missing" ng-checked="panel.missing">
diff --git a/src/app/panels/terms/module.html b/src/app/panels/terms/module.html
index 10b5e9bf9d05c..607fdf8de1661 100644
--- a/src/app/panels/terms/module.html
+++ b/src/app/panels/terms/module.html
@@ -65,7 +65,7 @@
       <!-- vertical legend below -->
       <table class="small" ng-show="panel.arrangement == 'vertical'">
         <tr ng-repeat="term in legend">
-          <td><i class="icon-circle" ng-style="{color:term.color}"></i></i></td>
+          <td><i class="icon-circle" ng-style="{color:term.color}"></i></td>
           <td class="terms-legend-term" style="padding-right:10px;padding-left:10px;">{{term.label}}</td>
           <td>{{term.data[0][1]}}</td>
         </tr>
@@ -88,21 +88,21 @@
     <!-- END Pie or Bar chart -->
 
 
-  <!-- TABLE -->
-  <table ng-style="panel.style" class="table table-striped table-condensed" ng-show="panel.chart == 'table'">
-    <thead>
-      <th>Term</th> <th>{{ panel.tmode == 'terms_stats' ? panel.tstat : 'Count' }}</th> <th>Action</th>
-    </thead>
-    <tr ng-repeat="term in data" ng-show="showMeta(term)">
-      <td class="terms-legend-term">{{term.label}}</td>
-      <td>{{term.data[0][1]}}</td>
-      <td>
-        <span ng-hide="term.meta == 'other'">
-          <i class='icon-search pointer' ng-click="build_search(term)"></i>
-          <i class='icon-ban-circle pointer' ng-click="build_search(term,true)"></i>
-        </span>
-      </td>
-    </tr>
-  </table>
-
+    <!-- TABLE -->
+    <table ng-style="panel.style" class="table table-striped table-condensed" ng-show="panel.chart == 'table'">
+      <thead>
+        <th>Term</th> <th>{{ panel.tmode == 'terms_stats' ? panel.tstat : 'Count' }}</th> <th>Action</th>
+      </thead>
+      <tr ng-repeat="term in data" ng-show="showMeta(term)">
+        <td class="terms-legend-term">{{term.label}}</td>
+        <td>{{term.data[0][1]}}</td>
+        <td>
+          <span ng-hide="term.meta == 'other'">
+            <i class='icon-search pointer' ng-click="build_search(term)"></i>
+            <i class='icon-ban-circle pointer' ng-click="build_search(term,true)"></i>
+          </span>
+        </td>
+      </tr>
+    </table>
+  </div>
 </div>
\ No newline at end of file
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html
index 7d8e43d379c0b..4c78ea7862ebb 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -119,7 +119,7 @@ <h5>Save to</h5>
           <label class="small">Browser</label><input type="checkbox" ng-model="dashboard.current.loader.save_default" ng-checked="dashboard.current.loader.save_default">
         </div>
         <div class="editor-option">
-          <label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github<tip></label><input type="checkbox" ng-model="dashboard.current.loader.save_gist" ng-checked="dashboard.current.loader.save_gist">
+          <label class="small">Gist <tip>Requires your domain to be OAUTH registered with Github</tip></label><input type="checkbox" ng-model="dashboard.current.loader.save_gist" ng-checked="dashboard.current.loader.save_gist">
         </div>
         <div class="editor-option">
           <label class="small">Elasticsearch</label><input type="checkbox" ng-model="dashboard.current.loader.save_elasticsearch" ng-checked="dashboard.current.loader.save_elasticsearch">
diff --git a/src/app/partials/roweditor.html b/src/app/partials/roweditor.html
index b2240e7f18b3a..759c3eab01d7f 100644
--- a/src/app/partials/roweditor.html
+++ b/src/app/partials/roweditor.html
@@ -8,16 +8,16 @@
 
   <div class="editor-row" ng-if="editor.index == 0">
     <div class="editor-option">
-      <label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
+      <label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'>
     </div>
     <div class="editor-option">
-      <label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
+      <label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'>
     </div>
     <div class="editor-option">
-      <label class="small"> Editable </label><input type="checkbox" ng-model="row.editable" ng-checked="row.editable" />
+      <label class="small"> Editable </label><input type="checkbox" ng-model="row.editable" ng-checked="row.editable">
     </div>
     <div class="editor-option">
-      <label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable" />
+      <label class="small"> Collapsable </label><input type="checkbox" ng-model="row.collapsable" ng-checked="row.collapsable">
     </div>
   </div>
   <div class="row-fluid" ng-if="editor.index == 1">