diff --git a/templates/public/index.html b/templates/public/index.html
index 5a87787d..cc7aa21b 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -132,17 +132,24 @@ <h4>Support</h4>
             title="T-shirts">Schwag via Freewear</a></li>
     </ul>
 
-    <h4>Development</h4>
+    <h4>Tools</h4>
 
     <ul>
         <li><a href="{% url mirrorlist %}"
             title="Get a custom mirrorlist from our database">Mirrorlist Updater</a></li>
+        <li><a href="{% url mirror-status %}"
+            title="Check the status of all known mirrors">Mirror Status</a></li>
+        <li><a href="/packages/differences/"
+            title="See differences in packages between available architectures">Differences by Architecture</a></li>
+    </ul>
+
+    <h4>Development</h4>
+
+    <ul>
         <li><a href="/packages/"
             title="View/search the package repository database">Packages</a></li>
         <li><a href="/groups/"
             title="View the available package groups">Package Groups</a></li>
-        <li><a href="/packages/differences/"
-            title="See differences in packages between available architectures">Differences by Architecture</a></li>
         <li><a href="http://bugs.archlinux.org/"
             title="Report/track bugs or make feature requests">Bug Tracker</a></li>
         <li><a href="{% url page-svn %}"
diff --git a/urls.py b/urls.py
index 7cc60cfe..d754c9af 100644
--- a/urls.py
+++ b/urls.py
@@ -72,7 +72,7 @@
     (r'^news/$',                         'news.views.news_list', {}, 'news-list'),
 
     (r'^mirrors/$',        'devel.views.mirrorlist', {}, 'mirrors-list'),
-    (r'^mirrors/status/$', 'mirrors.views.status', {}, 'mirrors-status'),
+    (r'^mirrors/status/$', 'mirrors.views.status', {}, 'mirror-status'),
 
     (r'^mirrorlist/$', 'mirrors.views.generate_mirrorlist', {}, 'mirrorlist'),
     (r'^mirrorlist/all/$', 'mirrors.views.find_mirrors', {'countries': ['all']}),