diff --git a/public/app/plugins/datasource/stackdriver/partials/query.editor.html b/public/app/plugins/datasource/stackdriver/partials/query.editor.html
index 42b93c1826e..e36e2b0b84d 100755
--- a/public/app/plugins/datasource/stackdriver/partials/query.editor.html
+++ b/public/app/plugins/datasource/stackdriver/partials/query.editor.html
@@ -35,7 +35,7 @@
     <div class="gf-form">
       <label class="gf-form-label query-keyword width-9">Aggregation</label>
       <div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
-        <select class="gf-form-input width-12" ng-model="ctrl.target.aggregation.crossSeriesReducer" ng-options="f.value as f.text for f in ctrl.aggOptions"
+        <select class="gf-form-input width-12" ng-model="ctrl.target.aggregation.crossSeriesReducer" ng-options="f.value as f.text for f in ctrl.stackdriverConstants.aggOptions"
           ng-change="ctrl.refresh()"></select>
       </div>
     </div>
@@ -44,7 +44,7 @@
         <a ng-click="ctrl.target.showAggregationOptions = !ctrl.target.showAggregationOptions">
           <i class="fa fa-caret-down" ng-show="ctrl.target.showAggregationOptions"></i>
           <i class="fa fa-caret-right" ng-hide="ctrl.target.showAggregationOptions"></i>
-          Options
+          Advanced Options
         </a>
       </label>
     </div>
@@ -56,6 +56,10 @@
         <select class="gf-form-input width-14" ng-model="ctrl.target.aggregation.secondaryCrossSeriesReducer" ng-options="f.value as f.text for f in ctrl.stackdriverConstants.aggOptions"
           ng-change="ctrl.refresh()"></select>
       </div>
+
+      <div class="gf-form gf-form--grow">
+        <div class="gf-form-label gf-form-label--grow"></div>
+      </div>
     </div>
     <div class="gf-form offset-width-9">
       <label class="gf-form-label query-keyword width-12">Aligner</label>
@@ -63,6 +67,10 @@
         <select class="gf-form-input width-14" ng-model="ctrl.target.aggregation.perSeriesAligner" ng-options="f.value as f.text for f in ctrl.stackdriverConstants.alignOptions"
           ng-change="ctrl.refresh()"></select>
       </div>
+
+      <div class="gf-form gf-form--grow">
+        <div class="gf-form-label gf-form-label--grow"></div>
+      </div>
     </div>
     <div class="gf-form offset-width-9">
       <label class="gf-form-label query-keyword width-12">Alignment Period</label>
@@ -70,6 +78,10 @@
         <select class="gf-form-input width-14" ng-model="ctrl.target.aggregation.alignmentPeriod" ng-options="f.value as f.text for f in ctrl.stackdriverConstants.alignmentPeriods"
           ng-change="ctrl.refresh()"></select>
       </div>
+
+      <div class="gf-form gf-form--grow">
+        <div class="gf-form-label gf-form-label--grow"></div>
+      </div>
     </div>
   </div>
   <div class="gf-form-inline">