diff --git a/plugins/SubMirror/css/mirrorsettings.css b/plugins/SubMirror/css/mirrorsettings.css
index d17c794f40..c91bb73b6b 100644
--- a/plugins/SubMirror/css/mirrorsettings.css
+++ b/plugins/SubMirror/css/mirrorsettings.css
@@ -5,6 +5,11 @@
 
 /* we need #something to override most of the #content crap */
 
+#add-mirror-wizard {
+    margin-left: 20px;
+    margin-right: 20px;
+}
+
 #add-mirror-wizard .provider-list table {
     width: 100%;
 }
@@ -15,3 +20,7 @@
 #add-mirror-wizard .provider-heading {
     cursor: pointer;
 }
+#add-mirror-wizard .provider-detail fieldset {
+    margin-top: 8px; /* hack */
+    margin-bottom: 8px; /* hack */
+}
\ No newline at end of file
diff --git a/plugins/SubMirror/js/mirrorsettings.js b/plugins/SubMirror/js/mirrorsettings.js
index e772af3dea..a27abe7ad5 100644
--- a/plugins/SubMirror/js/mirrorsettings.js
+++ b/plugins/SubMirror/js/mirrorsettings.js
@@ -26,13 +26,15 @@ $(function() {
                 function showNew() {
                     var detail = $('<div class="provider-detail" style="display: none"></div>').insertAfter(node);
                     detail.load(ajaxize(targetUrl), function(responseText, testStatus, xhr) {
-                        detail.slideDown();
+                        detail.slideDown('fast', function() {
+                            detail.find('input[type="text"]').focus();
+                        });
                     });
                 }
 
                 var old = addMirror.find('.provider-detail');
                 if (old.length) {
-                    old.slideUp(function() {
+                    old.slideUp('fast', function() {
                         old.remove();
                         showNew();
                     });
diff --git a/plugins/SubMirror/lib/addmirrorwizard.php b/plugins/SubMirror/lib/addmirrorwizard.php
index 0994819b41..7a63f8366b 100644
--- a/plugins/SubMirror/lib/addmirrorwizard.php
+++ b/plugins/SubMirror/lib/addmirrorwizard.php
@@ -26,7 +26,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-class AddMirrorWizard extends Form
+class AddMirrorWizard extends Widget
 {
     /**
      * Name of the form
@@ -47,14 +47,14 @@ class AddMirrorWizard extends Form
      *
      * @return void
      */
-    function formData()
+    function show()
     {
-        $this->out->elementStart('fieldset');
+        $this->out->elementStart('div', array('id' => 'add-mirror-wizard'));
 
         $providers = $this->providers();
         $this->showProviders($providers);
 
-        $this->out->elementEnd('fieldset');
+        $this->out->elementEnd('div');
     }
 
     function providers()