diff --git a/public/app/features/templating/templateSrv.js b/public/app/features/templating/templateSrv.js
index 0aa0990896c..26dc77d36a9 100644
--- a/public/app/features/templating/templateSrv.js
+++ b/public/app/features/templating/templateSrv.js
@@ -35,7 +35,7 @@ function (angular, _) {
     };
 
     function regexEscape(value) {
-      return value.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+      return value.replace(/[\\^$*+?.()|[\]{}\/]/g, '\\$&');
     }
 
     function luceneEscape(value) {
diff --git a/public/app/plugins/panel/graph/styleEditor.html b/public/app/plugins/panel/graph/styleEditor.html
index b730b1d397a..465e8d4894e 100644
--- a/public/app/plugins/panel/graph/styleEditor.html
+++ b/public/app/plugins/panel/graph/styleEditor.html
@@ -1,102 +1,123 @@
 <div class="editor-row gf-form-group">
   <div class="section">
-    <h5>Chart Options</h5>
-		<editor-opt-bool text="Bars" model="ctrl.panel.bars" change="ctrl.render()"></editor-opt-bool>
-		<editor-opt-bool text="Lines" model="ctrl.panel.lines" change="ctrl.render()"></editor-opt-bool>
-		<editor-opt-bool text="Points" model="ctrl.panel.points" change="ctrl.render()"></editor-opt-bool>
-  </div>
-
-  <div class="section">
-    <h5>Line options</h5>
-    <div class="editor-option" ng-show="ctrl.panel.lines">
-      <label class="small">Line Fill</label>
-      <select class="input-mini" ng-model="ctrl.panel.fill" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+    <h5 class="section-heading">Draw Modes</h5>
+    <div class="gf-form">
+      <label class="gf-form-label width-5">Bars</label>
+      <editor-checkbox text="Enable" model="ctrl.panel.bars" change="ctrl.render()"></editor-checkbox>
     </div>
-    <div class="editor-option" ng-show="ctrl.panel.lines">
-      <label class="small">Line Width</label>
-      <select class="input-mini" ng-model="ctrl.panel.linewidth" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+    <div class="gf-form">
+      <label class="gf-form-label width-5">Lines</label>
+      <editor-checkbox text="Enable" model="ctrl.panel.lines" change="ctrl.render()"></editor-checkbox>
     </div>
-    <div class="editor-option" ng-show="ctrl.panel.points">
-      <label class="small">Point Radius</label>
-      <select class="input-mini" ng-model="ctrl.panel.pointradius" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+    <div class="gf-form">
+      <label class="gf-form-label width-5">Points</label>
+      <editor-checkbox text="Enable" model="ctrl.panel.points" change="ctrl.render()"></editor-checkbox>
     </div>
-    <div class="editor-option">
-      <label class="small">Null point mode<tip>Define how null values should be drawn</tip></label>
-      <select class="input-medium" ng-model="ctrl.panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="ctrl.render()"></select>
-    </div>
-
-		<editor-opt-bool text="Staircase line" model="ctrl.panel.steppedLine" change="ctrl.render()"></editor-opt-bool>
   </div>
   <div class="section">
-    <h5>Multiple Series</h5>
-
-		<editor-opt-bool text="Stack" model="ctrl.panel.stack" change="ctrl.render()"></editor-opt-bool>
-		<editor-opt-bool text="Percent" model="ctrl.panel.percentage" change="ctrl.render()" tip="Stack as a percentage of total"></editor-opt-bool>
-	</div>
-
-  <div class="section">
-    <h5>Rendering</h5>
-    <div class="editor-option">
-      <label class="small">Flot <tip>client side</tip></label>
-      <input type="radio" class="input-small" ng-model="ctrl.panel.renderer" value="flot" ng-change="ctrl.refresh()" />
+    <h5 class="section-heading">Mode Options</h5>
+    <div class="gf-form" ng-show="ctrl.panel.lines">
+      <label class="gf-form-label width-8">Fill</label>
+      <div class="gf-form-select-wrapper">
+        <select class="gf-form-input" ng-model="ctrl.panel.fill" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+      </div>
     </div>
-    <div class="editor-option">
-      <label class="small">Graphite PNG <tip>server side</tip></label>
-      <input type="radio" class="input-small" ng-model="ctrl.panel.renderer" value="png" ng-change="ctr.refresh()" />
+    <div class="gf-form" ng-show="ctrl.panel.lines">
+      <label class="gf-form-label width-8">Line Width</label>
+      <div class="gf-form-select-wrapper">
+        <select class="gf-form-input" ng-model="ctrl.panel.linewidth" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+      </div>
+    </div>
+    <div class="gf-form" ng-show="ctrl.panel.points">
+      <label class="gf-form-label width-8">Point Radius</label>
+      <div class="gf-form-select-wrapper">
+        <select class="gf-form-input" ng-model="ctrl.panel.pointradius" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10]" ng-change="ctrl.render()"></select>
+      </div>
+    </div>
+    <div class="gf-form" ng-show="ctrl.panel.lines">
+      <label class="gf-form-label width-8">Staircase</label>
+      <editor-checkbox text="" model="ctrl.panel.steppedLine" change="ctrl.render()"></editor-checkbox>
+    </div>
+  </div>
+  <div class="section">
+    <h5 class="section-heading">Misc options</h5>
+    <div class="gf-form">
+      <label class="gf-form-label width-7">Null value</label>
+      <div class="gf-form-select-wrapper">
+        <select class="gf-form-input max-width-8" ng-model="ctrl.panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="ctrl.render()"></select>
+      </div>
+    </div>
+    <div class="gf-form">
+      <label class="gf-form-label width-7">Renderer</label>
+      <div class="gf-form-select-wrapper max-width-8">
+        <select class="gf-form-input" ng-model="ctrl.panel.renderer" ng-options="f for f in ['flot', 'png']" ng-change="ctrl.render()"></select>
+      </div>
+    </div>
+    <div class="gf-form">
+      <label class="gf-form-label width-7">Tooltip mode</label>
+      <div class="gf-form-select-wrapper max-width-8">
+        <select class="gf-form-input" ng-model="ctrl.panel.tooltip.shared" ng-options="f.value as f.text for f in [{text: 'All series', value: true}, {text: 'Single', value: false}]" ng-change="ctrl.render()"></select>
+      </div>
     </div>
   </div>
 
   <div class="section">
-    <h5>Tooltip</h5>
-		<editor-opt-bool
-			text="All series" model="ctrl.panel.tooltip.shared" change="ctrl.render()"
-			tip="Show all series on same tooltip and a x croshair to help follow all series">
-		</editor-opt-bool>
-		<div class="editor-option" ng-show="ctrl.panel.stack">
-      <label class="small">Stacked Values <tip>How should the values in stacked charts to be calculated?</tip></label>
-      <select class="input-small" ng-model="ctrl.panel.tooltip.value_type" ng-options="f for f in ['cumulative','individual']" ng-change="ctrl.render()"></select>
+    <h5 class="section-heading">Multiple Series</h5>
+    <div class="gf-form">
+      <label class="gf-form-label width-7">Stack</label>
+      <editor-checkbox text="Enable" model="ctrl.panel.stack" change="ctrl.render()"></editor-checkbox>
+    </div>
+    <div class="gf-form" ng-show="ctrl.panel.stack">
+      <label class="gf-form-label width-7">Percent</label>
+      <editor-checkbox text="Enable" model="ctrl.panel.percent" change="ctrl.render()"></editor-checkbox>
+    </div>
+    <div class="gf-form" ng-show="ctrl.panel.stack">
+      <label class="gf-form-label width-7">Tooltip value</label>
+      <div class="gf-form-select-wrapper max-width-8">
+        <select class="gf-form-input" ng-model="ctrl.panel.tooltip.value_type" ng-options="f for f in ['cumulative','individual']" ng-change="ctrl.render()"></select>
+      </div>
     </div>
   </div>
+
 </div>
 
-
 <div class="editor-row">
   <div class="section">
-		<h5>Series specific overrides <tip>Regex match example: /server[0-3]/i </tip></h5>
-		<div class="tight-form-container">
-			<div class="tight-form" ng-repeat="override in ctrl.panel.seriesOverrides" ng-controller="SeriesOverridesCtrl">
-				<ul class="tight-form-list">
-					<li class="tight-form-item">
-						<i class="fa fa-remove pointer" ng-click="ctrl.removeSeriesOverride(override)"></i>
-					</li>
+    <h5>Series specific overrides <tip>Regex match example: /server[0-3]/i </tip></h5>
+    <div class="tight-form-container">
+      <div class="tight-form" ng-repeat="override in ctrl.panel.seriesOverrides" ng-controller="SeriesOverridesCtrl">
+        <ul class="tight-form-list">
+          <li class="tight-form-item">
+            <i class="fa fa-remove pointer" ng-click="ctrl.removeSeriesOverride(override)"></i>
+          </li>
 
-					<li class="tight-form-item">
-						alias or regex
-					</li>
+          <li class="tight-form-item">
+            alias or regex
+          </li>
 
-					<li>
-						<input type="text" ng-model="override.alias" bs-typeahead="getSeriesNames" ng-blur="ctrl.render()" data-min-length=0 data-items=100 class="input-medium tight-form-input" >
-					</li>
+          <li>
+            <input type="text" ng-model="override.alias" bs-typeahead="getSeriesNames" ng-blur="ctrl.render()" data-min-length=0 data-items=100 class="input-medium tight-form-input" >
+          </li>
 
-					<li class="tight-form-item" ng-repeat="option in currentOverrides">
-						<i class="pointer fa fa-remove" ng-click="removeOverride(option)"></i>
-						<span ng-show="option.propertyName === 'color'">
-							Color: <i class="fa fa-circle" ng-style="{color:option.value}"></i>
-						</span>
-						<span ng-show="option.propertyName !== 'color'">
-							{{option.name}}: {{option.value}}
-						</span>
-					</li>
+            <li class="tight-form-item" ng-repeat="option in currentOverrides">
+              <i class="pointer fa fa-remove" ng-click="removeOverride(option)"></i>
+              <span ng-show="option.propertyName === 'color'">
+                Color: <i class="fa fa-circle" ng-style="{color:option.value}"></i>
+              </span>
+              <span ng-show="option.propertyName !== 'color'">
+                {{option.name}}: {{option.value}}
+              </span>
+            </li>
 
-					<li class="dropdown" dropdown-typeahead="overrideMenu" dropdown-typeahead-on-select="setOverride($item, $subItem)">
-					</li>
-				</ul>
-				<div class="clearfix"></div>
-			</div>
-		</div>
+            <li class="dropdown" dropdown-typeahead="overrideMenu" dropdown-typeahead-on-select="setOverride($item, $subItem)">
+            </li>
+        </ul>
+        <div class="clearfix"></div>
+      </div>
+    </div>
 
-		<button class="btn btn-inverse" style="margin-top: 20px" ng-click="ctrl.addSeriesOverride()">
-			Add series specific option
-		</button>
-	</div>
+    <button class="btn btn-inverse" style="margin-top: 20px" ng-click="ctrl.addSeriesOverride()">
+      Add series specific option
+    </button>
+  </div>
 </div>
diff --git a/public/test/specs/templateSrv-specs.js b/public/test/specs/templateSrv-specs.js
index 65bd3f088ef..4948e1272ce 100644
--- a/public/test/specs/templateSrv-specs.js
+++ b/public/test/specs/templateSrv-specs.js
@@ -135,6 +135,11 @@ define([
         expect(result).to.be('test|test2');
       });
 
+      it('slash should be properly escaped in regex format', function() {
+         var result = _templateSrv.formatValue('Gi3/14', 'regex');
+         expect(result).to.be('Gi3\\/14');
+      });
+
     });
 
     describe('can check if variable exists', function() {