diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 909258809..d044989bd 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,7 +14,8 @@ module ApplicationHelper
       klass = nil
     end
 
-    content_tag("li", link_to(text, url, options), :class => klass)
+    id = "nav-" + text.downcase.gsub(/[^a-z ]/, "").parameterize
+    tag.li(link_to(text, url, options), class: klass, id: id)
   end
 
   def fast_link_to(text, link_params, options = {})
diff --git a/app/javascript/src/styles/common/page_header.scss b/app/javascript/src/styles/common/page_header.scss
index 193e1dbc8..0eec3c303 100644
--- a/app/javascript/src/styles/common/page_header.scss
+++ b/app/javascript/src/styles/common/page_header.scss
@@ -26,6 +26,7 @@ header#top {
     li {
       margin: 0;
       padding: 0;
+      white-space: nowrap;
     }
 
     li a {
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index 9fae2f822..aa42f3b44 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -19,5 +19,5 @@
   <% if CurrentUser.is_moderator? %>
     <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
   <% end %>
-  <%= nav_link_to("More&nbsp;&raquo;".html_safe, site_map_path) %>
+  <%= nav_link_to("More »", site_map_path) %>
 </menu>