diff --git a/rosetta/templates/rosetta/css/rosetta.css b/rosetta/templates/rosetta/css/rosetta.css
index c98b92e..1fff0cf 100644
--- a/rosetta/templates/rosetta/css/rosetta.css
+++ b/rosetta/templates/rosetta/css/rosetta.css
@@ -29,3 +29,7 @@ p.errornote { margin-top:0.4em;}
 #changelist table tbody td:first-child, #changelist table thead th:first-child  {text-align: left;}
 td.hint {color: #777;}
 div.module {margin-bottom: 20px;}
+.checkall {cursor:pointer}
+#toolbar { height:20px}
+#toolbar #translate-all { float:right}
+#toolbar form { float:left; }
\ No newline at end of file
diff --git a/rosetta/templates/rosetta/js/rosetta.js b/rosetta/templates/rosetta/js/rosetta.js
index 08e3ae2..c10e3ba 100644
--- a/rosetta/templates/rosetta/js/rosetta.js
+++ b/rosetta/templates/rosetta/js/rosetta.js
@@ -23,6 +23,19 @@ google.setOnLoadCallback(function() {
         });
         return false;
     });
+    
+    
+    $('#translate-all').submit(function() {
+        $('a.suggest').click();
+        return false;
+    });
+    $('.checkall').click(function(){
+        $('td.c input').attr('checked', '');
+        $('td.c input').attr('value', '0');
+    });
+    
+    
+    
 {% endif %}
     $('td.plural').each(function(i) {
         var td = $(this), trY = parseInt(td.closest('tr').offset().top);
diff --git a/rosetta/templates/rosetta/pofile.html b/rosetta/templates/rosetta/pofile.html
index 73660ab..96dbd8e 100644
--- a/rosetta/templates/rosetta/pofile.html
+++ b/rosetta/templates/rosetta/pofile.html
@@ -10,16 +10,6 @@
         </p>
     </div>
     <script type="text/javascript">
-        jQuery(document).ready(function(){
-            $('.googleall').click(function(){
-               $('a.suggest').click();
-            });
-            $('.checkall').css("cursor", "pointer");
-            $('.checkall').click(function(){
-               $('td.c input').attr('checked', '');
-               $('td.c input').attr('value', '0');
-            });
-        });
     </script>
     
 {% endblock %}
@@ -42,7 +32,6 @@
     
     <ul class="object-tools">
         <li class="nobubble">{% trans "Display:" %}</li>
-        <li><a class="googleall" href="#">{% trans "Google All Translations" %}</a></li>
         <li {% ifequal rosetta_i18n_filter 'untranslated' %}class="active"{% endifequal %}><a href="?filter=untranslated">{% trans "Untranslated only" %}</a></li>
         <li {% ifequal rosetta_i18n_filter 'translated' %}class="active"{% endifequal %}><a href="?filter=translated">{% trans "Translated only" %}</a></li>
         <li {% ifequal rosetta_i18n_filter 'fuzzy' %}class="active"{% endifequal %}><a href="?filter=fuzzy">{% trans "Fuzzy only" %}</a></li>
@@ -58,6 +47,11 @@
                 <input type="submit" name="search" value="{% trans "Go" %}" />
             </div>
         </form>
+        <form id="translate-all">
+            <div>
+                <input type="submit" class="googleall" value="{% trans "Suggest All Translations" %}" />
+            </div>
+        </form>
         </div>
         
         <form method="post" action="">