diff --git a/src/app/panels/singlestat/module.html b/src/app/panels/singlestat/module.html
index 15711ea2adb..43c120fd92c 100644
--- a/src/app/panels/singlestat/module.html
+++ b/src/app/panels/singlestat/module.html
@@ -4,9 +4,9 @@
 
   <div class="clearfix"></div>
 
-	<div style="margin-top: 30px" ng-if="editMode">
-		<div class="dashboard-editor-header">
-			<div class="dashboard-editor-title">
+	<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-dashboard"></i>
 			  Singlestat
 			</div>
@@ -17,7 +17,7 @@
 			</div>
 		</div>
 
-		<div class="dashboard-editor-body">
+		<div class="gf-box-body">
 			<div ng-repeat="tab in panelMeta.editorTabs" ng-if="editor.index === $index">
 				<div ng-include src="tab.src"></div>
 			</div>
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 2248ab2a645..b699c52cc65 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -34,8 +34,8 @@
 						<li><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>
 						<li><a class="pointer" ng-click="openEditView('templating');">Templating</a></li>
-						<li><a class="pointer" ng-click="openEditView('settings');">Export</a></li>
-						<li><a class="pointer" ng-click="openEditView('settings');">View JSON</a></li>
+						<li><a class="pointer" ng-click="exportDashboard();">Export</a></li>
+						<li><a class="pointer" ng-click="editJson();">View JSON</a></li>
 					</ul>
 				</li>
 			</ul>
diff --git a/src/app/partials/edit_json.html b/src/app/partials/edit_json.html
index 4a8580dfcc5..8635174e5a6 100644
--- a/src/app/partials/edit_json.html
+++ b/src/app/partials/edit_json.html
@@ -1,19 +1,22 @@
 <div ng-controller="JsonEditorCtrl">
 
-	<div class="dashboard-editor-header">
-		<div class="dashboard-editor-title">
+	<div class="gf-box-header">
+		<div class="gf-box-title">
 			<i class="fa fa-edit"></i>
 		  JSON
 		</div>
+
+		<button class="gf-box-header-close-btn" ng-click="dismiss();">
+			<i class="fa fa-remove"></i>
+		</button>
 	</div>
 
-	<div class="dashboard-editor-body" style="height: 500px">
-		<textarea ng-model="json" rows="20" spellcheck="false" style="width: 90%;"></textarea>
-	</div>
+	<div class="gf-box-body" style="height: 500px">
+		<textarea ng-model="json" rows="20" spellcheck="false" style="width: 100%;"></textarea>
+		<br>
+		<br>
 
-	<div class="dashboard-editor-footer">
-		<button type="button" class="btn btn-success pull-left" ng-show="canUpdate" ng-click="update(); dismiss();">Update</button>
-		<button type="button" class="btn btn-success pull-right" ng-click="dismiss();">Close</button>
+		<button type="button" class="btn btn-success" ng-show="canUpdate" ng-click="update(); dismiss();">Update</button>
 	</div>
 
 </div>
diff --git a/src/app/partials/roweditor.html b/src/app/partials/roweditor.html
index 450d8a01a3e..4c77a0bf814 100644
--- a/src/app/partials/roweditor.html
+++ b/src/app/partials/roweditor.html
@@ -1,56 +1,54 @@
-<div class="dashboard-editor-header">
-	<div class="dashboard-editor-title">
+<div class="gf-box-header">
+	<div class="gf-box-title">
 		<i class="fa fa-th-list"></i>
 		Row settings
 	</div>
 
 	<div ng-model="editor.index" bs-tabs style="text-transform:capitalize;">
-    <div ng-repeat="tab in ['General','Panels']" data-title="{{tab}}">
+		<div ng-repeat="tab in ['General','Panels']" data-title="{{tab}}">
 		</div>
 	</div>
 
+	<button class="gf-box-header-close-btn" ng-click="dismiss();">
+		<i class="fa fa-remove"></i>
+	</button>
 </div>
 
-<div class="dashboard-editor-body">
+<div class="gf-box-body">
 
- <div class="editor-row" ng-if="editor.index == 0">
-    <div class="editor-option">
-      <label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
-    </div>
-    <div class="editor-option">
-      <label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
-    </div>
+	<div class="editor-row" ng-if="editor.index == 0">
+		<div class="editor-option">
+			<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
+		</div>
+		<div class="editor-option">
+			<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
+		</div>
 		<editor-opt-bool text="Editable" model="row.editable"></editor-opt-bool>
 		<editor-opt-bool text="Show title" model="row.showTitle"></editor-opt-bool>
 	</div>
-  <div class="row-fluid" ng-if="editor.index == 1">
-    <div class="span12">
+	<div class="row-fluid" ng-if="editor.index == 1">
+		<div class="span12">
 			<table class="grafana-options-table" style="max-width: 400px; width: auto">
-        <thead>
-          <th>Title</th>
-          <th>Type</th>
-          <th>Span</span></th>
-          <th></th>
-          <th></th>
-					<th></th>
-        </thead>
-        <tr ng-repeat="panel in row.panels">
-          <td style="width: 95%">{{panel.title}}</td>
-          <td>{{panel.type}}</td>
-          <td><select ng-hide="panel.sizeable == false" class="input-mini" style="margin-bottom: 0;" ng-model="panel.span" ng-options="size for size in [1,2,3,4,5,6,7,8,9,10,11,12]"></select></td>
-					<td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
-					<td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
-					<td>
-						<a ng-click="row.panels = _.without(row.panels,panel)" class="btn btn-danger btn-small">
-							<i class="fa fa-remove"></i>
-						</a>
-					</td>
-				</tr>
-			</table>
-		</div>
+				<thead>
+					<th>Title</th>
+					<th>Type</th>
+					<th>Span</span></th>
+				<th></th>
+				<th></th>
+				<th></th>
+			</thead>
+			<tr ng-repeat="panel in row.panels">
+				<td style="width: 95%">{{panel.title}}</td>
+				<td>{{panel.type}}</td>
+				<td><select ng-hide="panel.sizeable == false" class="input-mini" style="margin-bottom: 0;" ng-model="panel.span" ng-options="size for size in [1,2,3,4,5,6,7,8,9,10,11,12]"></select></td>
+				<td><i ng-click="_.move(row.panels,$index,$index-1)" ng-hide="$first" class="pointer fa fa-arrow-up"></i></td>
+				<td><i ng-click="_.move(row.panels,$index,$index+1)" ng-hide="$last" class="pointer fa fa-arrow-down"></i></td>
+				<td>
+					<a ng-click="row.panels = _.without(row.panels,panel)" class="btn btn-danger btn-small">
+						<i class="fa fa-remove"></i>
+					</a>
+				</td>
+			</tr>
+		</table>
 	</div>
 </div>
-
-<div class="dashboard-editor-footer">
-	<button type="button" class="btn btn-success pull-right" ng-click="editor.index=0;dismiss();reset_panel();close_edit()">Close</button>
-</div>
diff --git a/src/app/partials/search.html b/src/app/partials/search.html
index c625fafe098..6907fdc1005 100644
--- a/src/app/partials/search.html
+++ b/src/app/partials/search.html
@@ -1,7 +1,7 @@
-<div ng-controller="SearchCtrl" ng-init="init()">
+<div ng-controller="SearchCtrl" ng-init="init()" class="search-box">
 
-	<div class="dashboard-editor-header">
-		<div class="dashboard-editor-title" style="border: 0; line-height: 41px;">
+	<div class="gf-box-header">
+		<div class="gf-box-title" style="border: 0; line-height: 41px;">
 			<i class="fa fa-search"></i>
 			Search
 		</div>