diff --git a/pkg/api/index.go b/pkg/api/index.go
index a0f21cc9571..3c4d658ce19 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -102,7 +102,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 
 	dashboardChildNavs := []*dtos.NavLink{
 		{Text: "Home", Url: setting.AppSubUrl + "/", Icon: "fa fa-fw fa-home", HideFromTabs: true},
-		{Divider: true},
+		{Divider: true, HideFromTabs: true},
 		{Text: "Manage", Id: "dashboards", Url: setting.AppSubUrl + "/dashboards", Icon: "fa fa-fw fa-sitemap"},
 		{Text: "Playlists", Id: "playlists", Url: setting.AppSubUrl + "/playlists", Icon: "fa fa-fw fa-film"},
 		{Text: "Snapshots", Id: "snapshots", Url: setting.AppSubUrl + "/dashboard/snapshots", Icon: "icon-gf icon-gf-fw icon-gf-snapshot"},
@@ -113,7 +113,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		Id:       "dashboards",
 		SubTitle: "Manage dashboards & folders",
 		Icon:     "gicon gicon-dashboard",
-		Url:      setting.AppSubUrl + "/dashboards",
+		Url:      setting.AppSubUrl + "/",
 		Children: dashboardChildNavs,
 	})
 
@@ -239,11 +239,6 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 					Description: "View and configure plugins",
 					Icon:        "icon-gf icon-gf-fw icon-gf-apps",
 					Url:         setting.AppSubUrl + "/plugins",
-					// Children: []*dtos.NavLink{
-					// 	{Text: "Panels", Url: setting.AppSubUrl + "/plugins?type=panel", Icon: "fa fa-fw fa-stop"},
-					// 	{Text: "Data sources", Url: setting.AppSubUrl + "/plugins?type=datasource", Icon: "icon-gf icon-gf-datasources"},
-					// 	{Text: "Apps", Url: setting.AppSubUrl + "/plugins?type=app", Icon: "icon-gf icon-gf-apps"},
-					// },
 				},
 				{
 					Text:        "Preferences",
@@ -263,21 +258,24 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 			},
 		}
 
-		// if c.IsGrafanaAdmin {
-		// 	cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
-		// 		Text: "Server Admin",
-		// 		Id:   "admin",
-		// 		Icon: "fa fa-fw fa-shield",
-		// 		Url:  setting.AppSubUrl + "/admin",
-		// 		Children: []*dtos.NavLink{
-		// 			{Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"},
-		// 			{Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"},
-		// 			{Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"},
-		// 			{Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"},
-		// 			{Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide"},
-		// 		},
-		// 	})
-		// }
+		if c.IsGrafanaAdmin {
+			cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
+				Divider: true, HideFromTabs: true,
+			})
+			cfgNode.Children = append(cfgNode.Children, &dtos.NavLink{
+				Text: "Server Admin",
+				Id:   "admin",
+				Icon: "fa fa-fw fa-shield",
+				Url:  setting.AppSubUrl + "/admin",
+				Children: []*dtos.NavLink{
+					{Text: "Users", Id: "global-users", Url: setting.AppSubUrl + "/admin/users"},
+					{Text: "Orgs", Id: "global-orgs", Url: setting.AppSubUrl + "/admin/orgs"},
+					{Text: "Server Settings", Id: "server-settings", Url: setting.AppSubUrl + "/admin/settings"},
+					{Text: "Server Stats", Id: "server-stats", Url: setting.AppSubUrl + "/admin/stats"},
+					{Text: "Style Guide", Id: "styleguide", Url: setting.AppSubUrl + "/styleguide"},
+				},
+			})
+		}
 
 		data.NavTree = append(data.NavTree, cfgNode)
 	}
diff --git a/public/app/core/components/PageHeader.tsx b/public/app/core/components/PageHeader.tsx
index 57bcdc3b896..7ed72d41b84 100644
--- a/public/app/core/components/PageHeader.tsx
+++ b/public/app/core/components/PageHeader.tsx
@@ -28,7 +28,7 @@ export interface IProps {
 // }
 
 function TabItem(tab: NavModelItem) {
-  if (tab.hideFromTabs || tab.divider) {
+  if (tab.hideFromTabs) {
     return (null);
   }
 
diff --git a/public/app/features/dashboard/partials/dashboardList.html b/public/app/features/dashboard/partials/dashboardList.html
index 70a19e15718..9fb598cd80b 100644
--- a/public/app/features/dashboard/partials/dashboardList.html
+++ b/public/app/features/dashboard/partials/dashboardList.html
@@ -2,17 +2,17 @@
 
 <div class="page-container page-body">
   <div class="page-action-bar">
-    <div class="gf-form width-15">
+    <div class="gf-form">
       <label class="gf-form-label">Search</label>
-      <input type="text" class="gf-form-input" placeholder="Find Dashboard by name" tabindex="1" give-focus="true" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.onQueryChange()" />
+      <input type="text" class="gf-form-input max-width-30" placeholder="Find Dashboard by name" tabindex="1" give-focus="true" ng-model="ctrl.query.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.onQueryChange()" />
     </div>
     <div class="page-action-bar__spacer"></div>
-    <a class="btn btn-inverse" href="/dashboard/new">
-      <i class="gicon gicon-dashboard-new"></i>
+    <a class="btn btn-success" href="/dashboard/new">
+      <i class="fa fa-plus"></i>
       Dashboard
     </a>
-    <a class="btn btn-inverse" href="/dashboard/new/?editview=new-folder">
-      <i class="gicon gicon-folder-new"></i>
+    <a class="btn btn-success" href="/dashboard/new/?editview=new-folder">
+      <i class="fa fa-plus"></i>
       Folder
     </a>
   </div>
diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss
index cc6007d0be4..969a4477a93 100644
--- a/public/sass/components/_dropdown.scss
+++ b/public/sass/components/_dropdown.scss
@@ -91,7 +91,6 @@
         color: $link-color-disabled;
         position: relative;
         top: 3px;
-        padding-left: 5px;
       }
 
       .gicon {
diff --git a/public/sass/components/_page_header.scss b/public/sass/components/_page_header.scss
index ebc16a49fd4..1211e244a91 100644
--- a/public/sass/components/_page_header.scss
+++ b/public/sass/components/_page_header.scss
@@ -51,7 +51,7 @@
   }
 
   &.gicon {
-    top: 9px;
+    top: 10px;
   }
 
   &.icon-gf {