diff --git a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
index 9952fa0b00a..8b82d20c6c2 100644
--- a/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
+++ b/app/assets/javascripts/stat_graph_contributors_graph.js.coffee
@@ -46,7 +46,7 @@ class @ContributorsGraph
 
 class @ContributorsMasterGraph extends ContributorsGraph
   constructor: (@data) ->
-    @width = $('.container').width() - 70
+    @width = $('.container').width() - 345
     @height = 200
     @x = null
     @y = null
@@ -119,7 +119,7 @@ class @ContributorsMasterGraph extends ContributorsGraph
 
 class @ContributorsAuthorGraph extends ContributorsGraph
   constructor: (@data) ->
-    @width = $('.container').width()/2 - 100
+    @width = $('.container').width()/2 - 225
     @height = 200
     @x = null
     @y = null
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index 48b6aad4c67..d23ce7d236a 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -74,14 +74,20 @@ body.project {
 .nav-sidebar li a .count {
   float: right;
   background: #eee;
-  padding: 2px 8px;
+  padding: 0px 8px;
   @include border-radius(6px);
 }
 
-.nav-sidebar li.active a {
-  color: #333;
-  background: #EEE;
-  font-weight: bold;
+.nav-sidebar li {
+  &.active a {
+    color: #333;
+    background: #EEE;
+    font-weight: bold;
+
+    &.no-highlight {
+      background: none;
+    }
+  }
 }
 
 .nav-sidebar li {
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 6a8b65b4c78..05d637f2124 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -41,7 +41,7 @@
 
   - if project_nav_tab? :settings
     = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
-      = link_to edit_project_path(@project), class: "stat-tab tab " do
+      = link_to edit_project_path(@project), class: "stat-tab tab no-highlight" do
         Settings
         %i.fa.fa-angle-down
   - if defined?(settings) && settings