diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js
index d73eb2bb0b9..4c7a0562b58 100644
--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
@@ -37,19 +37,11 @@ function (angular, $, config) {
           var getter = $parse(attr.type), panelType = getter($scope);
           var newScope = $scope.$new();
 
-          $scope.kbnJqUiDraggableOptions = {
-            revert: 'invalid',
-            helper: function() {
-              return $('<div style="width:200px;height:100px;background: rgba(100,100,100,0.50);"/>');
-            },
-            placeholder: 'keep'
-          };
-
           // compile the module and uncloack. We're done
           function loadModule($module) {
             $module.appendTo(elem);
             elem.wrap(container);
-            /* jshint indent:false */
+
             $compile(elem.contents())(newScope);
             elem.removeClass("ng-cloak");
 
@@ -81,7 +73,6 @@ function (angular, $, config) {
             $module.first().find('.panel-header').nextAll().wrapAll(content);
             loadModule($module);
           });
-
         }
       };
     });
diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
index 6f6b0d92a6c..f9bf9ebc6f4 100644
--- a/src/app/panels/graph/module.html
+++ b/src/app/panels/graph/module.html
@@ -24,7 +24,7 @@
 
 	<div class="clearfix"></div>
 
-	<div class="gf-box" ng-if="editMode">
+	<div class="gf-box gf-box-full-edit" ng-if="editMode">
 		<div class="gf-box-header">
 			<div class="gf-box-title">
 				<i class="fa fa-bar-chart"></i>
diff --git a/src/css/less/gfbox.less b/src/css/less/gfbox.less
index 2e58913a833..ad1dc7a8bb3 100644
--- a/src/css/less/gfbox.less
+++ b/src/css/less/gfbox.less
@@ -5,6 +5,10 @@
   border: 1px solid @grafanaTargetFuncBackground;
 }
 
+.gf-box-full-edit {
+  margin: 30px 0 0 0;
+}
+
 .gf-box-header-close-btn {
   float: right;
   padding: 0;
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 451431b9d76..2a5326a7e07 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -88,11 +88,11 @@
   position: fixed;
   left: 0px;
   right: 0px;
-  top: 51px;
+  top: 55px;
   height: 100%;
-  padding: 0 10px;
+  padding: 0;
   background: @grafanaPanelBackground;
-  overflow-y: scroll;
+  overflow-y: auto;
   height: 100%;
 
   .panel-content {
@@ -102,10 +102,12 @@
   .dropdown-menu {
     margin-bottom: 70px;
   }
-
   .panel-menu {
     top: 0px;
   }
+  .panel-title-container {
+    padding: 8px;
+  }
 }
 
 .panel-menu {