diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 88c92ee320a..201d3f3e8c8 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -2,7 +2,7 @@
 
 import './graph';
 import './legend';
-import './seriesOverridesCtrl';
+import './series_overrides_ctrl';
 
 import moment from 'moment';
 import kbn from 'app/core/utils/kbn';
diff --git a/public/app/plugins/panel/graph/seriesOverridesCtrl.js b/public/app/plugins/panel/graph/series_overrides_ctrl.js
similarity index 100%
rename from public/app/plugins/panel/graph/seriesOverridesCtrl.js
rename to public/app/plugins/panel/graph/series_overrides_ctrl.js
diff --git a/public/app/plugins/panel/graph/styleEditor.html b/public/app/plugins/panel/graph/styleEditor.html
index 82cf31dd0d1..9f7b7989d5c 100644
--- a/public/app/plugins/panel/graph/styleEditor.html
+++ b/public/app/plugins/panel/graph/styleEditor.html
@@ -1,4 +1,4 @@
-<div class="editor-row">
+<div class="editor-row gf-form-row">
   <div class="section">
     <h5>Chart Options</h5>
 		<editor-opt-bool text="Bars" model="ctrl.panel.bars" change="ctrl.render()"></editor-opt-bool>
diff --git a/public/test/specs/seriesOverridesCtrl-specs.js b/public/test/specs/seriesOverridesCtrl-specs.js
index 75030bea077..f83a87d5977 100644
--- a/public/test/specs/seriesOverridesCtrl-specs.js
+++ b/public/test/specs/seriesOverridesCtrl-specs.js
@@ -1,6 +1,6 @@
 define([
   './helpers',
-  'app/plugins/panel/graph/seriesOverridesCtrl'
+  'app/plugins/panel/graph/series_overrides_ctrl'
 ], function(helpers) {
   'use strict';