diff --git a/public/app/plugins/panel/table/editor.html b/public/app/plugins/panel/table/editor.html
index f2f0f3e7394..6e7281dd78c 100644
--- a/public/app/plugins/panel/table/editor.html
+++ b/public/app/plugins/panel/table/editor.html
@@ -1,24 +1,16 @@
 <div class="editor-row">
 	<div class="section gf-form-group">
 		<h5 class="section-heading">Data</h5>
-		<div class="gf-form-inline">
-			<div class="gf-form">
-				<label class="gf-form-label width-10">To Table Transform</label>
-				<div class="gf-form-select-wrapper max-width-15">
-					<select class="gf-form-input"
-							ng-model="editor.panel.transform"
-							ng-options="k as v.description for (k, v) in editor.transformers"
-							ng-change="editor.transformChanged()"></select>
-				</div>
-			</div>
-			<div class="gf-form gf-form--grow">
-				<div class="gf-form-label gf-form-label--grow"></div>
-			</div>
-		</div>
-		<div class="gf-form-inline">
-			<div class="gf-form">
-				<label class="gf-form-label width-10">Columns</label>
-			</div>
+    <div class="gf-form">
+      <label class="gf-form-label width-10">Table Transform</label>
+      <div class="gf-form-select-wrapper max-width-15">
+        <select class="gf-form-input" ng-model="editor.panel.transform" ng-options="k as v.description for (k, v) in editor.transformers" ng-change="editor.transformChanged()"></select>
+      </div>
+    </div>
+    <div class="gf-form-inline">
+      <div class="gf-form">
+        <label class="gf-form-label width-10">Columns</label>
+      </div>
 			<div class="gf-form" ng-repeat="column in editor.panel.columns">
 				<label class="gf-form-label">
 					<i class="pointer fa fa-remove" ng-click="editor.removeColumn(column)"></i>
@@ -64,33 +56,22 @@
 		<h5 class="section-heading">Column Styles</h5>
 		<div ng-repeat="style in editor.panel.styles">
 			<div class="gf-form-inline">
-				<div class="gf-form max-width-19">
-					<label class="gf-form-label width-8">Name or regex</label>
-					<input type="text" class="gf-form-input"
-						ng-model="style.pattern"
-						bs-typeahead="editor.getColumnNames"
-						ng-blur="editor.render()"
-						data-min-length=0 data-items=100 ng-model-onblur>
+				<div class="gf-form">
+					<label class="gf-form-label">Name or regex</label>
+					<input type="text" class="gf-form-input" ng-model="style.pattern" bs-typeahead="editor.getColumnNames" ng-blur="editor.render()" data-min-length=0 data-items=100 ng-model-onblur>
 				</div>
-				<div class="gf-form max-width-18">
-					<label class="gf-form-label width-8">Type</label>
-					<div class="gf-form-select-wrapper max-width-10">
-						<select class="gf-form-input"
-								ng-model="style.type"
-								ng-options="c.value as c.text for c in editor.columnTypes"
-								ng-change="editor.render()"></select>
+				<div class="gf-form">
+					<label class="gf-form-label">Type</label>
+					<div class="gf-form-select-wrapper">
+						<select class="gf-form-input" ng-model="style.type" ng-options="c.value as c.text for c in editor.columnTypes" ng-change="editor.render()"></select>
 					</div>
 				</div>
-				<div class="gf-form max-width-25" ng-if="style.type === 'date'">
-					<label class="gf-form-label width-5">Format</label>
+				<div class="gf-form" ng-if="style.type === 'date'">
+					<label class="gf-form-label">Format</label>
 					<metric-segment-model property="style.dateFormat" options="editor.dateFormats" on-change="editor.render()" custom="true"></metric-segment-model>
 				</div>
-				<gf-form-switch class="gf-form" label-class="width-8"
-					ng-if="style.type === 'string'"
-					label="Sanitize HTML"
-					checked="style.sanitize"
-					change="editor.render()"></gf-form-switch>
-				<div class="gf-form gf-form--grow" ng-if="style.type !== 'date'">
+				<gf-form-switch class="gf-form" label-class="width-8" ng-if="style.type === 'string'" label="Sanitize HTML" checked="style.sanitize" change="editor.render()"></gf-form-switch>
+				<div class="gf-form gf-form--grow">
 					<div class="gf-form-label gf-form-label--grow"></div>
 				</div>
 				<div class="gf-form">
@@ -101,69 +82,58 @@
 				  </label>
 				</div>
 			</div>
+
 			<div class="gf-form-inline" ng-if="style.type === 'number'">
-				<div class="gf-form max-width-20">
-					<label class="gf-form-label width-8">Coloring</label>
-					<div class="gf-form-select-wrapper max-width-12">
-						<select class="gf-form-input"
-								ng-model="style.colorMode"
-								ng-options="c.value as c.text for c in editor.colorModes"
-								ng-change="editor.render()"></select>
-					</div>
-				</div>
-				<div class="gf-form max-width-17">
-					<label class="gf-form-label width-8">Thresholds<tip>Comma separated values</tip></label>
-					<input type="text" class="gf-form-input"
-						ng-model="style.thresholds"
-						placeholder="50,80"
-						ng-blur="editor.render()"
-						array-join ng-model-onblur>
-				</div>
-				<div class="gf-form max-width-18">
-					<label class="gf-form-label width-5">Colors</label>
-					<span class="gf-form-label">
-					  <spectrum-picker ng-model="style.colors[0]" ng-change="editor.render()"></spectrum-picker>
-					</span>
-					<span class="gf-form-label">
-					  <spectrum-picker ng-model="style.colors[1]" ng-change="editor.render()"></spectrum-picker>
-					</span>
-					<span class="gf-form-label">
-					  <spectrum-picker ng-model="style.colors[2]" ng-change="editor.render()"></spectrum-picker>
-					</span>
-					<span class="gf-form-label">
-						<a class="pointer" ng-click="editor.invertColorOrder($index)">invert order</a>
-					</span>
-				</div>
-				<!-- <div class="gf-form gf-form--grow">
-					<div class="gf-form-label gf-form-label--grow"></div>
-				</div> -->
-			</div>
-			<div class="gf-form-inline" ng-if="style.type === 'number'">
-				<div class="gf-form">
+				<div class="gf-form offset-width-8">
 					<label class="gf-form-label width-8">Unit</label>
 				</div>
-				<div class="gf-form max-width-11">
-					<div class="gf-form-dropdown-typeahead max-width-19"
-						ng-model="style.unit"
-						dropdown-typeahead2="editor.unitFormats"
-						dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)">
-					</div>
+				<div class="gf-form">
+					<div class="gf-form-dropdown-typeahead" ng-model="style.unit" dropdown-typeahead2="editor.unitFormats" dropdown-typeahead-on-select="editor.setUnitFormat(style, $subItem)"></div>
 				</div>
-				<div class="gf-form max-width-15">
-					<label class="gf-form-label width-8">Decimals</label>
-					<input type="number" class="gf-form-input" data-placement="right"
-						ng-model="style.decimals"
-						ng-change="editor.render()" ng-model-onblur>
-				</div>
-				<div class="gf-form gf-form--grow">
-					<div class="gf-form-label gf-form-label--grow"></div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="gf-form-button">
-	  <button class="btn btn-inverse" ng-click="editor.addColumnStyle()">
-	    <i class="fa fa-plus"></i>&nbsp;Add column style rule
-	  </button>
-	</div>
+				<div class="gf-form">
+					<label class="gf-form-label">Decimals</label>
+					<input type="number" class="gf-form-input width-4" data-placement="right" ng-model="style.decimals" ng-change="editor.render()" ng-model-onblur>
+        </div>
+				<div class="gf-form">
+          <label class="gf-form-label">Coloring</label>
+          <div class="gf-form-select-wrapper">
+            <select class="gf-form-input" ng-model="style.colorMode" ng-options="c.value as c.text for c in editor.colorModes" ng-change="editor.render()"></select>
+          </div>
+        </div>
+        <div class="gf-form gf-form--grow">
+          <div class="gf-form-label gf-form-label--grow"></div>
+        </div>
+      </div>
+
+      <div class="gf-form-inline" ng-if="style.type === 'number'">
+        <div class="gf-form max-width-17 offset-width-8">
+          <label class="gf-form-label width-8">Thresholds<tip>Comma separated values</tip></label>
+          <input type="text" class="gf-form-input" ng-model="style.thresholds" placeholder="50,80" ng-blur="editor.render()" array-join ng-model-onblur>
+        </div>
+        <div class="gf-form">
+          <label class="gf-form-label width-5">Colors</label>
+          <span class="gf-form-label">
+            <spectrum-picker ng-model="style.colors[0]" ng-change="editor.render()"></spectrum-picker>
+          </span>
+          <span class="gf-form-label">
+            <spectrum-picker ng-model="style.colors[1]" ng-change="editor.render()"></spectrum-picker>
+          </span>
+          <span class="gf-form-label">
+            <spectrum-picker ng-model="style.colors[2]" ng-change="editor.render()"></spectrum-picker>
+          </span>
+        </div>
+        <div class="gf-form gf-form--grow">
+          <div class="gf-form-label gf-form-label--grow">
+            <a class="pointer" ng-click="editor.invertColorOrder($index)">Invert</a>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+  <div class="gf-form-button">
+    <button class="btn btn-inverse" ng-click="editor.addColumnStyle()">
+      <i class="fa fa-plus"></i>&nbsp;Add column style rule
+    </button>
+  </div>
 </div>