diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index 355a7d910ec..a651c87aa7c 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -64,7 +64,7 @@
 
 	<li>
 		<a class="sidemenu-item" target="_self" ng-hide="ctrl.contextSrv.pinned" ng-click="ctrl.contextSrv.setPinnedState(true)">
-			<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-flag-o"></i></span>
+			<span class="icon-circle sidemenu-icon"><i class="fa fa-fw fa-thumb-tack"></i></span>
 			<span class="sidemenu-item-text">Pin</span>
 		</a>
 	</li>
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index 2b452f646c7..503f3c81ac1 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -24,6 +24,7 @@ export class SideMenuCtrl {
     this.updateMenu();
 
     this.$scope.$on('$routeChangeSuccess', () => {
+      this.updateMenu();
       if (!this.contextSrv.pinned) {
         this.contextSrv.sidemenu = false;
       }
@@ -86,11 +87,11 @@ export class SideMenuCtrl {
            this.switchOrg(org.orgId);
          }
        });
-
-       if (config.allowOrgCreate) {
-         this.orgMenu.push({text: "New organization", icon: "fa fa-fw fa-plus", url: this.getUrl('/org/new')});
-       }
      });
+
+     if (config.allowOrgCreate) {
+       this.orgMenu.push({text: "New organization", icon: "fa fa-fw fa-plus", url: this.getUrl('/org/new')});
+     }
    });
  }
 
@@ -111,19 +112,19 @@ export class SideMenuCtrl {
    });
 
    this.mainLinks.push({
-     text: "Grafana stats",
+     text: "Stats",
      icon: "fa fa-fw fa-bar-chart",
      url: this.getUrl("/admin/stats"),
    });
 
    this.mainLinks.push({
-     text: "Global Users",
+     text: "Users",
      icon: "fa fa-fw fa-user",
      url: this.getUrl("/admin/users"),
    });
 
    this.mainLinks.push({
-     text: "Global Orgs",
+     text: "Organizations",
      icon: "fa fa-fw fa-users",
      url: this.getUrl("/admin/orgs"),
    });
diff --git a/public/app/core/core.ts b/public/app/core/core.ts
index 9ea9f9aa29b..0b120dd85b7 100644
--- a/public/app/core/core.ts
+++ b/public/app/core/core.ts
@@ -15,7 +15,6 @@ import "./directives/ng_model_on_blur";
 import "./directives/password_strenght";
 import "./directives/spectrum_picker";
 import "./directives/tags";
-import "./directives/topnav";
 import "./directives/value_select_dropdown";
 import "./directives/give_focus";
 import './jquery_extended';
diff --git a/public/app/core/directives/topnav.js b/public/app/core/directives/topnav.js
deleted file mode 100644
index 60a09583789..00000000000
--- a/public/app/core/directives/topnav.js
+++ /dev/null
@@ -1,50 +0,0 @@
-define([
-  '../core_module',
-],
-function (coreModule) {
-  'use strict';
-
-  coreModule.default.directive('topnav', function($rootScope, contextSrv) {
-    return {
-      restrict: 'E',
-      transclude: true,
-      scope: {
-        title: "@",
-        section: "@",
-        titleUrl: "@",
-        subnav: "=",
-      },
-      template:
-        '<div class="navbar navbar-static-top"><div class="navbar-inner"><div class="container-fluid">' +
-        '<div class="top-nav">' +
-				'<div class="top-nav-btn top-nav-menu-btn">' +
-					'<a class="pointer" ng-click="contextSrv.toggleSideMenu()">' +
-						'<span class="top-nav-logo-background">' +
-							'<img class="logo-icon" src="img/fav32.png"></img>' +
-						'</span>' +
-						'<i class="fa fa-caret-down"></i>' +
-					'</a>' +
-				'</div>' +
-
-        '<span class="icon-circle top-nav-icon">' +
-        '<i ng-class="icon"></i>' +
-        '</span>' +
-
-        '<span ng-show="section">' +
-        '<span class="top-nav-title">{{section}}</span>' +
-        '<i class="top-nav-breadcrumb-icon fa fa-angle-right"></i>' +
-        '</span>' +
-
-        '<a ng-href="{{titleUrl}}" class="top-nav-title">' +
-        '{{title}}' +
-        '</a>' +
-        '<i ng-show="subnav" class="top-nav-breadcrumb-icon fa fa-angle-right"></i>' +
-        '</div><div ng-transclude></div></div></div></div>',
-      link: function(scope, elem, attrs) {
-        scope.icon = attrs.icon;
-        scope.contextSrv = contextSrv;
-      }
-    };
-  });
-
-});
diff --git a/public/app/features/admin/partials/edit_org.html b/public/app/features/admin/partials/edit_org.html
index aef042894ab..975a4b6c93b 100644
--- a/public/app/features/admin/partials/edit_org.html
+++ b/public/app/features/admin/partials/edit_org.html
@@ -1,9 +1,8 @@
-<topnav icon="fa fa-fw fa-user" title="Global Users" subnav="true">
+<navbar icon="fa fa-fw fa-user" title="Organizations" title-url="admin/orgs" subnav="true">
 	<ul class="nav">
-		<li><a href="admin/orgs">List</a></li>
-		<li class="active"><a href="admin/orgs/edit/{{org.id}}">Edit Org</a></li>
+		<li class="active"><a href="admin/orgs/edit/{{org.id}}">{{org.name}}</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/admin/partials/new_user.html b/public/app/features/admin/partials/new_user.html
index 73877f9bda4..f0812a15b6d 100644
--- a/public/app/features/admin/partials/new_user.html
+++ b/public/app/features/admin/partials/new_user.html
@@ -1,14 +1,13 @@
-<topnav icon="fa fa-fw fa-cogs" title="Global Users" subnav="true">
+<navbar icon="fa fa-fw fa-user" title="Users" title-url="admin/users" subnav="true">
 	<ul class="nav">
-		<li><a href="admin/users">Users</a></li>
-		<li class="active"><a href="admin/users/create">Create user</a></li>
+		<li class="active"><a href="admin/users/create">Add user</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
 		<h2>
-			Create a new user
+			Add new user
 		</h2>
 
 		<form name="userForm">
diff --git a/public/app/features/admin/partials/orgs.html b/public/app/features/admin/partials/orgs.html
index fa8e89cfdda..8ef7930c638 100644
--- a/public/app/features/admin/partials/orgs.html
+++ b/public/app/features/admin/partials/orgs.html
@@ -1,8 +1,5 @@
-<topnav icon="fa fa-fw fa-users" title="Global Orgs" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="admin/orgs">List</a></li>
-	</ul>
-</topnav>
+<navbar icon="fa fa-fw fa-users" title="Organizations">
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
diff --git a/public/app/features/admin/partials/settings.html b/public/app/features/admin/partials/settings.html
index d242a9a2776..2b55b968955 100644
--- a/public/app/features/admin/partials/settings.html
+++ b/public/app/features/admin/partials/settings.html
@@ -1,5 +1,5 @@
-<topnav icon="fa fa-fw fa-info" title="System info">
-</topnav>
+<navbar icon="fa fa-fw fa-info" title="System info">
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/admin/partials/stats.html b/public/app/features/admin/partials/stats.html
index 4949e71e441..1d20e59349d 100644
--- a/public/app/features/admin/partials/stats.html
+++ b/public/app/features/admin/partials/stats.html
@@ -1,8 +1,5 @@
-<topnav icon="fa fa-fw fa-bar-chart" title="Grafana stats"  subnav="true">
-  <ul class="nav">
-    <li class="active"><a href="admin/stats">Overview</a></li>
-  </ul>
-</topnav>
+<navbar icon="fa fa-fw fa-bar-chart" title="Stats">
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide" ng-init="ctrl.init()">
diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index e2c1e0b3c68..00182db3fde 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -1,15 +1,14 @@
-<topnav icon="fa fa-fw fa-user" title="Global Users" subnav="true">
-	<ul class="nav">
-		<li class="active"><a href="admin/users">List</a></li>
-		<li><a href="admin/users/create">Create user</a></li>
-	</ul>
-</topnav>
+<navbar icon="fa fa-fw fa-user" title="Users" title-url="admin/users">
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
-		<h1>
-			Users
-		</h1>
+		<a class="btn btn-inverse pull-right" href="admin/users/create">
+			<i class="fa fa-plus"></i>
+			Add new user
+		</a>
+
+		<h1>Users</h1>
 
     <table class="filter-table form-inline">
 			<thead>
diff --git a/public/app/features/apps/partials/list.html b/public/app/features/apps/partials/list.html
index e9de7777d9e..6d2d8cc24df 100644
--- a/public/app/features/apps/partials/list.html
+++ b/public/app/features/apps/partials/list.html
@@ -1,8 +1,5 @@
-<topnav title="Apps" icon="fa fa-fw fa-cubes" subnav="true">
-	<ul class="nav">
-		<li class="active" ><a href="org/apps">Overview</a></li>
-	</ul>
-</topnav>
+<navbar title="Apps" icon="fa fa-fw fa-cubes">
+</navbar>
 
 <div class="page-container">
   <div class="page-wide" ng-init="ctrl.init()">
diff --git a/public/app/features/dashboard/partials/import.html b/public/app/features/dashboard/partials/import.html
index 4b44544dc7b..5d1078e7e5d 100644
--- a/public/app/features/dashboard/partials/import.html
+++ b/public/app/features/dashboard/partials/import.html
@@ -1,8 +1,8 @@
-<topnav icon="fa fa-th-large" title="Dashboards" subnav="true">
+<navbar icon="fa fa-th-large" title="Dashboards" subnav="true">
 	<ul class="nav">
 		<li class="active"><a href="import/dashboard">Import</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index c36932bff5b..3ebae573ebd 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -1,9 +1,9 @@
-<topnav title="Data sources" title-url="datasources" icon="fa fa-fw fa-database" subnav="true">
+<navbar title="Data sources" title-url="datasources" icon="fa fa-fw fa-database" subnav="true">
 	<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>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/datasources/partials/list.html b/public/app/features/datasources/partials/list.html
index a19cac7c142..ec660ef79d4 100644
--- a/public/app/features/datasources/partials/list.html
+++ b/public/app/features/datasources/partials/list.html
@@ -1,10 +1,10 @@
-<navbar title="Data sources" icon="fa fa-fw fa-database" subnav="false">
+<navbar title="Data sources" icon="fa fa-fw fa-database">
 </navbar>
 
 <div class="page-container">
 	<div class="page-wide">
 
-		<a type="submit" class="btn btn-inverse pull-right" href="datasources/new">
+		<a class="btn btn-inverse pull-right" href="datasources/new">
 			<i class="fa fa-plus"></i>
 			Add data source
 		</a>
diff --git a/public/app/features/org/partials/newOrg.html b/public/app/features/org/partials/newOrg.html
index 9171cb55e06..03d1ce410a9 100644
--- a/public/app/features/org/partials/newOrg.html
+++ b/public/app/features/org/partials/newOrg.html
@@ -1,8 +1,8 @@
-<topnav title="Organization" icon="fa fa-fw fa-users" subnav="true">
+<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>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/org/partials/orgApiKeys.html b/public/app/features/org/partials/orgApiKeys.html
index 64f3c386907..602a2fd27ea 100644
--- a/public/app/features/org/partials/orgApiKeys.html
+++ b/public/app/features/org/partials/orgApiKeys.html
@@ -1,8 +1,8 @@
-<topnav icon="fa fa-fw fa-users" title="Organization" subnav="true">
+<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>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
diff --git a/public/app/features/org/partials/orgDetails.html b/public/app/features/org/partials/orgDetails.html
index 6dbb98e10f1..9175ff35b91 100644
--- a/public/app/features/org/partials/orgDetails.html
+++ b/public/app/features/org/partials/orgDetails.html
@@ -1,8 +1,8 @@
-<topnav icon="fa fa-fw fa-users" title="Organization" subnav="true">
+<navbar icon="fa fa-fw fa-users" title="Organization">
 	<ul class="nav">
 		<li class="active"><a href="org">Preferences</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page">
diff --git a/public/app/features/org/partials/orgUsers.html b/public/app/features/org/partials/orgUsers.html
index f82a6c66b34..c029dff2955 100644
--- a/public/app/features/org/partials/orgUsers.html
+++ b/public/app/features/org/partials/orgUsers.html
@@ -1,8 +1,8 @@
-<topnav title="Organization" icon="fa fa-fw fa-users" subnav="true">
+<navbar title="Organization" icon="fa fa-fw fa-users" subnav="true">
 	<ul class="nav">
 		<li class="active"><a href="org/users">Users</a></li>
 	</ul>
-</topnav>
+</navbar>
 
 <div class="page-container">
 	<div class="page-wide">
diff --git a/public/dashboards/home.json b/public/dashboards/home.json
index 6cd86b4090b..a405bb484be 100644
--- a/public/dashboards/home.json
+++ b/public/dashboards/home.json
@@ -16,6 +16,7 @@
           "id": 1,
           "span": 12,
           "editable": true,
+          "transparent": true,
           "type": "text",
           "mode": "html",
           "content": "<div class=\"text-center\" style=\"padding: 10px 0 20px 0\">\n<img src=\"img/logo_transparent_200x.png\" width=\"170px\"> \n</div>",
@@ -25,7 +26,7 @@
       ]
     },
     {
-      "height": "610px",
+      "height": "510px",
       "panels": [
         {
           "id": 2,
diff --git a/public/less/navbar.less b/public/less/navbar.less
index 0fed300852a..df0bca627ac 100644
--- a/public/less/navbar.less
+++ b/public/less/navbar.less
@@ -1,6 +1,7 @@
 .navbar {
   position: relative;
-  z-index: 1000;
+  z-index: 110;
+  margin-bottom: 0;
 }
 
 .navbar .navbar-inner {
@@ -66,6 +67,7 @@
     height: 30px;
   }
   .icon-gf-grafana_wordmark {
+    font-size: 21px;
     position: relative;
     top: 3px;
     padding-left: 5px;
@@ -75,7 +77,7 @@
 
 .top-nav-dashboards-btn {
   a {
-    padding: 15px 17px 14px 13px;
+    padding: 16px 17px 14px 13px;
   }
 
   .fa-th-large {
diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less
index f6c4d525bc9..b09101b5d80 100644
--- a/public/less/sidemenu.less
+++ b/public/less/sidemenu.less
@@ -4,7 +4,7 @@
 
 .sidemenu-wrapper {
   position: absolute;
-  top: 53px;
+  top: 52px;
   left: 0;
   width: 200px;
   background-color: @sideMenuBackground;
@@ -29,10 +29,9 @@
 .sidemenu-pinned {
   .sidemenu-wrapper {
     min-height: 100%;
-    top: 50px;
   }
   .main-view-container {
-    margin-left: 210px;
+    padding-left: 210px;
   }
   .page-container {
     margin-left: 210px;
@@ -40,7 +39,7 @@
   }
   .top-nav-menu-btn {
     a {
-      padding-right: 52px;
+      padding-right: 47px;
       padding-left: 24px;
     }
     .icon-gf-grafana_wordmark  {