diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2db8f2b..c955914 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -128,6 +128,20 @@ module ApplicationHelper
     end[0]
   end
 
+  def shortcut_header_links
+    if logged_in?
+      [ accessibility_link, 
+        ( link_to_homepage( content_tag('span', _('My account')) ) ),
+        ( link_to( _('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?), 
+        ( link_to content_tag('span', _('Logout')), :controller => 'account', :action => 'logout', :method => 'post'),
+      ]
+    else
+      [ accessibility_link,
+        ( link_to content_tag('span', _('Login')), :controller => 'account', :action => 'login'),
+      ]
+    end
+  end
+
   def header
     login_or_register_or_logout
   end
diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index b62deca..1e049df 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -33,17 +33,7 @@
        <div id='top_bar' class='category<%= category_color %>'>
         <div id='accessibility_menu'>
           <a href='#content'><span><%= _('Go Content') %></span></a>
-         <%=
-	 if logged_in?
-	   ( accessibility_link ) + " " +
-           ( link_to_homepage((content_tag('span', _('My account'))))) + " " +
-           ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?) + " " +
-	   (link_to (content_tag('span', _('Logout'))), { :controller => 'account', :action => 'logout'}, :method => 'post')
-	 else
-	 ( accessibility_link ) + " " +
-         (link_to (content_tag('span', _('Login'))), :controller => 'account', :action => 'login')
-	 end
-	 %>
+         <%= shortcut_header_links %>
         </div><!-- accessibility_menu -->
         <div id='path_category'>
         <% if @category %>
--
libgit2 0.21.2