diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html
index 01d2483c7a7..fa8e89cfdda 100644
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -4,7 +4,7 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="page-wide">
 		<h2>
 			Organizations
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index c7839b755e0..e2c1e0b3c68 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -5,11 +5,11 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="page-wide">
-		<h2>
+		<h1>
 			Users
-		</h2>
+		</h1>
 
     <table class="filter-table form-inline">
 			<thead>
diff --git a/public/app/features/apps/partials/edit.html b/public/app/features/apps/partials/edit.html
index 91b174cb6a3..cb3adece43c 100644
--- a/public/app/features/apps/partials/edit.html
+++ b/public/app/features/apps/partials/edit.html
@@ -5,7 +5,7 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="apps-side-box">
 		<div class="apps-side-box-logo" >
 			<img src="{{ctrl.appModel.info.logos.large}}">
diff --git a/public/app/features/apps/partials/list.html b/public/app/features/apps/partials/list.html
index c8d284712a5..e9de7777d9e 100644
--- a/public/app/features/apps/partials/list.html
+++ b/public/app/features/apps/partials/list.html
@@ -4,9 +4,9 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
   <div class="page-wide" ng-init="ctrl.init()">
-    <h2>Apps</h2>
+    <h1>Apps</h1>
 
 		<div ng-if="!ctrl.apps">
 			<em>No apps defined</em>
diff --git a/public/app/features/dashboard/partials/globalAlerts.html b/public/app/features/dashboard/partials/globalAlerts.html
index a849f50ffdd..2c065c714fb 100644
--- a/public/app/features/dashboard/partials/globalAlerts.html
+++ b/public/app/features/dashboard/partials/globalAlerts.html
@@ -4,9 +4,9 @@
   </ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
   <div class="page-wide">
-    <h2>Global alerts</h2>
+    <h1>Global alerts</h1>
 
     <div class="filter-controls-filters">
       <div class="tight-form last">
diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html
index 018ec4fb146..af77ca36ddb 100644
--- a/public/app/features/datasources/partials/list.html
+++ b/public/app/features/datasources/partials/list.html
@@ -10,6 +10,7 @@
 		</a>
 
 		<h1>Data sources</h1>
+		<br>
 
 		<div ng-if="datasources.length === 0">
 			<em>No data sources defined</em>
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html
index cf1bedd7877..64f3c386907 100644
--- a/public/app/features/org/partials/orgApiKeys.html
+++ b/public/app/features/org/partials/orgApiKeys.html
@@ -4,11 +4,11 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="page-wide">
-		<h2>
+		<h1>
 			API Keys
-		</h2>
+		</h1>
 
 		<form name="addTokenrForm" class="form-inline tight-form last">
 			<ul class="tight-form-list">
diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html
index db965d27633..6dbb98e10f1 100644
--- a/public/app/features/org/partials/orgDetails.html
+++ b/public/app/features/org/partials/orgDetails.html
@@ -1,98 +1,99 @@
 <topnav icon="fa fa-fw fa-users" title="Organization" subnav="true">
 	<ul class="nav">
-		<li class="active"><a href="org">Info</a></li>
+		<li class="active"><a href="org">Preferences</a></li>
 	</ul>
 </topnav>
 
 <div class="page-container">
 	<div class="page">
 
-		<h2>Organization</h2>
+		<h1>Organization</h1>
 
-		<div class="tight-form-section">
-			<h5>Info</h5>
+		<section class="simple-box">
+			<h3 class="simple-box-header">Preferences</h3>
+		</section>
 
-			<form name="orgForm">
-				<div class="tight-form last">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
-							Org. name
-						</li>
-						<li>
-							<input type="text" required ng-model="org.name" class="tight-form-input last" style="width: 475px">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
+		<form name="orgForm">
+			<div class="tight-form last">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 100px">
+						Name
+					</li>
+					<li>
+						<input type="text" required ng-model="org.name" class="tight-form-input last" style="width: 475px">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
 
-				<br>
-				<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
-			</form>
-		</div>
+			<br>
+			<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
+			<br>
+		</form>
 
-		<div class="tight-form-section">
-			<h5>Address</h5>
+		<section class="simple-box">
+			<h3 class="simple-box-header">Address</h3>
+		</section>
 
-			<form name="addressForm">
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
-							Address 1
-						</li>
-						<li>
-							<input type="text" ng-model="address.address1" class="tight-form-input" style="width:193px">
-						</li>
-						<li class="tight-form-item" style="width: 75px">
-							Address 2
-						</li>
-						<li>
-							<input type="text" ng-model="address.address2" class="tight-form-input last" style="width:193px">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
-							City
-						</li>
-						<li>
-							<input type="text" ng-model="address.city" class="tight-form-input" style="width: 193px">
-						</li>
-						<li class="tight-form-item" style="width: 75px">
-							Postal code
-						</li>
-						<li>
-							<input type="text" ng-model="address.zipCode" class="input-medium tight-form-input last" style="width: 193px">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
-				<div class="tight-form last">
-					<ul class="tight-form-list">
-						<li class="tight-form-item" style="width: 100px">
-							State
-						</li>
-						<li>
-							<input type="text" ng-model="address.state" class="tight-form-input" style="width: 193px">
-						</li>
-						<li class="tight-form-item" style="width: 75px">
-							Country
-						</li>
-						<li>
-							<input type="text" ng-model="address.country" class="tight-form-input last" style="width: 193px">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
-
-				<br>
-				<button type="submit" class="pull-right btn btn-success" ng-click="updateAddress()">Update</button>
-
-			</form>
-		</div>
+		<form name="addressForm">
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 100px">
+						Address 1
+					</li>
+					<li>
+						<input type="text" ng-model="address.address1" class="tight-form-input" style="width:193px">
+					</li>
+					<li class="tight-form-item" style="width: 75px">
+						Address 2
+					</li>
+					<li>
+						<input type="text" ng-model="address.address2" class="tight-form-input last" style="width:193px">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 100px">
+						City
+					</li>
+					<li>
+						<input type="text" ng-model="address.city" class="tight-form-input" style="width: 193px">
+					</li>
+					<li class="tight-form-item" style="width: 75px">
+						Postal code
+					</li>
+					<li>
+						<input type="text" ng-model="address.zipCode" class="input-medium tight-form-input last" style="width: 193px">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			<div class="tight-form last">
+				<ul class="tight-form-list">
+					<li class="tight-form-item" style="width: 100px">
+						State
+					</li>
+					<li>
+						<input type="text" ng-model="address.state" class="tight-form-input" style="width: 193px">
+					</li>
+					<li class="tight-form-item" style="width: 75px">
+						Country
+					</li>
+					<li>
+						<input type="text" ng-model="address.country" class="tight-form-input last" style="width: 193px">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
 
+			<br>
+			<button type="submit" class="pull-right btn btn-success" ng-click="updateAddress()">Update</button>
+			<br>
+		</form>
 	</div>
+
 </div>
 
 
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 072cacaf3cf..f82a6c66b34 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -4,7 +4,7 @@
 	</ul>
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="page-wide">
 
 		<button class="btn btn-inverse pull-right" ng-click="openInviteModal()">
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index fe56e515688..9f95c64a566 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -1,6 +1,6 @@
 <topnav icon="fa fa-fw fa-list" title="Playlists"></topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
   <div class="page-wide">
 
 		<button type="submit" class="btn btn-inverse pull-right" ng-click="createPlaylist()">
diff --git a/public/app/features/profile/partials/password.html b/public/app/features/profile/partials/password.html
index dae2fa217e4..24e828ee790 100644
--- a/public/app/features/profile/partials/password.html
+++ b/public/app/features/profile/partials/password.html
@@ -1,6 +1,5 @@
-<topnav title="{{contextSrv.user.name}}" section="Profile" icon="fa fa-user" subnav="true">
+<topnav title="Profile" title-url="profile" icon="fa fa-user" subnav="true">
 	<ul class="nav">
-		<li><a href="profile">Overview</a></li>
 		<li class="active"><a href="profile/password">Change password</a></li>
 	</ul>
 </topnav>
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html
index e02cef60ae4..425d2bac0fe 100644
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -1,7 +1,7 @@
 <topnav title="Account" title-url="profile" icon="fa fa-fw fa-user">
 </topnav>
 
-<div class="page-container" style="background: transparent; border: 0;">
+<div class="page-container">
 	<div class="page-wide">
 
 		<h1>Account & Preferences</h1>