diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html
index c79853e5613..48caddeb90e 100644
--- a/public/app/features/dashboard/history/history.html
+++ b/public/app/features/dashboard/history/history.html
@@ -1,5 +1,5 @@
 <h3 class="dashboard-settings__header">
-  <a ng-click="ctrl.switchMode('list')">Version History</a>
+  <a ng-click="ctrl.switchMode('list')">Versions</a>
   <span ng-show="ctrl.mode === 'compare'">
     &gt; Comparing {{ctrl.baseInfo.version}}
     <i class="fa fa-arrows-h"></i>
diff --git a/public/app/features/dashboard/history/history.ts b/public/app/features/dashboard/history/history.ts
index b0dee045a6a..05e78d08989 100644
--- a/public/app/features/dashboard/history/history.ts
+++ b/public/app/features/dashboard/history/history.ts
@@ -1,5 +1,3 @@
-///<reference path="../../../headers/common.d.ts" />
-
 import './history_srv';
 
 import _ from 'lodash';
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index 7de5e2dbcd1..e78dcb74127 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -23,7 +23,7 @@
 </aside>
 
 <div class="dashboard-settings__content" ng-if="ctrl.viewId === 'settings'">
-	<h3 class="dashboard-settings__header">
+	<h3 class="dashboard-settings__header m-b-1">
 		General
 	</h3>
 
diff --git a/public/sass/components/_dashboard_settings.scss b/public/sass/components/_dashboard_settings.scss
index 9e307c07231..50f157a5a15 100644
--- a/public/sass/components/_dashboard_settings.scss
+++ b/public/sass/components/_dashboard_settings.scss
@@ -35,7 +35,6 @@
 .dashboard-settings__aside-header {
   color: $text-muted;
   font-size: $font-size-h3;
-  margin-bottom: 20px;
   padding-right: 60px;
   white-space: nowrap;
 
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 1174d307ff2..5ee712b0810 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -85,6 +85,14 @@ $input-border: 1px solid $input-border-color;
   }
 }
 
+.gf-form-label + .gf-form-label {
+  margin-right: $gf-form-margin;
+}
+
+.gf-form + .gf-form {
+  margin-right: $gf-form-margin;
+}
+
 .gf-form-pre {
   display: block;
   flex-grow: 1;
@@ -254,9 +262,6 @@ $input-border: 1px solid $input-border-color;
   margin-right: $gf-form-margin;
   line-height: $input-line-height;
   font-size: $font-size-sm;
-  box-shadow: none;
-  @include border-radius($label-border-radius-sm);
-  border: $input-btn-border-width solid transparent;
 
   flex-shrink: 0;
   flex-grow: 0;
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index cd8f949ed64..66c029071b2 100644
--- a/public/sass/components/_query_editor.scss
+++ b/public/sass/components/_query_editor.scss
@@ -33,6 +33,10 @@
   .gf-form-label {
     margin-right: 2px;
   }
+
+  .gf-form + .gf-form {
+    margin-right: 0;
+  }
 }
 
 .gf-form-query-content {