diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index fbfec472741948349218072f536725430e01e79d..6a1b6b099c50aae992820c1964d0b8a412f368ed 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -2,8 +2,8 @@
 
 <% if @versions.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
+<% else %>
+<div id="roadmap">
 <% @versions.each do |version| %>   
     <%= tag 'a', :name => version.name %>
     <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
@@ -16,8 +16,9 @@
                                           :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
        issues ||= []
     %>
+    <% if issues.size > 0 %>
+    <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
     <ul>
-      <% if issues.size > 0 %>
         <% issues.each do |issue| %>
           <li>
             <%= link = link_to_issue(issue)
@@ -25,19 +26,22 @@
             <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
           </li>
         <% end %>
-      <% end %>
     </ul>
+    </fieldset>
+    <% end %>
+<% end %>
+</div>
 <% end %>
 
 <% content_for :sidebar do %>
 <% form_tag do %>
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
-  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
   <%= tracker.name %></label><br />
 <% end %>
 <br />
-<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
+<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bfc66f75e08cbf5ef56e2ed388f501d32b1091c5..cffcab26feec987c5757ebb419dc1a221bee8a82 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -163,6 +163,12 @@ div#activity dt { margin-bottom: 1px; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description { font-style: italic; }
 
+div#roadmap fieldset.related-issues { margin-bottom: 1em; }
+div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
+div#roadmap .wiki h1:first-child { display: none; }
+div#roadmap .wiki h1 { font-size: 120%; }
+div#roadmap .wiki h2 { font-size: 110%; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }