diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html
index 1feef74fbf6..7beb6d54911 100644
--- a/public/app/partials/panelgeneral.html
+++ b/public/app/partials/panelgeneral.html
@@ -8,11 +8,9 @@
 			<span class="gf-form-label gf-size-xs">Span</span>
 			<select class="gf-form-input gf-size-auto" ng-model="ctrl.panel.span" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10,11,12]"></select>
 		</div>
-		<div class="gf-form gf-size-max-lg">
-			<span class="gf-form-label">Height</span>
-			<input type="text" class="gf-form-input" ng-model='ctrl.panel.height' placeholder="100px"></input>
-		</div>
-		<div class="gf-form">
+		<div class="gf-form gf-size-max-xxl">
+			<span class="gf-form-label gf-size-sm">Height</span>
+			<input type="text" class="gf-form-input gf-size-max-xs" ng-model='ctrl.panel.height' placeholder="100px"></input>
 			<editor-checkbox text="Transparent" model="ctrl.panel.transparent"></editor-checkbox>
 		</div>
 	</div>
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 505945c1a68..3484d4584cb 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -40,8 +40,8 @@ $critical:              #ed2e18;
 // -------------------------
 $body-bg:  				rgb(20,20,20);
 $page-bg:  				$gray-darker;
-$body-color:      		$gray-lighter;
-$text-color:      		$gray-lighter;
+$body-color:   		$gray-lighter;
+$text-color:   		$gray-lighter;
 
 // Links
 // -------------------------
@@ -51,9 +51,9 @@ $link-hover-color:        $white;
 
 // Typography
 // -------------------------
-$headings-color:         darken($white,11%);
-$abbr-border-color: 	 $gray-light !default;
-$text-muted: 			 darken($link-color,30%);
+$headings-color:          darken($white,11%);
+$abbr-border-color: 	    $gray-light !default;
+$text-muted: 			        darken($link-color,30%);
 
 $blockquote-small-color:  $gray-light !default;
 $blockquote-border-color: $gray-lighter !default;
@@ -66,13 +66,13 @@ $component-active-bg:    $brand-primary !default;
 
 // Panel
 // -------------------------
-$panel-bg: 					$gray-darker;
-$panel-border: 				solid 1px $gray-dark;
+$panel-bg: 					    $gray-darker;
+$panel-border: 				  solid 1px $gray-dark;
 
 $divider-border-color: 		#555;
 
 // Graphite Target Editor
-$tight-form-border:         #050505;
+$tight-form-border:     #050505;
 $tight-form-bg:     		$gray-dark;
 
 $tight-form-func-bg: 		#333;
@@ -82,8 +82,8 @@ $modal-background: $black;
 $code-tag-bg: #444;
 
 // Lists
-$grafanaListBackground:  	$gray-dark;
-$grafanaListAccent:      	lighten($gray-darker, 2%);
+$grafanaListBackground:  	  $gray-dark;
+$grafanaListAccent:      	  lighten($gray-darker, 2%);
 $grafanaListBorderTop:      $gray-dark;
 $grafanaListBorderBottom:   $black;
 $grafanaListHighlight:      #333;