diff --git a/rhodecode/public/css/contextbar.css b/rhodecode/public/css/contextbar.css
--- a/rhodecode/public/css/contextbar.css
+++ b/rhodecode/public/css/contextbar.css
@@ -2,6 +2,11 @@
  * Stylesheets for the context bar
  */
 
+#quick .repo_switcher { background-image: url("../images/icons/database.png"); }
+#quick .journal { background-image: url("../images/icons/book.png"); }
+#quick .search { background-image: url("../images/icons/search_16.png"); }
+#quick .admin { background-image: url("../images/icons/cog_edit.png"); }
+
 #context-bar button.follow 		{ background-image: url("../images/icons/heart.png"); }
 #context-bar button.following	{ background-image: url("../images/icons/heart_delete.png"); }
 #context-bar a.fork 			{ background-image: url("../images/icons/arrow_divide.png"); }
@@ -39,16 +44,18 @@
 	overflow: visible;
 }
 
+#header #header-inner #quick a,
 #content #context-bar,
 #content #context-bar a,
 #content #context-bar button {
  	color: #FFFFFF;
 }
 
+#header #header-inner #quick a:hover,
 #content #context-bar a:hover,
 #content #context-bar button:hover {
  	text-decoration: none;
- 	color: #bfe3ff;
+/* 	color: #bfe3ff;*/
 }
 
 #content #context-bar .icon {
@@ -68,6 +75,7 @@ ul.horizontal-list > li {
 	position: relative;
 }
 
+#header #header-inner #quick ul,
 ul.horizontal-list > li ul {
 	position: absolute;
 	display: none;
@@ -75,10 +83,12 @@ ul.horizontal-list > li ul {
 	z-index: 999;
 }
 
+#header #header-inner #quick li:hover > ul,
 ul.horizontal-list li:hover > ul {
 	display: block;
 }
 
+#header #header-inner #quick li ul li,
 ul.horizontal-list ul li {
 	position: relative;
 	border-bottom: 1px solid rgba(0,0,0,0.1);
@@ -95,14 +105,17 @@ ul.horizontal-list > li ul ul {
 	overflow-y:auto;
 }
 
-ul.horizontal-list > li a {
+#header #header-inner #quick ul a,
+ul.horizontal-list li a {
 	white-space: nowrap;
 }
 
 #breadcrumbs {
 	float:left;
-	padding: 12px 0;
+	padding: 5px 0;
+	padding-left: 5px;
 	font-weight: bold;
+	font-size: 14px;
 }
 
 #breadcrumbs span{
@@ -114,13 +127,15 @@ ul.horizontal-list > li a {
 	position: relative;
 	overflow: hidden;
 	border-bottom: 1px solid #003162;
-	padding: 10px;
+	padding: 5px;
 }
 
+/*#quick,*/
+#header #header-inner #quick ul,
 #revision-changer,
 #context-pages,
-#context-pages ul,
-ul#context-actions {
+#context-pages ul /*,
+ul#context-actions */{
 	background: #3b6998; /* Old browsers */
 	background: -moz-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4574a2), color-stop(100%,#2f5d8b)); /* Chrome,Safari4+ */
@@ -128,9 +143,10 @@ ul#context-actions {
 	background: -o-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* Opera 11.10+ */
 	background: -ms-linear-gradient(top, #4574a2 0%, #2f5d8b 100%); /* IE10+ */
 	background: linear-gradient(to bottom, #4574a2 0%, #2f5d8b 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */
+	/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4574a2', endColorstr='#2f5d8b',GradientType=0 ); /* IE6-9 */*/
 }
 
+#header #header-inner #quick a,
 #context-actions a,
 #context-pages a {
 	background-repeat: no-repeat;
@@ -138,6 +154,7 @@ ul#context-actions {
 	padding-left: 30px;
 }
 
+#quick a,
 #context-pages ul ul a{
 	padding-left: 10px;
 }
@@ -146,11 +163,10 @@ ul#context-actions {
 	display: inline-block;
 	float: right;
 	border-radius: 4px;
-	background-color:#3b6998;
+	/*background-color:#3b6998;*/
 	background-image: linear-gradient(top, #4574a2 0%, #2f5d8b 100%);
-	padding: 5px;
+/*	padding: 5px;*/
 }
-
 #content ul#context-actions li {
 	padding: 0px;
 	border-right: 1px solid rgba(0,0,0,0.1);
@@ -164,31 +180,38 @@ ul#context-actions {
 	background: none;
 	border: none;
 	margin: 0px;
-	height: 13px;
-	padding: 3px 7px;
+	height: auto;
+	padding: 10px 10px 10px 30px;
 	background-repeat: no-repeat;
-	background-position: 50% 3px;
-	padding-top: 24px;
+	background-position: 10px 50%;
+	font-size: 1em;
+	/*padding-top: 24px;*/
 }
 
-#context-actions button{
+#context-actions a {
+	padding: 11px 10px 12px 30px;
+}
+
+/*#context-actions button{
 	padding-top: 22px;
 	height: 40px;
-}
-
+}*/
+#header #header-inner #quick li:hover,
 #revision-changer:hover,
 #context-pages li:hover,
 #context-actions li:hover,
-#content #context-actions li:hover {
+#content #context-actions li:hover,
+#header #header-inner #quick li.current,
+#context-pages li.current {
 	/*background: rgba(255,255,255,0.2);*/
 	background: #6388ad; /* Old browsers */
-	background: -moz-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* IE10+ */
-	background: linear-gradient(to bottom, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */
+	background: -moz-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* Opera 11.10+ */
+	background: -ms-linear-gradient(top, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* IE10+ */
+	background: linear-gradient(to bottom, rgba(255,255,255,0.2) 0%, rgba(255,255,255,0.1) 100%); /* W3C */
+	/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#88bfe8', endColorstr='#70b0e0',GradientType=0 ); /* IE6-9 */*/
 
 	background-image: -webkit-gradient(linear, left top, left bottom, rgb(255,255,255) 0%, rgb(255,255,255) 100%);
 	
@@ -246,7 +269,7 @@ ul#context-actions {
 /*	overflow: hidden;*/
 }
 
-#context-pages li.current{
+#context-pages li.curreasdnt{
 	background: #535353; /* Old browsers */
 	background: -moz-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* FF3.6+ */
 	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5d5d5d), color-stop(100%,#484848)); /* Chrome,Safari4+ */
@@ -254,23 +277,32 @@ ul#context-actions {
 	background: -o-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* Opera 11.10+ */
 	background: -ms-linear-gradient(top, #5d5d5d 0%, #484848 100%); /* IE10+ */
 	background: linear-gradient(to bottom, #5d5d5d 0%, #484848 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5d5d5d', endColorstr='#484848',GradientType=0 ); /* IE6-9 */
 }
 
 #content #context-pages .icon {
 	margin-right:5px;
 }
 
+#header #header-inner #quick li,
 #content #context-pages li {
 	border-right: 1px solid rgba(0,0,0,0.1);
 	border-left: 1px solid rgba(255,255,255,0.1);
 	padding: 0;
 }
-
+#header #header-inner #quick li:last-child,
 #content #context-pages li:last-child {
 	border-right:none;
 }
 
+#header #header-inner #quick li:first-child{
+	border-left:none;
+}
+
+#header #header-inner #quick > li:first-child > a{
+	border-radius: 4px 0 0 4px;
+}
+
+#header #header-inner #quick a,
 #context-pages a, 
 #context-pages .admin_menu a{
 	display: block;
@@ -279,14 +311,27 @@ ul#context-actions {
 	line-height: 35px;
 }
 
+#header #header-inner #quick a#quick_login_link {
+	padding-left: 0px;
+}
+
+#header #header-inner #quick a {
+	overflow: hidden;
+}
+#quick a.childs:after,
 #revision-changer:before,
 #context-pages a.childs:after,
 #context-pages a.dropdown:after {
 	content: ' \25BE';
 }
+#context-pages a.childs {
+	padding-right: 20px;
+}
 #context-pages a.childs:after{
+	position: absolute;
 	float: right;
 	padding-left: 5px;
+	padding-right: 5px;
 }
 
 #revision-changer:before {
diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -401,10 +401,11 @@ div:hover > a.permalink {
     float: right;
     list-style-type: none;
     list-style-position: outside;
-    margin: 8px 8px 0 0;
+    margin: 4px 8px 0 0;
     padding: 0;
-}
-
+    border-radius: 4px;
+}
+/*
 #header #header-inner #quick > li {
     position: relative;
     float: left;
@@ -428,20 +429,20 @@ div:hover > a.permalink {
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
 }
-
+*/
 #header #header-inner #quick li span.short {
     padding: 9px 6px 8px 6px;
 }
 
 #header #header-inner #quick li span {
-    top: 0;
+    /*top: 0;
     right: 0;
-    height: 1%;
-    display: block;
-    float: left;
-    border-left: 1px solid #3f6f9f;
+    height: 1%;*/
+    display: inline;
+    /*float: left;*/
+    /*border-left: 1px solid #3f6f9f;*/
     margin: 0;
-    padding: 10px 12px 8px 10px;
+    /*padding: 10px 12px 8px 10px;*/
 }
 
 #header #header-inner #quick li span.normal {
@@ -450,13 +451,9 @@ div:hover > a.permalink {
 }
 
 #header #header-inner #quick li span.icon {
-    top: 0;
-    left: 0;
+
     border-left: none;
-    border-right: 1px solid #2e5c89;
-    padding: 8px 6px 4px;
-    min-width: 16px;
-    min-height: 16px;
+    padding-left: 10px ;
 }
 
 #header #header-inner #quick li span.icon_short {
@@ -468,19 +465,21 @@ div:hover > a.permalink {
 }
 
 #header #header-inner #quick li span.icon img, #header #header-inner #quick li span.icon_short img {
-    margin: 0px -2px 0px 0px;
-}
-
-#header #header-inner #quick > li.current > a,
-#header #header-inner #quick > li > a:hover {
+    vertical-align: middle;
+    margin-bottom: 2px;
+}
+
+/*#header #header-inner #quick > li.current > a,
+#header #header-inner #quick > li > a:hover*/ {
     background-color: #4e4e4e;
 }
-
+/*
 #header #header-inner #quick li.current a span,
 #header #header-inner #quick li a:hover span {
     border-left: 1px solid #545454;
 }
-
+*/
+/*
 #header #header-inner #quick li.current a span.icon,
 #header #header-inner #quick li.current a span.icon_short,
 #header #header-inner #quick li a:hover span.icon,
@@ -488,7 +487,7 @@ div:hover > a.permalink {
     border-left: none;
     border-right: 1px solid #464646;
 }
-
+*/
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
@@ -995,6 +994,7 @@ tbody .yui-dt-editable { cursor: pointer
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76', endColorstr='#00376e', GradientType=0 );
     margin: 0 0 20px;
     padding: 0;
+    border-radius: 4px 4px 0 0;
 }
 
 #content div.box div.title h5 {
@@ -1733,7 +1733,7 @@ div.form div.fields div.field div.button
 
 #summary-menu-stats{
     float: left;
-    width: 200px;
+    width: 180px;
     position: absolute;
     top: 0;
     right: 0;
@@ -1749,7 +1749,6 @@ div.form div.fields div.field div.button
 
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
-    line-height: 32px;
     padding: 0;
 }
 
@@ -1769,14 +1768,19 @@ div.form div.fields div.field div.button
 
 #summary-menu-stats a {
     display: block;
-    color: #000000;
-    padding: 0 30px;
+    /*color: #000000;*/
+    padding: 12px 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
-}
+    padding-right: 10px;
+}
+
 
 #repo_size_2 {
-    margin-left: 25px;
+    margin-left: 30px;
+    display: block;
+    padding-right: 10px;
+    padding-bottom: 7px;
 }
 
 #summary-menu-stats a:hover {
@@ -2561,6 +2565,7 @@ h3.files_location {
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
+    text-align: left;
 }
 
 #graph_content .container .author {
@@ -2568,7 +2573,7 @@ h3.files_location {
 }
 
 #graph_content .container .hash{
-    width: 90px;
+    width: 85px;
     font-size: 0.85em;
 }
 
@@ -2644,7 +2649,7 @@ h3.files_location {
 #graph_content .comments-container {
     /*width: 40px;*/
     margin: 0.8em 0;
-    margin-left: 0.5em;
+    margin-right: 0.5em;
 }
 
 #graph_content  .tagcontainer {
@@ -4561,22 +4566,22 @@ form.comment-inline-form {
     margin:2px 0px 8px 5px !important
 }
 
-
 .notification-paginator {
     padding: 0px 0px 4px 16px;
     float: left;
 }
 
 .menu_link_user {
-    padding: 10px 8px 8px 8px !important;
-}
-
+    /*padding: 10px 8px 8px 8px !important;*/
+}
+
+#context-pages .pull-request span,
 .menu_link_notifications {
     padding: 4px 4px !important;
-    margin: 7px 4px 0px 0px !important;
+    /*margin: 7px 4px 0px 0px !important;*/
     text-align: center;
     color:#888 !important;
-    font-size: 10px;
+    /*font-size: 10px;*/
     background-color: #DEDEDE !important;
     border-radius: 4px !important;
     -webkit-border-radius: 4px !important;
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
old mode 100755
new mode 100644
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -123,7 +123,7 @@
           </li>
           <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}" class="fork">${_('Fork')}</a></li>
           %if h.is_hg(c.rhodecode_repo):
-          <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Pull Request')}</a></li>
+          <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="pull-request">${_('Create Pull Request')}</a></li>
           %endif
         </ul>
       %endif
@@ -148,43 +148,33 @@
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                %if h.HasPermissionAll('hg.admin')('access settings on repository'):
-                   <li>${h.link_to(_('repository settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
+                   <li>${h.link_to(_('Settings'),h.url('edit_repo',repo_name=c.repo_name),class_='settings')}</li>
                %else:
-                   <li>${h.link_to(_('repository settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
+                   <li>${h.link_to(_('Settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
                %endif
              %endif
               %if c.rhodecode_db_repo.fork:
-               <li>${h.link_to(_('compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}</li>
+               <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default'),class_='compare_request')}</li>
               %endif
-              <li>${h.link_to(_('lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li>
-              <li>${h.link_to(_('search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>
+              <li>${h.link_to(_('Lightweight changelog'),h.url('shortlog_home',repo_name=c.repo_name),class_='shortlog')}</li>
+              <li>${h.link_to(_('Search'),h.url('search_repo',repo_name=c.repo_name),class_='search')}</li>
 
               %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
                 %if c.rhodecode_db_repo.locked[0]:
-                  <li>${h.link_to(_('unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
+                  <li>${h.link_to(_('Unlock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_del')}</li>
                 %else:
-                  <li>${h.link_to(_('lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
+                  <li>${h.link_to(_('Lock'), h.url('toggle_locking',repo_name=c.repo_name),class_='locking_add')}</li>
                 %endif
               %endif
-
-              % if h.HasPermissionAll('hg.admin')('access admin main page'):
-                 <li>
-                   ${h.link_to(_('admin'),h.url('admin_home'),class_='admin childs')}
-                    ## ADMIN MENU
-                    ${admin_menu()}
-                 </li>
-              ## if you're a admin of any groups, show admin menu for it
-              % elif c.rhodecode_user.groups_admin:
-                 <li>
-                   ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}
-                    
-                    ## ADMIN MENU
-                    ${admin_menu_simple()}
-                 </li>
-              % endif
              </ul>
         </li>
-        <li ${is_current('showpullrequest')}><a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">1</a></li>
+        <li ${is_current('showpullrequest')}>
+          <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">Pull Requests 
+            %if c.repository_pull_requests:
+              <span>${c.repository_pull_requests}</span>
+            %endif
+          </a>
+        </li>
       </ul>
     </div>
   </div>
@@ -207,8 +197,8 @@
 <%def name="usermenu()">
     ## USER MENU
     <li>
-      <a class="menu_link" id="quick_login_link">
-          <span class="icon" style="padding:5px 5px 0px 5px">
+      <a class="menu_link childs" id="quick_login_link">
+          <span class="icon">
              <img src="${h.gravatar_url(c.rhodecode_user.email,20)}" alt="avatar">
           </span>
           %if c.rhodecode_user.username != 'default':
@@ -289,14 +279,11 @@
             if selected == current:
                 return h.literal('class="current"')
         %>
-        <ul id="quick">
+        <ul id="quick" class="horizontal-list">
           <!-- repo switcher -->
           <li ${is_current('home')}>
-              <a class="menu_link" id="repo_switcher" title="${_('Switch repository')}" href="${h.url('home')}">
-              <span class="icon">
-                  <img src="${h.url('/images/icons/database.png')}" alt="${_('Products')}" />
-              </span>
-              <span>${_('Repositories')}</span>
+              <a class="menu_link repo_switcher childs" id="repo_switcher" title="${_('Switch repository')}" href="${h.url('home')}">
+              ${_('Repositories')}
               </a>
               <ul id="repo_switcher_list" class="repo_switcher">
                   <li>
@@ -307,48 +294,33 @@
           ##ROOT MENU
           %if c.rhodecode_user.username != 'default':
             <li ${is_current('journal')}>
-              <a class="menu_link" title="${_('Show recent activity')}"  href="${h.url('journal')}">
-              <span class="icon">
-                  <img src="${h.url('/images/icons/book.png')}" alt="${_('Journal')}" />
-              </span>
-              <span>${_('Journal')}</span>
+              <a class="menu_link journal" title="${_('Show recent activity')}"  href="${h.url('journal')}">
+              ${_('Journal')}
               </a>
             </li>
           %else:
             <li ${is_current('journal')}>
-              <a class="menu_link" title="${_('Public journal')}"  href="${h.url('public_journal')}">
-              <span class="icon">
-                  <img src="${h.url('/images/icons/book.png')}" alt="${_('Public journal')}" />
-              </span>
-              <span>${_('Public journal')}</span>
+              <a class="menu_link journal" title="${_('Public journal')}"  href="${h.url('public_journal')}">
+              ${_('Public journal')}
               </a>
             </li>
           %endif
           <li ${is_current('search')}>
-              <a class="menu_link" title="${_('Search in repositories')}"  href="${h.url('search')}">
-              <span class="icon">
-                  <img src="${h.url('/images/icons/search_16.png')}" alt="${_('Search')}" />
-              </span>
-              <span>${_('Search')}</span>
+              <a class="menu_link search" title="${_('Search in repositories')}"  href="${h.url('search')}">
+              ${_('Search')}
               </a>
           </li>
           % if h.HasPermissionAll('hg.admin')('access admin main page'):
             <li ${is_current('admin')}>
-              <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
-              <span class="icon">
-                    <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
-                </span>
-                <span>${_('Admin')}</span>
+              <a class="menu_link admin childs" title="${_('Admin')}" href="${h.url('admin_home')}">
+                ${_('Admin')}
               </a>
               ${admin_menu()}
             </li>
           % elif c.rhodecode_user.groups_admin:
           <li ${is_current('admin')}>
-              <a class="menu_link" title="${_('Admin')}" href="${h.url('admin_home')}">
-                <span class="icon">
-                    <img src="${h.url('/images/icons/cog_edit.png')}" alt="${_('Admin')}" />
-                </span>
-                <span>${_('Admin')}</span>
+              <a class="menu_link admin childs" title="${_('Admin')}" href="${h.url('admin_home')}">
+                ${_('Admin')}
               </a>
               ${admin_menu_simple()}
           </li>
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
old mode 100755
new mode 100644
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -63,12 +63,10 @@
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash">
-                            <span class="tooltip" title="${h.tooltip(h.age(cs.date))}">
-                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
-                                    <span class="changeset_id">${cs.revision} :</span>
-                                    <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
-                                </a>
-                            </span>
+                            <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
+                                <span class="changeset_id">${cs.revision} :</span>
+                                <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
+                            </a>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
@@ -78,9 +76,13 @@
                                 <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
                                 <div class="extra-container">
-                                    %if (not c.branch_name) and cs.branch:
-                                        <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
-                                            ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                    %if c.comments.get(cs.raw_id,[]):
+                                        <div class="comments-container">
+                                            <div class="comments-cnt" title="${('comments')}">
+                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                                                    ${len(c.comments[cs.raw_id])}
+                                                </a>
+                                            </div>
                                         </div>
                                     %endif
                                     %for book in cs.bookmarks:
@@ -94,15 +96,12 @@
                                             ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                         </div>
                                     %endfor
-                                    %if len(c.comments.get(cs.raw_id,[])) > 0:
-                                        <div class="comments-container">
-                                            <div class="comments-cnt" title="${('comments')}">
-                                                <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                                                    ${len(c.comments[cs.raw_id])}
-                                                </a>
-                                            </div>
+                                    %if (not c.branch_name) and cs.branch:
+                                        <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
+                                            ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
                                         </div>
                                     %endif
+                                   
                                     <%doc>
                                     %if (h.is_hg(c.rhodecode_repo) and cs.bookmarks) or cs.tags:
                                         <div class="tagcontainer">
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html
--- a/rhodecode/templates/summary/summary.html
+++ b/rhodecode/templates/summary/summary.html
@@ -166,14 +166,14 @@
           <ul>
             <li>
                <a class="followers" title="${_('Followers')}" href="${h.url('repo_followers_home',repo_name=c.repo_name)}">
+                ${_('Followers')}
                 <span id="current_followers_count">${c.repository_followers}</span>
-                ${_('Followes')}
               </a>
             </li>
             <li>
               <a class="forks" title="${_('Forks')}" href="${h.url('repo_forks_home',repo_name=c.repo_name)}">
+                ${_('Forks')}
                 <span>${c.repository_forks}</span>
-                ${_('Forks')}
               </a>
             </li>
             <li>
@@ -193,8 +193,8 @@
               %endif
             </li>
             %if c.rhodecode_user.username != 'default':
-            <li>
-              <a href="#" class="repo-size" onclick="javascript:showRepoSize('repo_size_2','${c.dbrepo.repo_name}','${str(h.get_token())}')">Repository Size</a>
+            <li class="repo_size">
+              <a href="#" class="repo-size" onclick="javascript:showRepoSize('repo_size_2','${c.dbrepo.repo_name}','${str(h.get_token())}')">Calculate Repository Size</a>
               <span id="repo_size_2"></span>
             </li>
             %endif