diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index ab33b9ae2e9..5c1e08de1f6 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -13,7 +13,7 @@
 				<span class="icon-circle top-nav-icon">
 					<i ng-class="ctrl.icon"></i>
 				</span>
-				<a ng-href="{{ctl.titleUrl}}" class="top-nav-title">
+				<a ng-href="{{ctrl.titleUrl}}" class="top-nav-title">
 					{{ctrl.title}}
 				</a>
 				<i ng-show="ctrl.subnav" class="top-nav-breadcrumb-icon fa fa-angle-right"></i>
diff --git a/public/app/features/profile/partials/password.html b/public/app/features/profile/partials/password.html
index 24e828ee790..df940dd14a5 100644
--- a/public/app/features/profile/partials/password.html
+++ b/public/app/features/profile/partials/password.html
@@ -1,8 +1,8 @@
-<topnav title="Profile" title-url="profile" icon="fa fa-user" subnav="true">
+<navbar title="Profile" title-url="profile" icon="fa fa-fw fa-user" subnav="true">
 	<ul class="nav">
 		<li class="active"><a href="profile/password">Change password</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
@@ -47,7 +47,11 @@
 			</div>
 
 			<br>
-			<button type="submit" class="pull-right btn btn-success" ng-click="changePassword()">Change Password</button>
+			<div class="pull-right">
+				<button type="submit" class="btn btn-success" ng-click="changePassword()">Change Password</button>
+				&nbsp;
+				<a class="btn btn-inverse" href="profile">Cancel</a>
+			</div>
 		</form>
 
 	</div>
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html
index 425d2bac0fe..5f6f75f090f 100644
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -1,10 +1,10 @@
-<topnav title="Account" title-url="profile" icon="fa fa-fw fa-user">
-</topnav>
+<navbar title="Profile" title-url="profile" icon="fa fa-fw fa-user">
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
 
-		<h1>Account & Preferences</h1>
+		<h1>Profile & Preferences</h1>
 
 		<section class="simple-box">
 			<h3 class="simple-box-header">Preferences</h3>