diff --git a/package.json b/package.json
index 6030416d1dc..11152664083 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "grunt-jscs": "~1.5.x",
     "grunt-sync": "^0.4.1",
     "karma-sinon": "^1.0.3",
-    "lodash": "^4.0.0",
+    "lodash": "^2.4.1",
     "sinon": "1.16.1",
     "systemjs-builder": "^0.15.7",
     "tslint": "^3.2.1",
diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index 2ba53897696..02369f5f608 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -10,15 +10,13 @@
 				</a>
 			</div>
 
-			<span ng-if="ctrl.title">
-				<span class="icon-circle top-nav-icon">
+			<div class="top-nav-btn dashnav-dashboards-btn" ng-if="ctrl.title">
+				<a class="pointer" href="{{ctrl.titleUrl}}">
 					<i ng-class="ctrl.icon"></i>
-				</span>
-				<a ng-href="{{ctrl.titleUrl}}" class="top-nav-title">
-					{{ctrl.title}}
+					<span class="dashboard-title">{{ctrl.title}}</span>
+					<!-- <i class="fa fa&#45;caret&#45;down"></i> -->
 				</a>
-				<i ng-show="ctrl.subnav" class="top-nav-breadcrumb-icon fa fa-angle-right"></i>
-			</span>
+			</div>
 
 			<div ng-transclude></div>
 		</div>
diff --git a/public/app/core/components/navbar/navbar.ts b/public/app/core/components/navbar/navbar.ts
index 82168f72c29..f4bea8f089a 100644
--- a/public/app/core/components/navbar/navbar.ts
+++ b/public/app/core/components/navbar/navbar.ts
@@ -17,15 +17,14 @@ export function navbarDirective() {
     templateUrl: 'public/app/core/components/navbar/navbar.html',
     controller: NavbarCtrl,
     bindToController: true,
-    controllerAs: 'ctrl',
     transclude: true,
+    controllerAs: 'ctrl',
     scope: {
       title: "@",
       titleUrl: "@",
     },
     link: function(scope, elem, attrs, ctrl) {
       ctrl.icon = attrs.icon;
-      ctrl.subnav = attrs.subnav;
     }
   };
 }
diff --git a/public/app/features/apps/partials/edit.html b/public/app/features/apps/partials/edit.html
index e743657f17a..7def9a3c96e 100644
--- a/public/app/features/apps/partials/edit.html
+++ b/public/app/features/apps/partials/edit.html
@@ -1,7 +1,4 @@
-<navbar title="Plugins" title-url="Plugins" icon="icon-gf icon-gf-apps" subnav="true">
-	<ul class="nav">
-		<li class="active" ><a href="apps/edit/{{ctrl.current.type}}">{{ctrl.appModel.name}}</a></li>
-	</ul>
+<navbar title="Plugins" title-url="Plugins" icon="icon-gf icon-gf-apps">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/apps/partials/page.html b/public/app/features/apps/partials/page.html
index 506708fa654..0b3f983124d 100644
--- a/public/app/features/apps/partials/page.html
+++ b/public/app/features/apps/partials/page.html
@@ -1,7 +1,4 @@
-<navbar icon="fa fa-fw fa-cubes" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.appId}}/edit" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="apps/{{ctrl.appId}}/ctrl.page.slug">{{ctrl.page.name}}</a></li>
-	</ul>
+<navbar icon="fa fa-fw fa-cubes" title="{{ctrl.appModel.name}}" title-url="apps/{{ctrl.appId}}/edit">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/dashboard/partials/import.html b/public/app/features/dashboard/partials/import.html
index a599d6a1797..f2bb97649af 100644
--- a/public/app/features/dashboard/partials/import.html
+++ b/public/app/features/dashboard/partials/import.html
@@ -1,7 +1,4 @@
-<navbar icon="fa fa-th-large" title="Dashboards" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="import/dashboard">Import</a></li>
-	</ul>
+<navbar title="Import" title-url="import/dashboard" icon="fa fa-download">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 57e7b7f2c55..7a13ce2df1d 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -1,15 +1,7 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-datasources"></i>
-		<span class="dashboard-title">Data Sources</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
-<!-- 	<ul class="nav">
-		<li ng-class="{active: isNew}" ng-show="isNew"><a href="datasources/new">Add new</a></li>
-		<li class="active" ng-show="!isNew"><a href="datasources/edit/{{current.name}}">{{current.name}}</a></li>
-	</ul> -->
+<navbar
+	title="Data Sources"
+	title-url="datasources"
+	icon="icon-gf icon-gf-datasources">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html
index 54276454be1..e1c7f3555f8 100644
--- a/public/app/features/datasources/partials/list.html
+++ b/public/app/features/datasources/partials/list.html
@@ -1,11 +1,7 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-datasources"></i>
-		<span class="dashboard-title">Data Sources</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
+<navbar
+	title="Data Sources"
+	title-url="datasources"
+	icon="icon-gf icon-gf-datasources">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/org/partials/invite.html b/public/app/features/org/partials/invite.html
index 51ba5505b8c..6b3c1afffaf 100644
--- a/public/app/features/org/partials/invite.html
+++ b/public/app/features/org/partials/invite.html
@@ -51,7 +51,7 @@
 				</div>
 			</div>
 
-			<div style="margin-top: 20px;">
+			<div style="margin-top: 20px; text-align: left;">
 				<a class="btn btn-inverse" ng-click="addInvite()">+ Invite another</a>
 				<div class="form-inline" style="margin-top: 20px">
 					<editor-checkbox text="Skip sending invite email" model="options.skipEmails" change="targetBlur()"></editor-checkbox>
diff --git a/public/app/features/org/partials/newOrg.html b/public/app/features/org/partials/newOrg.html
index 03d1ce410a9..58579c36e8b 100644
--- a/public/app/features/org/partials/newOrg.html
+++ b/public/app/features/org/partials/newOrg.html
@@ -1,7 +1,4 @@
-<navbar title="Organization" icon="fa fa-fw fa-users" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="org/new">New organization</a></li>
-	</ul>
+<navbar title="Organization" icon="icon-gf icon-gf-users">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html
index 9a837b30381..091cd318f4c 100644
--- a/public/app/features/org/partials/orgApiKeys.html
+++ b/public/app/features/org/partials/orgApiKeys.html
@@ -1,7 +1,4 @@
-<navbar icon="fa fa-fw fa-users" title="Organization" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="org/apikeys">API Keys</a></li>
-	</ul>
+<navbar icon="icon-gf icon-gf-users" title="Organization">
 </navbar>
 
 <div class="page-container">
@@ -26,9 +23,9 @@
 				</li>
 				</ul>
 				<button class="btn btn-success" style="margin-left:15px; vertical-algin:middle;" ng-click="addToken()">Add</button>
-			
+
 				<div class="clearfix"></div>
-			
+
 		</form>
 
 		<table class="filter-table">
diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html
index d6e40952915..f3b37923442 100644
--- a/public/app/features/org/partials/orgDetails.html
+++ b/public/app/features/org/partials/orgDetails.html
@@ -1,21 +1,10 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-users"></i>
-		<span class="dashboard-title">Organization Preferences</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
+<navbar icon="icon-gf icon-gf-users" title="Organization">
 </navbar>
 
 <div class="page-container">
 	<div class="page">
 
-		<h1>Organization</h1>
-
-		<section class="simple-box">
-			<h3 class="">Preferences</h3>
-		</section>
+		<h1>Preferences</h1>
 
 		<form name="orgForm">
 			<div class="norm-form last">
@@ -98,6 +87,10 @@
 		</form>
 	</div>
 
+	<h3>Org. Users</h3>
+	<a href="org/users" class="btn btn-inverse">Manage</a>
+
+
 </div>
 
 
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index 8e391d3a467..e765be865d4 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -1,11 +1,4 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-users"></i>
-		<span class="dashboard-title">Organization Users</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
+<navbar icon="icon-gf icon-gf-users" title="Organization Users">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/playlist/partials/playlist.html b/public/app/features/playlist/partials/playlist.html
index ae37408169d..e1debffdc5d 100644
--- a/public/app/features/playlist/partials/playlist.html
+++ b/public/app/features/playlist/partials/playlist.html
@@ -1,18 +1,5 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-  <a class="pointer" ng-click="openSearch()">
-    <i class="fa fa-fw fa-list"></i>
-    <span class="dashboard-title">Playlist</span>
-    <i class="fa fa-caret-down"></i>
-  </a>
-</div>
+<navbar icon="fa fa-fw fa-list" title="Playlist">
 </navbar>
-<!-- <navbar title="Playlists" title-url="playlists" icon="fa fa-fw fa-list" subnav="true">
-	<ul class="nav">
-		<li ng-class="{active: ctrl.isNew()}" ng-show="ctrl.isNew()"><a href="datasources/create">New</a></li>
-		<li class="active" ng-show="!ctrl.isNew()"><a href="playlists/edit/{{ctrl.playlist.id}}">{{ctrl.playlist.name}}</a></li>
-	</ul>
-</navbar> -->
 
 <div class="page-container" ng-form="playlistEditForm">
   <div class="page">
diff --git a/public/app/features/playlist/partials/playlists.html b/public/app/features/playlist/partials/playlists.html
index 673168531fc..037e1b9529b 100644
--- a/public/app/features/playlist/partials/playlists.html
+++ b/public/app/features/playlist/partials/playlists.html
@@ -1,11 +1,4 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-  <a class="pointer" ng-click="openSearch()">
-    <i class="fa fa-fw fa-list"></i>
-    <span class="dashboard-title">New Playlist</span>
-    <i class="fa fa-caret-down"></i>
-  </a>
-</div>
+<navbar icon="fa fa-fw fa-list" title="New Playlist">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/profile/partials/password.html b/public/app/features/profile/partials/password.html
index 17647503f58..8fc3eeb61cd 100644
--- a/public/app/features/profile/partials/password.html
+++ b/public/app/features/profile/partials/password.html
@@ -1,11 +1,4 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-users"></i>
-		<span class="dashboard-title">Change Password</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
+<navbar icon="icon-gf icon-gf-users" title="Profile" title-url="profile">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/profile/partials/profile.html b/public/app/features/profile/partials/profile.html
index a684e1f36b8..f262a0bf12b 100644
--- a/public/app/features/profile/partials/profile.html
+++ b/public/app/features/profile/partials/profile.html
@@ -1,11 +1,4 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-	<a class="pointer" ng-click="openSearch()">
-		<i class="icon-gf icon-gf-users"></i>
-		<span class="dashboard-title">Profile</span>
-		<i class="fa fa-caret-down"></i>
-	</a>
-</div>
+<navbar icon="icon-gf icon-gf-users" title="Profile">
 </navbar>
 
 <div class="page-container">
diff --git a/public/app/features/snapshot/partials/snapshots.html b/public/app/features/snapshot/partials/snapshots.html
index 3cb78a49d3f..f6e54b9f0c5 100644
--- a/public/app/features/snapshot/partials/snapshots.html
+++ b/public/app/features/snapshot/partials/snapshots.html
@@ -1,11 +1,4 @@
-<navbar> 
-<div class="top-nav-btn dashnav-dashboards-btn" >
-  <a class="pointer" ng-click="openSearch()">
-    <i class="icon-gf icon-gf-snapshot"></i>
-    <span class="dashboard-title">Snapshots</span>
-    <i class="fa fa-caret-down"></i>
-  </a>
-</div>
+<navbar icon="icon-gf icon-gf-snapshot" title="Snapshots">
 </navbar>
 
 <div class="page-container">