diff --git a/public/app/core/components/navbar/navbar.html b/public/app/core/components/navbar/navbar.html
index a1469466caa..0a3b8166125 100644
--- a/public/app/core/components/navbar/navbar.html
+++ b/public/app/core/components/navbar/navbar.html
@@ -1,7 +1,7 @@
 <div class="page-nav container">
 
   <div class="page-breadcrumb">
-    <div class="page-breadcrumb__item dropdown" ng-repeat="item in ::ctrl.model.items">
+    <div class="page-breadcrumb__item dropdown" ng-repeat="item in ctrl.model.items">
       <a class="pointer" ng-href="{{::item.url}}" data-toggle="dropdown" ng-if="::item.items">
         {{::item.title}}
         <i class="page-breadcrumb__caret fa fa-caret-down"></i>
@@ -14,7 +14,6 @@
       <ul class="dropdown-menu dropdown-menu--navbar">
         <li ng-repeat="subItem in ::item.items">
           <a class="pointer" ng-href="{{::subItem.url}}" ng-click="ctrl.navItemClicked(subItem, $event)">
-            <i class="{{::subItem.icon}}" ng-show="::subItem.icon"></i>
             {{::subItem.title}}
           </a>
         </li>
diff --git a/public/app/features/plugins/ds_edit_ctrl.ts b/public/app/features/plugins/ds_edit_ctrl.ts
index e0d402bb802..8d02e7f29b8 100644
--- a/public/app/features/plugins/ds_edit_ctrl.ts
+++ b/public/app/features/plugins/ds_edit_ctrl.ts
@@ -59,6 +59,7 @@ export class DataSourceEditCtrl {
   initNewDatasourceModel() {
     this.isNew = true;
     this.current = angular.copy(defaults);
+    this.navModel.items.push({title: 'New data source'});
 
     // We are coming from getting started
     if (this.$location.search().gettingstarted) {
@@ -85,10 +86,13 @@ export class DataSourceEditCtrl {
     this.backendSrv.get('/api/datasources/' + id).then(ds => {
       this.isNew = false;
       this.current = ds;
+      this.navModel.items.push({title: ds.name});
+
       if (datasourceCreated) {
         datasourceCreated = false;
         this.testDatasource();
       }
+
       return this.typeChanged();
     });
   }
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index 549cc86f856..5c992713ae5 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -4,7 +4,8 @@
   <div class="page-header">
     <h1>
       <i class="icon-gf icon-gf-datasources"></i>
-      Settings <span ng-show="ctrl.isNew" class="muted">(new)</span>
+      <span ng-show="ctrl.isNew">New data source</span>
+			<span ng-hide="ctrl.isNew">{{ctrl.current.name}}</span>
     </h1>
 
     <a class="page-header__cta btn btn-success" href="datasources/new" ng-show="ctrl.isNew">
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index d30be1c6dcc..5619b4d95a7 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -230,7 +230,7 @@ $navbarButtonBackgroundHighlight: $body-bg;
 
 // Sidemenu
 // -------------------------
-$side-menu-bg:            $dark-3;
+$side-menu-bg:            $black;
 $side-menu-item-hover-bg: $dark-2;
 
 // Menu dropdowns
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
index 5b872cb212a..f7bea8af721 100644
--- a/tasks/options/watch.js
+++ b/tasks/options/watch.js
@@ -21,7 +21,10 @@ module.exports = function(config, grunt) {
       return;
     }
 
-    gaze(config.srcDir + '/**/*', function(err, watcher) {
+    gaze([
+      config.srcDir + '/sass/**/*',
+      config.srcDir + '/app/**/*',
+    ], function(err, watcher) {
 
       console.log('Gaze watchers setup');