diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 7180b82773..7878c70448 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -7,9 +7,9 @@
  */
 ?>
 
-<br class="clear" /></div><!-- wpbody-content -->
+<div class="clear" /></div></div><!-- wpbody-content -->
 </div><!-- wpbody -->
-<br class="clear" /></div><!-- wpcontent -->
+<div class="clear" /></div></div><!-- wpcontent -->
 </div><!-- wpwrap -->
 
 <div id="footer">
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index ee0603e39c..67f0ee6279 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -14,8 +14,8 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	padding: 0;
 	border: 0;
 	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
+/*	font-size: 100%;
+	vertical-align: baseline; */
 	background: transparent;
 }
 body {
@@ -48,10 +48,12 @@ del {
 }
 
 /* tables still need 'cellspacing="0"' in the markup */
+/*
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
+*/
 /* end reset css */
 
 
@@ -147,7 +149,7 @@ input[type="radio"] {
 
 body,
 td {
-	font: 13px/19px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
 }
 
 p {
diff --git a/wp-admin/edit-category-form.php b/wp-admin/edit-category-form.php
index d2b58a74b1..798013c259 100644
--- a/wp-admin/edit-category-form.php
+++ b/wp-admin/edit-category-form.php
@@ -12,25 +12,6 @@
 if ( ! isset( $category ) )
 	$category = (object) array();
 
-if ( ! empty($cat_ID) ) {
-	/**
-	 * @var string
-	 */
-	$heading = '';
-	$submit_text = __('Edit Category');
-	$form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">';
-	$action = 'editedcat';
-	$nonce_action = 'update-category_' . $cat_ID;
-	do_action('edit_category_form_pre', $category);
-} else {
-	$heading = '<h2>' . __('Add Category') . '</h2>';
-	$submit_text = __('Add Category');
-	$form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">';
-	$action = 'addcat';
-	$nonce_action = 'add-category';
-	do_action('add_category_form_pre', $category);
-}
-
 /**
  * @ignore
  * @since 2.7
@@ -52,16 +33,18 @@ function _fill_empty_category(&$category) {
 		$category->description = '';
 }
 
+do_action('edit_category_form_pre', $category);
+
 _fill_empty_category($category);
 ?>
 
 <div class="wrap">
-<?php echo $heading ?>
+<h2><?php _e('Edit Category'); ?></h2>
 <div id="ajax-response"></div>
-<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
+<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">
+<input type="hidden" name="action" value="editedcat" />
 <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
-<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
+<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
 			<th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th>
@@ -86,7 +69,7 @@ _fill_empty_category($category);
             <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
 		</tr>
 	</table>
-<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Edit Category'); ?>" /></p>
 <?php do_action('edit_category_form', $category); ?>
 </form>
 </div>
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 12556660fc..50b5aac585 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -167,7 +167,6 @@ if( !empty($action) ) {
 
 wp_enqueue_script('admin-forms');
 wp_enqueue_script('plugin-install');
-add_thickbox();
 
 $title = __('Manage Plugins');
 require_once('admin-header.php');
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a36575a2bb..349debd0ec 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -14,8 +14,6 @@
 
 .plugins .togl {
 	width: 150px;
-	border-right-width: 1px;
-	border-right-style: solid;
 }
 
 .import-system {
@@ -2929,3 +2927,7 @@ form.upgrade {
 	-webkit-border-radius: 6px;
 	border-radius: 6px;
 }
+
+#flash-upload-ui {
+	padding: 20px 12px 0;
+}