diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index cebd4e786e0475fb4c5f9eed64a25fea0300c2c5..69ff9da3d03fb2437cf7aa905a05d641cc1547c9 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -158,6 +158,7 @@ class ap_manage {
           ptln('<div class="pm_menu">');
 
           ptln('<div class="common">');
+          ptln('  <h2>'.$this->lang['download'].'</h2>');
           ptln('  <form action="'.wl($ID).'" method="post">');
           ptln('    <fieldset class="hidden">',4);
           ptln('      <input type="hidden" name="do"   value="admin" />');
@@ -165,9 +166,8 @@ class ap_manage {
           ptln('    </fieldset>');
           ptln('    <fieldset>');
           ptln('      <legend>'.$this->lang['download'].'</legend>');
-          ptln('      <h3 class="legend">'.$this->lang['download'].'</h3>');
+          ptln('      <label for="dw__url">'.$this->lang['url'].'<input name="url" id="dw__url" class="edit" type="text" maxlength="200" /></label>');
           ptln('      <input type="submit" class="button" name="fn[download]" value="'.$this->lang['btn_download'].'" />');
-          ptln('      <label for="dw__url">'.$this->lang['url'].'<input name="url" id="dw__url" class="field" type="text" maxlength="200" /></label>');
           ptln('    </fieldset>');
           ptln('  </form>');
           ptln('</div>');
@@ -190,9 +190,9 @@ class ap_manage {
             $new = (in_array($plugin, $this->downloaded)) ? ' class="new"' : '';
 
             ptln('  <form action="'.wl($ID).'" method="post" '.$new.'>');
-            ptln('    <h3 class="legend">'.$plugin.'</h3>');
             ptln('    <fieldset>');
             ptln('      <legend>'.$plugin.'</legend>');
+            ptln('      <h3 class="legend">'.$plugin.'</h3>');
             ptln('      <input type="hidden" name="do"     value="admin" />');
             ptln('      <input type="hidden" name="page"   value="plugin" />');
             ptln('      <input type="hidden" name="plugin" value="'.$plugin.'" />');
diff --git a/lib/plugins/plugin/style.css b/lib/plugins/plugin/style.css
index 03f8ace199ba87c27b661f73630661a274abd32f..9c2fde69260539a4f2afe3eac215cb862fd53796 100644
--- a/lib/plugins/plugin/style.css
+++ b/lib/plugins/plugin/style.css
@@ -11,31 +11,29 @@
 #plugin__manager h2 { margin-left: 0;}
 #plugin__manager form { display: block; margin: 0; padding: 0;}
 #plugin__manager legend { display: none;}
-#plugin__manager .legend { color: black; display: block; margin: 0; padding: 0; font-size: 1em; line-height: 1.4em; font-weight: normal; text-align: left;}
-#plugin__manager fieldset { border: 0; width: auto;}
-#plugin__manager .button { margin: 0 0.3em 2px 0;}
+#plugin__manager fieldset { width: auto;}
+#plugin__manager .button { margin: 0;}
 #plugin__manager p, #plugin__manager label { text-align: left;}
 #plugin__manager .hidden { display: none;}
-#plugin__manager .new { background: __medium__;}
-#plugin__manager input[disabled] { color: __mediumgray__; border-color: __mediumgray__;}  /* IE won't understand but doesn't require it */
+#plugin__manager .new { background: #dee7ec;}
+#plugin__manager input[disabled] { color: #ccc; border-color: #ccc;}  /* IE won't understand but doesn't require it */
 
 #plugin__manager .pm_menu, #plugin__manager .pm_info { margin-left: 0; text-align: left; }
 #plugin__manager .pm_menu { float: left; width: 48%; }
 #plugin__manager .pm_info { float: right; width: 50%; }
 
-#plugin__manager .common { border-bottom: 1px solid __dark__; margin-top: 1em;}
-#plugin__manager .common form { border: 1px solid __dark__; border-bottom: 0;}
-#plugin__manager .common fieldset { margin: 0; padding: 0;}
-#plugin__manager .common .legend { background: __medium__; margin-bottom: 0.3em; padding-left: 0.5em;}
-#plugin__manager .common label { padding: 0 0 0.5em 0.5em; }
-#plugin__manager .common input { width: auto; margin: 0 1em;}
-#plugin__manager .common .button { float: right; width: 6em; }
-#plugin__manager .common p { border-bottom: 1px solid __dark__; padding: 0 0 0.5em 0.5em; margin-bottom: 0;}
-
-#plugin__manager .plugins { border-bottom: 1px solid __dark__;}
-#plugin__manager .plugins form { border: 1px solid __dark__; border-bottom: 0;}
-#plugin__manager .plugins fieldset { text-align: right; }
-#plugin__manager .plugins .legend { float: left; padding: 5px 0 0 5px;}
+#plugin__manager .common { }
+#plugin__manager .common form { }
+#plugin__manager .common fieldset { margin: 0; padding: 0 0 1.0em 0; text-align: left; border: none;}
+#plugin__manager .common label { padding: 0 0 0.5em 0;}
+#plugin__manager .common input {  }
+#plugin__manager .common input.edit { width: 24em; margin: 0.5em;}
+#plugin__manager .common .button { }
+
+#plugin__manager .plugins { }
+#plugin__manager .plugins form { }
+#plugin__manager .plugins fieldset { text-align: right; border-top:0; border-right:0; border-left:0;}
+#plugin__manager .plugins .legend { color: black; display: block; margin: 0; padding: 0; font-size: 1em; line-height: 1.4em; font-weight: normal; text-align: left; float: left; padding: 0;}
 #plugin__manager .plugins .button { width: 5em; font-size: 95%;}
 
 #plugin__manager .pm_info h3 { margin-left: 0; }