diff --git a/archive.html b/archive.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_YXJjaGl2ZS5odG1s..39f12d0d5bca0cccb40ca8011c852ed66d7df760_YXJjaGl2ZS5odG1s 100644
--- a/archive.html
+++ b/archive.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/compat.html b/compat.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_Y29tcGF0Lmh0bWw=..39f12d0d5bca0cccb40ca8011c852ed66d7df760_Y29tcGF0Lmh0bWw= 100644
--- a/compat.html
+++ b/compat.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/contact.html b/contact.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_Y29udGFjdC5odG1s..39f12d0d5bca0cccb40ca8011c852ed66d7df760_Y29udGFjdC5odG1s 100644
--- a/contact.html
+++ b/contact.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/css/site.css b/css/site.css
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_Y3NzL3NpdGUuY3Nz..39f12d0d5bca0cccb40ca8011c852ed66d7df760_Y3NzL3NpdGUuY3Nz 100644
--- a/css/site.css
+++ b/css/site.css
@@ -353,6 +353,7 @@
 
 #menu-follow {
 	float: right;
+	margin-top: 17px;
 }
 
 #menu-follow div {
@@ -379,6 +380,11 @@
 	font-size: 1em;
 	padding-bottom: 10px;
 	text-align: center;
+	line-height:1.75em;
+}
+
+#menu-sub  a{
+	white-space: nowrap;
 }
 
 .menu-sub-sep {
diff --git a/download.html b/download.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_ZG93bmxvYWQuaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_ZG93bmxvYWQuaHRtbA== 100644
--- a/download.html
+++ b/download.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/features.html b/features.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_ZmVhdHVyZXMuaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_ZmVhdHVyZXMuaHRtbA== 100644
--- a/features.html
+++ b/features.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/howtohelp.html b/howtohelp.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_aG93dG9oZWxwLmh0bWw=..39f12d0d5bca0cccb40ca8011c852ed66d7df760_aG93dG9oZWxwLmh0bWw= 100644
--- a/howtohelp.html
+++ b/howtohelp.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/index.html b/index.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_aW5kZXguaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_aW5kZXguaHRtbA== 100644
--- a/index.html
+++ b/index.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/js/detect.js b/js/detect.js
deleted file mode 100644
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_anMvZGV0ZWN0Lmpz..0000000000000000000000000000000000000000
--- a/js/detect.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$(document).ready(function() {
-    var download_url, download_text;
-    var base = 'https://bitbucket.org/pypy/pypy/downloads/';
-    if (navigator.platform.indexOf('Linux') != -1) {
-        if (navigator.platform.indexOf('64') != -1) {
-            download_url = base + 'pypy-1.7-linux64.tar.bz2';
-            download_text = 'Download linux x86-64 bin';
-        } else {
-            download_url = base + 'pypy-1.7-linux.tar.bz2';
-            download_text = 'Download linux x86 bin (32 bit)';
-        }
-    } else if (navigator.platform.indexOf('Win') != -1) {
-        download_url = base + 'pypy-1.7-win32.zip';
-        download_text = 'Download Windows x86 bin (BETA)';
-    } else if (navigator.platform.indexOf('Mac') != 1) {
-        download_url = base + 'pypy-1.7-osx64.tar.bz2';
-        download_text = 'Download Mac OS X 10.6 bin (64 bit)';
-    } else {
-        download_url = "download.html";
-        download_text = "Download page";
-    }
-    $("#main_download").attr('href', download_url);
-    $("#main_download").text(download_text);
-});
diff --git a/js/script2.js b/js/script2.js
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_anMvc2NyaXB0Mi5qcw==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_anMvc2NyaXB0Mi5qcw== 100644
--- a/js/script2.js
+++ b/js/script2.js
@@ -1,2 +1,5 @@
+function set_sidebar_html(html) {
+    $("#sidebar").html(html);
+}
 
 function py3k_donate() {
@@ -1,8 +4,6 @@
 
 function py3k_donate() {
-    $.get("don1.html#", function (html) {
-        $("#sidebar").html(html);
-    });
+    $.get("don1.html", set_sidebar_html);
 }
 
 function stm_donate() {
@@ -6,9 +7,7 @@
 }
 
 function stm_donate() {
-    $.get("don4.html#", function (html) {
-        $("#sidebar").html(html);
-    });
+    $.get("don4.html", set_sidebar_html);
 }
 
 function general_donate() {
@@ -12,9 +11,7 @@
 }
 
 function general_donate() {
-    $.get("don2.html#", function (html) {
-        $("#sidebar").html(html);
-    });
+    $.get("don2.html", set_sidebar_html);
 }
 
 function numpy_donate() {
@@ -18,8 +15,6 @@
 }
 
 function numpy_donate() {
-    $.get("don3.html#", function (html) {
-        $("#sidebar").html(html);
-    });
+    $.get("don3.html", set_sidebar_html);
 }
 
@@ -24,5 +19,3 @@
 }
 
-$(document).ready(function() {
-    stm_donate();
-});
\ No newline at end of file
+$(document).ready(stm_donate);
diff --git a/numpydonate.html b/numpydonate.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_bnVtcHlkb25hdGUuaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_bnVtcHlkb25hdGUuaHRtbA== 100644
--- a/numpydonate.html
+++ b/numpydonate.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/people.html b/people.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_cGVvcGxlLmh0bWw=..39f12d0d5bca0cccb40ca8011c852ed66d7df760_cGVvcGxlLmh0bWw= 100644
--- a/people.html
+++ b/people.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/performance.html b/performance.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_cGVyZm9ybWFuY2UuaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_cGVyZm9ybWFuY2UuaHRtbA== 100644
--- a/performance.html
+++ b/performance.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/py3donate.html b/py3donate.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_cHkzZG9uYXRlLmh0bWw=..39f12d0d5bca0cccb40ca8011c852ed66d7df760_cHkzZG9uYXRlLmh0bWw= 100644
--- a/py3donate.html
+++ b/py3donate.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/source/_layouts/site.genshi b/source/_layouts/site.genshi
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp..39f12d0d5bca0cccb40ca8011c852ed66d7df760_c291cmNlL19sYXlvdXRzL3NpdGUuZ2Vuc2hp 100644
--- a/source/_layouts/site.genshi
+++ b/source/_layouts/site.genshi
@@ -46,7 +46,6 @@
 	</py:if>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"/>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/sponsor.html b/sponsor.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_c3BvbnNvci5odG1s..39f12d0d5bca0cccb40ca8011c852ed66d7df760_c3BvbnNvci5odG1s 100644
--- a/sponsor.html
+++ b/sponsor.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/success.html b/success.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_c3VjY2Vzcy5odG1s..39f12d0d5bca0cccb40ca8011c852ed66d7df760_c3VjY2Vzcy5odG1s 100644
--- a/success.html
+++ b/success.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>
diff --git a/tmdonate.html b/tmdonate.html
index 3a84d8ed4cc190a88ea66984a8de313e70bac0eb_dG1kb25hdGUuaHRtbA==..39f12d0d5bca0cccb40ca8011c852ed66d7df760_dG1kb25hdGUuaHRtbA== 100644
--- a/tmdonate.html
+++ b/tmdonate.html
@@ -15,7 +15,6 @@
 	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script type="text/javascript" src="js/jquery-ui-1.8.14.custom.min.js"></script>
-  <script type="text/javascript" src="js/detect.js"></script>
   <script type="text/javascript" src="js/script2.js?bust=1"></script>
 </head>
 <body>