diff --git a/src/app/features/account/partials/datasources.html b/src/app/features/account/partials/datasources.html
index 25de55c4d4c..65b52e4c3e0 100644
--- a/src/app/features/account/partials/datasources.html
+++ b/src/app/features/account/partials/datasources.html
@@ -109,12 +109,11 @@
 				</div>
 			</div>
 
-			<div class="dashboard-editor-footer" style="margin-top: 20px">
-				<button type="submit" class="btn btn-success" ng-show="editor.index === 1" ng-click="add()">Add</button>
-				<button type="submit" class="btn btn-success" ng-show="editor.index === 2 && !currentIsNew" ng-click="update()">Update</button>
-				<button type="submit" class="btn btn-info" ng-show="editor.index === 2 && !currentIsNew" ng-click="cancel()">Cancel</button>
-			</div>
-
+			<br>
+			<button type="submit" class="btn btn-success" ng-show="editor.index === 1" ng-click="add()">Add</button>
+			<button type="submit" class="btn btn-success" ng-show="editor.index === 2 && !currentIsNew" ng-click="update()">Update</button>
+			<button type="submit" class="btn btn-inverse" ng-show="editor.index === 2 && !currentIsNew" ng-click="cancel()">Cancel</button>
+			<br>
 		</form>
 	</div>
 </div>
diff --git a/src/app/features/account/partials/import.html b/src/app/features/account/partials/import.html
index 3ce6e101b1b..28c695ca068 100644
--- a/src/app/features/account/partials/import.html
+++ b/src/app/features/account/partials/import.html
@@ -1,15 +1,19 @@
-<div ng-include="'app/partials/navbar.html'" ng-init="pageTitle='Import'"></div>
+<topnav toggle="toggleSideMenu()"
+				title="Import"
+				icon="fa fa-download"
+				show-menu-btn="!grafana.sidemenu">
+</topnav>
 
-<div class="dashboard-edit-view" style="min-height: 500px">
+<div class="gf-box" style="min-height: 500px">
 
-	<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-large"></i>
 			Import Dashboards
 		</div>
 	</div>
 
-	<div class="dashboard-editor-body">
+	<div class="gf-box-body">
 
 		<div class="editor-row">
 			<div class="section">
diff --git a/src/app/features/annotations/partials/editor.html b/src/app/features/annotations/partials/editor.html
index 1aee712962a..05ea697bc57 100644
--- a/src/app/features/annotations/partials/editor.html
+++ b/src/app/features/annotations/partials/editor.html
@@ -73,10 +73,12 @@
 			<div ng-include src="currentDatasource.editorSrc">
 			</div>
 
-			<div class="dashboard-editor-footer">
-				<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button>
-				<button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
-			</div>
+			<br>
+			<button ng-show="editor.index === 1" type="button" class="btn btn-success" ng-click="add()">Add</button>
+			<button ng-show="editor.index === 2" type="button" class="btn btn-success pull-left" ng-click="update();">Update</button>
+			<br>
+			<br>
+
 		</div>
 	</div>
 </div>
diff --git a/src/app/panels/timepicker/custom.html b/src/app/panels/timepicker/custom.html
index a762597eaf2..d6eba698b33 100644
--- a/src/app/panels/timepicker/custom.html
+++ b/src/app/panels/timepicker/custom.html
@@ -1,11 +1,14 @@
-<div class="dashboard-editor-header">
-	<div class="dashboard-editor-title">
+<div class="gf-box-header">
+	<div class="gf-box-title">
 		<i class="fa fa-clock-o"></i>
 		Custom time range
 	</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">
 	<style>
 		.timepicker-to-column {
 			margin-top: 10px;
@@ -73,12 +76,9 @@
 		</form>
 		<div class="clearfix"></div>
 	</div>
-</div>
 
-<div class="dashboard-editor-footer">
 	<form name="input" style="margin-bottom:0">
 		<span class="" ng-hide="input.$valid">Invalid date or range</span>
 		<button ng-click="setAbsoluteTimeFilter(validate(temptime));dismiss();" ng-disabled="!input.$valid" class="btn btn-success">Apply</button>
-		<button ng-click="dismiss();" class="btn btn-success pull-right">Cancel</button>
 	</form>
 </div>
diff --git a/src/app/partials/login.html b/src/app/partials/login.html
index 6a9468727c2..55c1787ae01 100644
--- a/src/app/partials/login.html
+++ b/src/app/partials/login.html
@@ -23,7 +23,7 @@
 							<strong>User</strong>
             </li>
             <li>
-              <input type="text" name="username" class="tight-form-input last" ng-model='formModel.user' placeholder="email or username" style="width: 246px">
+              <input type="text" name="username" class="tight-form-input last" required ng-model='formModel.user' placeholder="email or username" style="width: 246px">
             </li>
           </ul>
           <div class="clearfix"></div>
diff --git a/src/app/partials/navbar.html b/src/app/partials/navbar.html
index 15c675b8d7e..0823495755e 100644
--- a/src/app/partials/navbar.html
+++ b/src/app/partials/navbar.html
@@ -7,11 +7,6 @@
 							section="{{pageSection}}"
 							show-menu-btn="!grafana.sidemenu">
 			</topnav>
-			<ul class="nav">
-				<li>
-					<a href="asd">Data Sources</a>
-				</li>
-			</ul>
 		</div>
 	</div>
 </div>
diff --git a/src/app/partials/paneleditor.html b/src/app/partials/paneleditor.html
index 4084267365b..009cc0d3ed1 100644
--- a/src/app/partials/paneleditor.html
+++ b/src/app/partials/paneleditor.html
@@ -1,5 +1,5 @@
-<div bindonce class="dashboard-editor-header">
-	<div class="dashboard-editor-title">
+<div bindonce class="gf-box-header">
+	<div class="gf-box-title">
 		<i class="fa fa-text-width"></i>
 		<span bo-text="panel.type+' settings'"></span>
 	</div>
@@ -9,14 +9,14 @@
 		</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 ng-repeat="tab in panelMeta.editorTabs" ng-show="editor.index == $index">
 		<div ng-include src="tab.src"></div>
 	</div>
 </div>
 
-<div class="dashboard-editor-footer">
-	<button type="button" class="btn btn-success pull-right" ng-click="editor.index=0;dismiss()">Close</button>
-</div>
diff --git a/src/app/partials/playlist.html b/src/app/partials/playlist.html
index bad66f53824..c0b9f0545fb 100644
--- a/src/app/partials/playlist.html
+++ b/src/app/partials/playlist.html
@@ -1,12 +1,17 @@
 <div ng-controller="PlaylistCtrl" ng-init="init()">
-	<div class="dashboard-editor-header">
-		<div class="dashboard-editor-title">
+	<div class="gf-box-header">
+		<div class="gf-box-title">
 			<i class="fa fa-play"></i>
 			Start dashboard playlist
 		</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">
 			<div class="section">
@@ -52,11 +57,11 @@
 					<input type="text" class="input-small" ng-model="timespan" />
 				</div>
 			</div>
-		</div>
-	</div>
 
-	<div class="dashboard-editor-footer">
-		<button class="btn btn-success" ng-click="start();dismiss();"><i class="fa fa-play"></i> Start</button>
-		<button type="button" class="btn btn-success pull-right" ng-click="dismiss();">Close</button>
+		</div>
+
+		<br>
+		<button class="btn btn-success pull-right" ng-click="start();dismiss();"><i class="fa fa-play"></i> Start</button>
+		<br>
 	</div>
 </div>
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less
index dd8b24b2176..fa0f0e7713f 100644
--- a/src/css/less/bootswatch.dark.less
+++ b/src/css/less/bootswatch.dark.less
@@ -361,7 +361,7 @@ div.subnav {
 .btn {
 	padding: 5px 12px;
 	background-image: none;
-	.box-shadow(none);
+	.box-shadow(0px 0px 8px @bodyBackground);
 	border: none;
 	.border-radius(3px);
 	text-shadow: none;