diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
index 0d418e5e8cd..b7751d98e50 100644
--- a/src/app/panels/graph/module.html
+++ b/src/app/panels/graph/module.html
@@ -21,14 +21,23 @@
 
   <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>
+				Chart settings
+			</div>
 
-    <div class="tab-content" ng-repeat="tab in panelMeta.fullEditorTabs" ng-if="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/partials/dasheditor.html b/src/app/partials/dasheditor.html
index 3fd45081e8a..b9b95715b21 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -59,22 +59,6 @@
 						</tr>
 					</table>
 				</div>
-				<div class="span4">
-					<div class="editor-row">
-						<div class="section">
-							<h5>Add Row</h5>
-							<div class="editor-option">
-								<label class="small">Title</label>
-								<input type="text" class="input-normal" ng-model='row.title' placeholder="New row"></input>
-							</div>
-							<div class="editor-option">
-								<label class="small">Height</label>
-								<input type="text" class="input-mini" ng-model='row.height'></input>
-							</div>
-						</div>
-						<button ng-click="add_row(dashboard,row); reset_row();" class="btn btn-success">Create Row</button>
-					</div>
-				</div>
 			</div>
 		</div>
 
@@ -107,8 +91,8 @@
 </div>
 
 <div class="dashboard-editor-footer">
-	<div class="pull-left grafana-version-footer" ng-if="editor.index == 0">
-		<span class="editor-option small">
+	<div class="pull-left" ng-if="editor.index == 0">
+		<span class="editor-option small" style="line-height: 20px;">
 			Grafana version: {{grafanaVersion}}
 		</span>
 		<span> | <a ng-click="toggleConsole()" ng-show="!consoleEnabled">enable console</a> <a ng-click="toggleConsole()" ng-show="consoleEnabled">disable console</a></span>
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 83b2aa4eaa7..4d44dc1d33e 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -522,12 +522,6 @@ select.grafana-target-segment-input {
   padding: 10px;
 }
 
-.grafana-version-footer {
-  padding-top: 15px;
-  text-align: left;
-}
-
-
 .metrics-editor-help:hover {
   .hide {
     display: block;
@@ -562,7 +556,6 @@ select.grafana-target-segment-input {
 .dashboard-editor-body {
   padding: 20px 10px;
   min-height: 100px;
-  overflow: hidden;
 }
 
 .dashboard-editor-footer {