diff --git a/src/app/panels/overview/module.html b/src/app/panels/overview/module.html
index cc682893a87..b758e7945db 100644
--- a/src/app/panels/overview/module.html
+++ b/src/app/panels/overview/module.html
@@ -1,6 +1,4 @@
-<div	ng-controller='OverviewCtrl'
-			style="min-height:{{panel.height || row.height}}"
-			ng-class="{'panel-fullscreen': fullscreen}">
+<div	ng-controller='OverviewCtrl'>
 
 	<h2>hello</h2>
 	<div class="overview-series-list">
@@ -11,15 +9,23 @@
 	</div>
   <div class="clearfix"></div>
 
-  <div class="panel-full-edit-tabs" ng-if="editMode">
-    <div ng-model="editor.index" bs-tabs>
-      <div ng-repeat="tab in editorTabs" data-title="{{tab}}">
-      </div>
-    </div>
+	<div style="margin-top: 30px" ng-if="editMode">
+		<div class="dashboard-editor-header">
+			<div class="dashboard-editor-title">
+				<i class="icon icon-bar-chart"></i>
+			  Panel settings
+			</div>
 
-    <div class="tab-content" ng-repeat="tab in panelMeta.fullEditorTabs" ng-show="editorTabs[editor.index] == tab.title">
-      <div ng-include src="tab.src"></div>
-    </div>
-  </div>
+			<div ng-model="editor.index" bs-tabs>
+				<div ng-repeat="tab in editorTabs" data-title="{{tab}}">
+				</div>
+			</div>
+		</div>
 
+		<div class="dashboard-editor-body">
+			<div ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="editorTabs[editor.index] == tab.title">
+				<div ng-include src="tab.src"></div>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/src/app/panels/overview/module.js b/src/app/panels/overview/module.js
index 7a876321e0f..e369c404f78 100644
--- a/src/app/panels/overview/module.js
+++ b/src/app/panels/overview/module.js
@@ -11,7 +11,7 @@ function (angular, app, _, timeSeries) {
   var module = angular.module('grafana.panels.overview', []);
   app.useModule(module);
 
-  module.controller('OverviewCtrl', function($scope, panelSrv) {
+  module.controller('OverviewCtrl', function($scope, panelSrv, timeSrv) {
 
     $scope.panelMeta = {
       description : "A panel to show an overview of different metrics through avg, total, current numbers and sparklines",
@@ -39,7 +39,7 @@ function (angular, app, _, timeSeries) {
     };
 
     $scope.get_data = function() {
-      $scope.rangeUnparsed = $scope.filter.timeRange(false);
+      $scope.rangeUnparsed = timeSrv.timeRange(false);
 
       var metricsQuery = {
         range: $scope.rangeUnparsed,