diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js
index 8904f70e0..397858e5c 100644
--- a/app/assets/javascripts/common.js
+++ b/app/assets/javascripts/common.js
@@ -3,26 +3,6 @@ $(function() {
   $(".striped tbody tr:even").addClass("even");
   $(".striped tbody tr:odd").addClass("odd");
   
-  // More link
-  if ($("#site-map-link").length > 0) {
-    $("#site-map-link").click(function(e) {
-      $("#more-links").toggle();
-      e.preventDefault();
-      e.stopPropagation();
-    });
-
-    $("#more-links").show();
-    $("#more-links").position({
-      of: $("#site-map-link"),
-      my: "left top",
-      at: "left top"
-    }).hide();
-
-    $(document).click(function(e) {
-      $("#more-links").hide();
-    });
-  }
-  
   // Account notices
   $("#hide-sign-up-notice").click(function(e) {
     $("#sign-up-notice").hide();
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index ba1a05ff2..919121d8d 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -9,5 +9,15 @@
   <%= nav_link_to("Notes", notes_path(:group_by => "post")) %>
   <%= nav_link_to("Wiki", wiki_pages_path(:title => "help:home")) %>
   <%= nav_link_to("Forum", forum_topics_path, :class => (CurrentUser.user.has_forum_been_updated? ? "forum-updated" : nil)) %>
+  <%= nav_link_to("Artists", artists_path(:order => "date")) %>
+  <%= nav_link_to("Tags", tags_path(:order => "date")) %>
+  <% if CurrentUser.is_moderator? %>
+    <%= nav_link_to("Aliases", tag_aliases_path) %>
+    <%= nav_link_to("Implications", tag_implications_path) %>
+  <% end %>
+  <%= nav_link_to("Pools", pools_path) %>
+  <% if CurrentUser.is_janitor? %>
+    <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
+  <% end %>
   <%= nav_link_to("More &raquo;".html_safe, site_map_path, :id => "site-map-link") %>
 </menu>
\ No newline at end of file
diff --git a/app/views/layouts/_more_links.html.erb b/app/views/layouts/_more_links.html.erb
index f2e7589ea..ed6fea9be 100644
--- a/app/views/layouts/_more_links.html.erb
+++ b/app/views/layouts/_more_links.html.erb
@@ -1,15 +1,5 @@
 <div id="more-links" style="display: none;">
   <ul>
-    <%= nav_link_to("Artists", artists_path(:order => "date")) %>
-    <%= nav_link_to("Tags", tags_path(:order => "date")) %>
-    <% if CurrentUser.is_moderator? %>
-      <%= nav_link_to("Aliases", tag_aliases_path) %>
-      <%= nav_link_to("Implications", tag_implications_path) %>
-    <% end %>
-    <%= nav_link_to("Pools", pools_path) %>
-    <% if CurrentUser.is_janitor? %>
-      <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
-    <% end %>
     <%= nav_link_to("More &raquo;".html_safe, site_map_path) %>
   </ul>
 </div>
\ No newline at end of file