diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 791c6d8..abe76c7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,14 +31,6 @@ module ApplicationHelper
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
-  
-  def link_to_signin
-    link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin'
-  end
-  
-  def link_to_signout
-    link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout'
-  end
 
   # Display a link to user's account page
   def link_to_user(user)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 1f74720..820a8e7 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -21,20 +21,10 @@
 <div id="wrapper">
 <div id="top-menu">
     <div id="account">
-        <% if User.current.logged? %>
-            <%=l(:label_logged_as)%> <%= User.current.login %> -
-            <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
-            <%= link_to_signout %>
-        <% else %>
-            <%= link_to_signin %>
-            <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
-        <% end %>
+        <%= render_menu :account_menu -%>
     </div>
-    <%= link_to l(:label_home), home_url, :class => 'home' %>
-    <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => 'mypage' if User.current.logged? %>
-    <%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => 'projects' %>
-    <%= link_to l(:label_administration), { :controller => 'admin' }, :class => 'admin' if User.current.admin? %>
-    <%= link_to l(:label_help), Redmine::Info.help_url, :class => 'help' %>
+    <%= content_tag('div', "#{l(:label_logged_as)} #{User.current.login}", :id => 'loggedas') if User.current.logged? %>
+    <%= render_menu :top_menu -%>
 </div>
       
 <div id="header">
diff --git a/config/routes.rb b/config/routes.rb
index febb5e2..2610c26 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,9 @@ ActionController::Routing::Routes.draw do |map|
   # Keep in mind you can assign values other than :controller and :action
 
   map.home '', :controller => 'welcome'
-
+  map.signin 'login', :controller => 'account', :action => 'login'
+  map.signout 'logout', :controller => 'account', :action => 'logout'
+  
   map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil
   map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
   map.connect 'help/:ctrl/:page', :controller => 'help'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 9bec554..b235df3 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -88,23 +88,41 @@ Redmine::AccessControl.map do |map|
   end
 end
 
-# Project menu configuration
+Redmine::MenuManager.map :top_menu do |menu|
+  menu.push :home, :home_url, :html => { :class => 'home' }
+  menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
+  menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
+  menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }
+  menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }
+end
+
+Redmine::MenuManager.map :account_menu do |menu|
+  menu.push :login, :signin_url, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
+  menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
+  menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? }
+  menu.push :logout, :signout_url, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
+end
+
+Redmine::MenuManager.map :application_menu do |menu|
+  # Empty
+end
+
 Redmine::MenuManager.map :project_menu do |menu|
-  menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
-  menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
+  menu.push :overview, { :controller => 'projects', :action => 'show' }
+  menu.push :activity, { :controller => 'projects', :action => 'activity' }
   menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, 
-              :if => Proc.new { |p| p.versions.any? }, :caption => :label_roadmap
+              :if => Proc.new { |p| p.versions.any? }
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
   menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
   menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 
-              :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }, :caption => :label_wiki
+              :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
   menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
               :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
   menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
   menu.push :repository, { :controller => 'repositories', :action => 'show' },
-              :if => Proc.new { |p| p.repository && !p.repository.new_record? }, :caption => :label_repository
-  menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings
+              :if => Proc.new { |p| p.repository && !p.repository.new_record? }
+  menu.push :settings, { :controller => 'projects', :action => 'settings' }
 end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 379028e..3b29912 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -61,16 +61,28 @@ module Redmine
         @controller.current_menu_item
       end
       
-      # Renders the application main menu as a ul element
+      # Renders the application main menu
       def render_main_menu(project)
+        render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
+      end
+      
+      def render_menu(menu, project=nil)
         links = []
-        Redmine::MenuManager.allowed_items(:project_menu, User.current, project).each do |item|
+        Redmine::MenuManager.allowed_items(menu, User.current, project).each do |item|
           unless item.condition && !item.condition.call(project)
+            url = case item.url
+            when Hash
+              project.nil? ? item.url : {item.param => project}.merge(item.url)
+            when Symbol
+              send(item.url)
+            else
+              item.url
+            end
+            #url = (project && item.url.is_a?(Hash)) ? {item.param => project}.merge(item.url) : (item.url.is_a?(Symbol) ? send(item.url) : item.url)
             links << content_tag('li', 
-                       link_to(l(item.caption), {item.param => project}.merge(item.url),
-                               (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
+              link_to(l(item.caption), url, (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
           end
-        end if project && !project.new_record?
+        end
         links.empty? ? nil : content_tag('ul', links.join("\n"))
       end
     end
@@ -89,35 +101,37 @@ module Redmine
       end
       
       def allowed_items(menu_name, user, project)
-        items(menu_name).select {|item| user && user.allowed_to?(item.url, project)}
+        project ? items(menu_name).select {|item| user && user.allowed_to?(item.url, project)} : items(menu_name)
       end
     end
     
     class Mapper
       # Adds an item at the end of the menu. Available options:
       # * param: the parameter name that is used for the project id (default is :id)
-      # * condition: a proc that is called before rendering the item, the item is displayed only if it returns true
+      # * if: a proc that is called before rendering the item, the item is displayed only if it returns true
       # * caption: the localized string key that is used as the item label
       # * html_options: a hash of html options that are passed to link_to
       def push(name, url, options={})
-        @items ||= []
-        @items << MenuItem.new(name, url, options)
+        items << MenuItem.new(name, url, options)
       end
       
       def items
-        @items
+        @items ||= []
       end
     end
     
     class MenuItem
+      include GLoc
       attr_reader :name, :url, :param, :condition, :caption, :html_options
       
       def initialize(name, url, options)
+        raise "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
+        raise "Invalid option :html for menu item '#{name}'" if options[:html] && !options[:html].is_a?(Hash)
         @name = name
         @url = url
         @condition = options[:if]
         @param = options[:param] || :id
-        @caption = options[:caption] || name.to_s.humanize
+        @caption = options[:caption] || (l_has_string?("label_#{name}".to_sym) ? "label_#{name}".to_sym : name.to_s.humanize)
         @html_options = options[:html] || {}
       end
     end    
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b386c32..bfc66f7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -10,7 +10,17 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #wrapper {background: white;}
 
 #top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
+#top-menu ul {margin: 0;  padding: 0;}
+#top-menu li {
+  float:left;
+  list-style-type:none;
+  margin: 0px 0px 0px 0px;
+  padding: 0px 0px 0px 0px;
+  white-space:nowrap;
+}
 #top-menu a {color: #fff; padding-right: 4px;}
+#top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
+
 #account {float:right;}
 
 #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}