diff --git a/public/app/plugins/datasource/elasticsearch/partials/config.html b/public/app/plugins/datasource/elasticsearch/partials/config.html
index f34cf7fc782..f6932ac7210 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/config.html
@@ -5,7 +5,7 @@
 
 <div class="gf-form-group">
 	<div class="gf-form-inline">
-		<div class="gf-form max-width-28">
+		<div class="gf-form max-width-19">
 			<span class="gf-form-label width-9">Index name</span>
 			<input class="gf-form-input" type="text" ng-model='ctrl.current.database' placeholder="" required></input>
 		</div>
diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 9797a17c348..e1dda86d4f9 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -156,7 +156,7 @@ $input-box-shadow:               none;
 $input-border-focus:             $blue !default;
 $input-box-shadow-focus:         $blue !default;
 $input-color-placeholder:        $gray-4 !default;
-$input-label-bg:	        	     $gray-5;
+$input-label-bg:	        	     $gray-6;
 
 // Sidemenu
 // -------------------------
@@ -274,4 +274,4 @@ $popoverArrowOuterWidth:  $popoverArrowWidth + 1;
 $popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 // images
-$checkboxImageUrl: '../img/checkbox_white.png';
\ No newline at end of file
+$checkboxImageUrl: '../img/checkbox_white.png';
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 347c96310b4..cd6e7be510a 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -1,5 +1,5 @@
-$gf-form-margin: 0.2rem;
-$gf-form-label-margin: 0.2rem;
+$gf-form-margin: 0.25rem;
+$gf-form-label-margin: 0.25rem;
 
 .gf-form {
   margin-bottom: $gf-form-margin;
@@ -70,7 +70,7 @@ $gf-form-label-margin: 0.2rem;
   background-color: $input-bg;
   background-image: none;
   background-clip: padding-box;
-  border: $input-btn-border-width solid $input-bg;
+  border: $input-btn-border-width solid $input-border-color;
   @include border-radius($input-border-radius-sm);
   @include box-shadow($input-box-shadow);
   transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 4438bb79b4d..ad7c8fc9841 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -24,7 +24,7 @@
   max-width: 1060px;
   min-height: calc(100% - 54px);
   padding-bottom: $spacer * 5;
-  background-image: linear-gradient(60deg, rgba(0, 0, 0, 0) 0%, lighten($page-bg, 4%) 98%);
+  background-image: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%)
 }
 
 .page-header {