diff --git a/public/app/features/panel/partials/query_editor_row.html b/public/app/features/panel/partials/query_editor_row.html
index f34c43c1e94..8238b57fdd9 100644
--- a/public/app/features/panel/partials/query_editor_row.html
+++ b/public/app/features/panel/partials/query_editor_row.html
@@ -1,3 +1,4 @@
+
 <div class="gf-form-query">
 	<div class="gf-form">
 		<label class="gf-form-label">
@@ -24,6 +25,7 @@
 	<div class="gf-form">
 		<label class="gf-form-label">
 			<a class="pointer" tabindex="1" ng-click="ctrl.toggleCollapse()" ng-class="{muted: !ctrl.canCollapse}">
+				<em ng-show="ctrl.target.datasource">{{ctrl.target.datasource}}&nbsp;</em>
 				<i class="fa fa-fw fa-chevron-down" ng-hide="ctrl.collapsed"></i>
 				<i class="fa fa-fw fa-chevron-left" ng-show="ctrl.collapsed"></i>
 			</a>
diff --git a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
index 993291d8767..cb541c15fed 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/bucket_agg.html
@@ -43,9 +43,9 @@
 
 		<div class="gf-form offset-width-7">
 			<label class="gf-form-label width-10">
-				Trim edges points
+				Trim edges
 				<info-popover mode="right-normal">
-					Trim the edges on the timeseries x datapoints
+					Trim the edges on the timeseries datapoints
 				</info-popover>
 			</label>
 			<input class="gf-form-input max-width-12" type="number" ng-model="agg.settings.trimEdges" ng-change="onChangeInternal()">
diff --git a/public/app/plugins/datasource/elasticsearch/partials/query.editor.html b/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
index 377c026382a..48fea594ad6 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/query.editor.html
@@ -7,7 +7,7 @@
 		</div>
 		<div class="gf-form max-width-15">
 			<label class="gf-form-label query-keyword">Alias</label>
-			<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="alias patterns (empty = auto)" ng-blur="ctrl.refresh()">
+			<input type="text" class="gf-form-input" ng-model="ctrl.target.alias" spellcheck='false' placeholder="alias patterns" ng-blur="ctrl.refresh()">
 		</div>
 	</div>
 
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 0f31937860d..fed3d805b82 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -67,8 +67,8 @@ $page-gradient: linear-gradient(60deg, transparent 70%, darken($page-bg, 4%) 98%
 
 // Links
 // -------------------------
-$link-color:              darken($white,11%);
-$link-color-disabled:     darken($link-color,30%);
+$link-color:              darken($white, 11%);
+$link-color-disabled:     darken($link-color, 30%);
 $link-hover-color:        $white;
 $external-link-color:     $blue;
 
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index c5112460588..f931afc53bd 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -126,6 +126,7 @@ $gf-form-margin: 0.25rem;
 
   &--dropdown {
     padding-right: $input-padding-x*2;
+
     &:after {
       position: absolute;
       top: 35%;
diff --git a/public/sass/utils/_utils.scss b/public/sass/utils/_utils.scss
index 055fe96a213..c0fbe3c3347 100644
--- a/public/sass/utils/_utils.scss
+++ b/public/sass/utils/_utils.scss
@@ -59,15 +59,16 @@ button.close {
 
 // Toggling content
 .hide {
-  display: none;
+  display: none !important;
 }
+
 .show {
   display: block;
 }
 
 // Visibility
 .invisible {
-  visibility: hidden;
+  visibility: hidden !important;
 }
 
 // For Affix plugin