diff --git a/public/app/features/dashboard/submenu/submenu.html b/public/app/features/dashboard/submenu/submenu.html
index 3e09fe4425e..b4e9e26fa0a 100644
--- a/public/app/features/dashboard/submenu/submenu.html
+++ b/public/app/features/dashboard/submenu/submenu.html
@@ -1,4 +1,4 @@
-<div class="submenu-controls gf-form-query">
+<div class="submenu-controls">
 
   <div ng-repeat="variable in ctrl.variables" ng-hide="variable.hide === 2" class="submenu-item gf-form-inline">
     <div class="gf-form">
diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss
index 93376e0d106..878058bd1c4 100644
--- a/public/sass/components/_submenu.scss
+++ b/public/sass/components/_submenu.scss
@@ -1,4 +1,10 @@
 .submenu-controls {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-content: flex-start;
+  align-items: flex-start;
+
   margin: 0 $panel-margin ($panel-margin*2) $panel-margin;
 }
 
diff --git a/tasks/options/exec.js b/tasks/options/exec.js
index 98927436518..ad52f0b7f2c 100644
--- a/tasks/options/exec.js
+++ b/tasks/options/exec.js
@@ -1,7 +1,8 @@
-module.exports = function(config) {
+module.exports = function(config, grunt) {
   'use strict'
   return {
-    tslint : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json <%= tslint.source.files.src %>",
+    tslint : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json",
+    tslintfile : "node ./node_modules/tslint/lib/tslint-cli.js -c tslint.json --project ./tsconfig.json <%= tslint.source.files.src %>",
     tscompile: "node ./node_modules/typescript/lib/tsc.js -p tsconfig.json --diagnostics",
     tswatch: "node ./node_modules/typescript/lib/tsc.js -p tsconfig.json --diagnostics --watch",
   };
diff --git a/tasks/options/tslint.js b/tasks/options/tslint.js
new file mode 100644
index 00000000000..d51c2062676
--- /dev/null
+++ b/tasks/options/tslint.js
@@ -0,0 +1,11 @@
+module.exports = function(config, grunt) {
+  'use strict'
+  // dummy to avoid template compile error
+  return {
+    source: {
+      files: {
+        src: ""
+      }
+    }
+  };
+};
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
index 612b4d2b86c..5b872cb212a 100644
--- a/tasks/options/watch.js
+++ b/tasks/options/watch.js
@@ -70,7 +70,7 @@ module.exports = function(config, grunt) {
           }
 
           grunt.config('tslint.source.files.src', filepath);
-          grunt.task.run('exec:tslint');
+          grunt.task.run('exec:tslintfile');
         }
 
         done();
diff --git a/tasks/tslint.js b/tasks/tslint.js
new file mode 100644
index 00000000000..e69de29bb2d