diff -r adc8466df404 -r 753f1380d6bc app/views/layouts/base.rhtml
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -5,12 +5,12 @@
 <title><%=h html_title %></title>
 <meta name="description" content="A repository for software developed and published by audio and music researchers in the UK." />
 <meta name="keywords" content="audio,music,software,research,UK,sound,repository,code,redmine" />
+<%= csrf_meta_tag %>
 <%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
-<%= heads_for_wiki_formatter %>
 <!--[if IE 6]>
     <style type="text/css">
       * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
@@ -29,11 +29,11 @@
         <%= render_menu :account_menu -%>
     </div>
     <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
-    <%= render_menu :top_menu -%>
+    <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
 </div>
       
 <%= tag('div', {:id => 'header', :class => (display_main_menu?(@project) ? 'header-project' : 'header-general')}, true) %>
-
+    <% if User.current.logged? || !Setting.login_required? %>
 
     <div id="project-search-jump">
       <div id="quick-search">
@@ -48,6 +48,7 @@
         <%= render_project_jump_box %>
       </div>
     </div>
+    <% end %>
 
     <% unless page_header_title[1].empty? %>
       <h3 id="project-ancestors-title"><%= page_header_title[1] %></h3>