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
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <head>
     <title>${next.title()}</title>
-    <link rel="icon" href="/images/hgicon.png" type="image/png" />
+    <link rel="icon" href="/images/icons/database_gear.png" type="image/png" />
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <meta name="robots" content="index, nofollow"/>
     <!-- stylesheets -->
@@ -16,22 +16,43 @@
     <div id="header">
         <!-- user -->
         <ul id="logged-user">
-            <li class="first">
-	            <div class="gravatar">
-	            	<img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,24)}" />
-	            </div>
-	            <div class="account">
-	            	${h.link_to('%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname),h.url('admin_settings_my_account'))}<br/>
-	            	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'))}
-	            </div>	
-            </li>
-            <li class="last highlight">${h.link_to(u'Logout',h.url('logout_home'))}</li>
+	            <li class="first">
+	                <div class="gravatar">
+	                    <img alt="gravatar" src="${h.gravatar_url(c.rhodecode_user.email,20)}" />
+	                </div>
+		            <div class="account">
+		            %if c.rhodecode_user.username == 'default':
+                        %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): 
+                            ${h.link_to('anonymous',h.url('register'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+                        %else:
+                            ${h.link_to('anonymous',h.url('#'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+                        %endif		            
+                        
+                    %else:                        		            
+		            	${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}
+		            %endif
+		            </div>	
+	            </li>
+	            <li>
+	               <a href="${h.url('home')}">${_('Home')}</a>
+	            </li>
+	            %if c.rhodecode_user.username != 'default':
+                <li>
+                   <a href="${h.url('journal')}">${_('Journal')}</a> 
+                   ##(${c.unread_journal})</a>
+                </li>
+                %endif
+                %if c.rhodecode_user.username == 'default':
+                    <li class="last highlight">${h.link_to(u'Login',h.url('login_home'))}</li>
+                %else:
+                    <li class="last highlight">${h.link_to(u'Log Out',h.url('logout_home'))}</li>
+                %endif
         </ul>
         <!-- end user -->
         <div id="header-inner" class="title top-left-rounded-corner top-right-rounded-corner">
             <!-- logo -->
             <div id="logo">
-                <h1><a href="${h.url('hg_home')}">${c.rhodecode_name}</a></h1>
+                <h1><a href="${h.url('home')}">${c.rhodecode_name}</a></h1>
             </div>
             <!-- end logo -->
             <!-- menu -->
@@ -98,11 +119,12 @@
                     <span>&darr;</span>					
 					</a>
 					<ul class="repo_switcher">
-                        %for repo,private in c.repo_switcher_list:
-                          %if private:
-                             <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="private_repo")}</li>
+                        %for repo in c.cached_repo_list:
+                        
+                          %if repo['repo'].dbrepo.private:
+                             <li><img src="/images/icons/lock.png" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}</li>
                           %else:
-                             <li>${h.link_to(repo,h.url('summary_home',repo_name=repo),class_="public_repo")}</li>
+                             <li><img src="/images/icons/lock_open.png" alt="${_('Public repository')}" class="repo_switcher_type" />${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}</li>
                           %endif  
                         %endfor					
 					</ul>			
@@ -116,14 +138,14 @@
 	               <span>${_('Summary')}</span>                 
 	               </a>	            
 	            </li>
-                <li ${is_current('shortlog')}>
-                   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
-                   <span class="icon">
-                       <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
-                   </span>
-                   <span>${_('Shortlog')}</span>                 
-                   </a>             
-                </li>	            
+                ##<li ${is_current('shortlog')}>
+                ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
+                ##   <span class="icon">
+                ##       <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
+                ##   </span>
+                ##   <span>${_('Shortlog')}</span>                 
+                ##   </a>             
+                ##</li>	            
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
@@ -142,11 +164,11 @@
                    </a>    
                     <ul>
                         <li>
-                            ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
+                            ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
-						            <li>${h.link_to('%s - %s' % (branch[0],branch[1]),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
+						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
@@ -154,11 +176,11 @@
                             </ul>                        
                         </li>
                         <li>
-                            ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
+                            ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
-                                 <li>${h.link_to('%s - %s' % (tag[0],tag[1]),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
+                                 <li>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:
                             	<li>${h.link_to(_('There are no tags yet'),'#')}</li>
@@ -186,47 +208,72 @@
                    <ul>
                    %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
                    	<li>${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name),class_='settings')}</li>
-                   %endif	
                    	<li>${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}</li>
+                   %endif  
                    	<li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li>
                     
                     %if h.HasPermissionAll('hg.admin')('access admin main page'):
                     <li>
                        ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')}  
+                        <%def name="admin_menu()">
                         <ul>
                             <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
                             <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
                             <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
                             <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
+                            <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
                             <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        
                         </ul>
+                        </%def>
+                        
+                        ${admin_menu()}
                     </li>
-                    %endif                    
+                    %endif
 
-                
-##                   %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
-##                   	<li class="last">
-##                   	${h.link_to(_('delete'),'#',class_='delete')}
-##	                  ${h.form(url('repo_settings_delete', repo_name=c.repo_name),method='delete')}
-##	                    ${h.submit('remove_%s' % c.repo_name,'delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
-##	                  ${h.end_form()}
-##                   	</li>
-##                   	%endif
                    </ul>             
                 </li>
+                
+                <li>
+                    <a title="${_('Followers')}" href="#">
+                    <span class="icon_short">
+                        <img src="/images/icons/heart.png" alt="${_('Followers')}" />
+                    </span>
+                    <span class="short">${c.repository_followers}</span>
+                    </a>
+                </li>
+                <li>
+                    <a title="${_('Forks')}" href="#">
+                    <span class="icon_short">
+                        <img src="/images/icons/arrow_divide.png" alt="${_('Forks')}" />
+                    </span>
+                    <span class="short">${c.repository_forks}</span>
+                    </a>
+                </li>                
+                
+                
+                
 	        </ul>
 		%else:
 		    ##ROOT MENU
             <ul id="quick">
                 <li>
-                    <a title="${_('Home')}"  href="${h.url('hg_home')}">
+                    <a title="${_('Home')}"  href="${h.url('home')}">
                     <span class="icon">
                         <img src="/images/icons/home_16.png" alt="${_('Home')}" />
                     </span>
                     <span>${_('Home')}</span>                 
                     </a>        
                 </li>
-                
+                %if c.rhodecode_user.username != 'default':
+                <li>
+                    <a title="${_('Journal')}"  href="${h.url('journal')}">
+                    <span class="icon">
+                        <img src="/images/icons/book.png" alt="${_('Journal')}" />
+                    </span>
+                    <span>${_('Journal')}</span>                 
+                    </a>        
+                </li>
+                %endif          
                 <li>
                     <a title="${_('Search')}"  href="${h.url('search')}">
                     <span class="icon">
@@ -243,17 +290,10 @@
                        <img src="/images/icons/cog_edit.png" alt="${_('Admin')}" />
                    </span>
                    <span>${_('Admin')}</span>                 
-                   </a>    
-				    <ul>
-				        <li>${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}</li>
-				        <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
-				        <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
-				        <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
-				        <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>        
-				    </ul>
+                   </a>
+                    ${admin_menu()}
                 </li>
 				%endif
-				
 			</ul>
 		%endif    
 </%def>
@@ -270,10 +310,52 @@
 ##<script type="text/javascript" src="/js/yui/container/container.js"></script>
 ##<script type="text/javascript" src="/js/yui/datasource/datasource.js"></script>
 ##<script type="text/javascript" src="/js/yui/autocomplete/autocomplete.js"></script>
+##<script type="text/javascript" src="/js/yui/selector/selector-min.js"></script>
 
-<script type="text/javascript" src="/js/yui2.js"></script>
+<script type="text/javascript" src="/js/yui2a.js"></script>
 <!--[if IE]><script language="javascript" type="text/javascript" src="/js/excanvas.min.js"></script><![endif]-->
 <script type="text/javascript" src="/js/yui.flot.js"></script>
+
+<script type="text/javascript">
+var base_url  ='/_admin/toggle_following';
+var YUC = YAHOO.util.Connect;
+var YUD = YAHOO.util.Dom;
+var YUE = YAHOO.util.Event;
+
+function onSuccess(){
+	
+	var f = YUD.get('follow_toggle');
+    if(f.getAttribute('class')=='follow'){
+        f.setAttribute('class','following');
+        f.setAttribute('title',"${_('Stop following this repository')}");
+    }
+    else{
+        f.setAttribute('class','follow');
+        f.setAttribute('title',"${_('Start following this repository')}");
+    }
+}
+
+function toggleFollowingUser(fallows_user_id,token){
+    args = 'follows_user_id='+fallows_user_id;
+    args+= '&auth_token='+token;
+    YUC.asyncRequest('POST',base_url,{
+        success:function(o){
+        	onSuccess();
+        }
+    },args); return false;
+}
+
+function toggleFollowingRepo(fallows_repo_id,token){
+    args = 'follows_repo_id='+fallows_repo_id;
+    args+= '&auth_token='+token;
+    YUC.asyncRequest('POST',base_url,{
+        success:function(o){
+        	onSuccess();
+        }
+    },args); return false;
+}    
+</script>
+
 </%def>
 
 <%def name="breadcrumbs()">
