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
@@ -28,6 +28,9 @@
 #context-bar a.ldap 			{ background-image: url("../images/icons/server_key.png"); }
 #context-bar a.defaults			{ background-image: url("../images/icons/wrench.png"); }
 #context-bar a.settings			{ background-image: url("../images/icons/cog_edit.png"); }
+#context-bar a.compare_request  { background-image: url('../images/icons/arrow_inout.png')}
+#context-bar a.locking_del   	{ background-image: url('../images/icons/lock_delete.png')}
+#context-bar a.locking_add   	{ background-image: url('../images/icons/lock_add.png')}
 
 #content #context-bar {
 	position: relative;
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
@@ -1876,11 +1876,11 @@ div.form div.fields div.field div.button
     border-top: none;
 }
 
-#summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
-#summary-menu-stats a.forks     { background-image: url('../images/icons/arrow_divide.png')}
-#summary-menu-stats a.settings  { background-image: url('../images/icons/cog_edit.png')}
-#summary-menu-stats a.feed      { background-image: url('../images/icons/rss_16.png')}
-#summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
+#summary-menu-stats a.followers         { background-image: url('../images/icons/heart.png')}
+#summary-menu-stats a.forks             { background-image: url('../images/icons/arrow_divide.png')}
+#summary-menu-stats a.settings          { background-image: url('../images/icons/cog_edit.png')}
+#summary-menu-stats a.feed              { background-image: url('../images/icons/rss_16.png')}
+#summary-menu-stats a.repo-size         { background-image: url('../images/icons/server.png')}
 
 #summary-menu-stats a {
     display: block;
diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html
--- a/rhodecode/templates/admin/repos/repo_edit.html
+++ b/rhodecode/templates/admin/repos/repo_edit.html
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('edit')}
+  ${_('Edit Repository Settings')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -104,7 +104,7 @@
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
     <div id="context-top">
-      <div id= "breadcrumbs">
+      <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         »
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
@@ -143,7 +143,7 @@
             <li><a href="#">${_('loading...')}</a></li>
           </ul>
         </li>
-        <li ${is_current('options')}>
+        <li ${is_current('options')}> 
           <a href="#" class="dropdown options"></span>Options</a>
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
diff --git a/rhodecode/templates/bookmarks/bookmarks.html b/rhodecode/templates/bookmarks/bookmarks.html
--- a/rhodecode/templates/bookmarks/bookmarks.html
+++ b/rhodecode/templates/bookmarks/bookmarks.html
@@ -8,11 +8,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('bookmarks')}
+    ${_('Bookmarks')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html
--- a/rhodecode/templates/branches/branches.html
+++ b/rhodecode/templates/branches/branches.html
@@ -7,11 +7,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('branches')}
+    ${_('Branches')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -7,12 +7,8 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
     <% size = c.size if c.size <= c.total_cs else c.total_cs %>
-    ${_('changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
+    ${_('Changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html
--- a/rhodecode/templates/files/files.html
+++ b/rhodecode/templates/files/files.html
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('files')}
+    ${_('Files')}
     %if c.file:
         @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
     %endif
diff --git a/rhodecode/templates/followers/followers.html b/rhodecode/templates/followers/followers.html
--- a/rhodecode/templates/followers/followers.html
+++ b/rhodecode/templates/followers/followers.html
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('followers')}
+    ${_('Followers')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html
--- a/rhodecode/templates/forks/forks.html
+++ b/rhodecode/templates/forks/forks.html
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('forks')}
+    ${_('Forks')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show_all.html b/rhodecode/templates/pullrequests/pullrequest_show_all.html
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('pull requests')}
+    ${_('Pull requests')}
 </%def>
 
 <%def name="main()">
diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html
--- a/rhodecode/templates/search/search.html
+++ b/rhodecode/templates/search/search.html
@@ -11,13 +11,9 @@
 
 <%def name="breadcrumbs_links()">
   %if c.repo_name:
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('search')}
+    ${_('Search')}
   %else:
-    ${_('search in all repositories')}
+    ${_('Search in all repositories')}
   %endif
   %if c.cur_query:
     &raquo;
diff --git a/rhodecode/templates/shortlog/shortlog.html b/rhodecode/templates/shortlog/shortlog.html
--- a/rhodecode/templates/shortlog/shortlog.html
+++ b/rhodecode/templates/shortlog/shortlog.html
@@ -7,16 +7,12 @@
 
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
     %if c.file_history:
-        ${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
+        ${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
         &raquo;
         ${c.file_history}
     %else:
-        ${_('shortlog')}
+        ${_('Shortlog')}
     %endif
 </%def>
 
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
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('summary')}
+    ${_('Summary')}
 </%def>
 
 <%def name="page_nav()">
diff --git a/rhodecode/templates/tags/tags.html b/rhodecode/templates/tags/tags.html
--- a/rhodecode/templates/tags/tags.html
+++ b/rhodecode/templates/tags/tags.html
@@ -8,11 +8,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('tags')}
+    ${_('Tags')}
 </%def>
 
 <%def name="page_nav()">