diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html
index 9b93297ef75..82241ec1923 100755
--- a/src/app/partials/graphite/editor.html
+++ b/src/app/partials/graphite/editor.html
@@ -46,7 +46,7 @@
         </li>
       </ul>
 
-      <ul class="grafana-target-controls-left">
+      <ul class="grafana-segment-list">
 				<li class="grafana-target-segment" style="min-width: 15px; text-align: center">
 					{{targetLetter}}
         </li>
diff --git a/src/app/partials/influxdb/editor.html b/src/app/partials/influxdb/editor.html
index afe7b59d503..70da2fbf282 100644
--- a/src/app/partials/influxdb/editor.html
+++ b/src/app/partials/influxdb/editor.html
@@ -87,16 +87,28 @@
 				<!-- Raw Query mode  -->
 				<ul class="grafana-segment-list" ng-show="target.rawQuery">
 					<li class="grafana-target-segment">
+						<i class="icon-eye-open invisible"></i>
+					</li>
+					<li class="grafana-target-segment">
             alias
           </li>
           <li>
             <input type="text"
-                   class="input-medium grafana-target-segment-input"
+                   class="input-medium grafana-target-text-input"
                    ng-model="target.alias"
                    spellcheck='false'
                    placeholder="alias"
                    ng-blur="get_data()">
           </li>
+					<li class="grafana-target-segment">
+						group by time
+					</li>
+					<li>
+						<input type="text" class="input-mini grafana-target-text-input" ng-model="target.interval"
+									 spellcheck='false' placeholder="{{interval}}" data-placement="right"
+									 bs-tooltip="'Leave blank for auto handling based on time range and panel width'"
+									 ng-model-onblur ng-change="get_data()" >
+					</li>
 				</ul>
 
 				<!-- Query editor mode -->
diff --git a/src/app/partials/opentsdb/editor.html b/src/app/partials/opentsdb/editor.html
index 32d34dab7a8..efc54af8e05 100644
--- a/src/app/partials/opentsdb/editor.html
+++ b/src/app/partials/opentsdb/editor.html
@@ -30,7 +30,7 @@
           </li>
         </ul>
 
-        <ul class="grafana-target-controls-left">
+        <ul class="grafana-target-segment-list">
           <li>
             <a  class="grafana-target-segment"
                 ng-click="target.hide = !target.hide; get_data();"
diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html
index b1fb5f85267..306bb710690 100644
--- a/src/app/partials/submenu.html
+++ b/src/app/partials/submenu.html
@@ -3,7 +3,7 @@
 			<div class="grafana-target-inner-wrapper">
 				<div class="grafana-target-inner">
 
-					<ul class="grafana-target-controls-left">
+					<ul class="grafana-segment-list">
 						<li class="grafana-target-segment">
 							<div class="dropdown">
 								<a class="pointer" data-toggle="dropdown">
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index ce54f9b172a..d2a375521a5 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -61,10 +61,6 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
       });
     };
 
-    InfluxDatasource.prototype._getGroupByTimeInterval = function(target, options) {
-      return target.interval || options.interval;
-    };
-
     InfluxDatasource.prototype.annotationQuery = function(annotation, rangeUnparsed) {
       var timeFilter = getTimeFilter({ range: rangeUnparsed });
       var query = _.template(annotation.query, { timeFilter: timeFilter, "$timeFilter": timeFilter }, this.templateSettings);
diff --git a/src/test/specs/influxdb-datasource-specs.js b/src/test/specs/influxdb-datasource-specs.js
index 7bbbe72a22d..f966c7345ca 100644
--- a/src/test/specs/influxdb-datasource-specs.js
+++ b/src/test/specs/influxdb-datasource-specs.js
@@ -70,18 +70,6 @@ define([
 
     });
 
-    describe('When calculating group by time interval', function() {
-      it('if blank should use auto interval', function() {
-        var result = ctx.ds._getGroupByTimeInterval({}, { interval:'0.1s' });
-        expect(result).to.be('0.1s');
-      });
-
-      it('if target interval specified should use that interval', function() {
-        var result = ctx.ds._getGroupByTimeInterval({interval: '10s'}, { interval:'0.1s' });
-        expect(result).to.be('10s');
-      });
-
-    });
   });
 
 });