diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 3a510f47b..29e5f0328 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -237,8 +237,8 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 <?php } ?>
 
 <?php $wp_list_table->display(); ?>
-</div>
 </form>
+</div>
 
 <div id="ajax-response"></div>
 
diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index d54695fa5..7931d6d09 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -267,7 +267,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 					break;
 
 					case 'lastupdated':
-						echo "<td valign='top'class='$column_name column-$column_name'$style>";
+						echo "<td valign='top' class='$column_name column-$column_name'$style>";
 							if ( 'list' == $mode )
 								$date = 'Y/m/d';
 							else
@@ -277,7 +277,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 					<?php
 					break;
 				case 'registered':
-						echo "<td valign='top'class='$column_name column-$column_name'$style>";
+						echo "<td valign='top' class='$column_name column-$column_name'$style>";
 						if ( $blog['registered'] == '0000-00-00 00:00:00' )
 							echo '&#x2014;';
 						else
@@ -287,7 +287,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 					<?php
 					break;
 				case 'users':
-						echo "<td valign='top'class='$column_name column-$column_name'$style>";
+						echo "<td valign='top' class='$column_name column-$column_name'$style>";
 							$blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
 							if ( is_array( $blogusers ) ) {
 								$blogusers_warning = '';
diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php
index b2cd9ba51..e64d226d9 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -217,7 +217,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 			if ( 'search' != $type ) {
 				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
-					add_query_arg('theme_status', $type, $url),
+					esc_url( add_query_arg('theme_status', $type, $url) ),
 					( $type == $status ) ? ' class="current"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
 				);
@@ -293,7 +293,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
  
 		$class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
-		$checkbox_id = md5($theme['Name']) . "_checkbox";
+		$checkbox_id = "checkbox_" . md5($theme['Name']);
 		$checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme['Name'] . "</label>";
 
 		$description = '<p>' . $theme['Description'] . '</p>';
@@ -325,14 +325,13 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 						<div class='$class second theme-version-author-uri'>";
 
 					$theme_meta = array();
+
 					if ( !empty( $theme['Version'] ) )
 						$theme_meta[] = sprintf( __( 'Version %s' ), $theme['Version'] );
-					if ( !empty( $theme['Author'] ) ) {
-						$author = $theme['Author'];
-						if ( !empty( $theme['Author URI'] ) )
-							$author = '<a href="' . $theme['Author URI'] . '" title="' . esc_attr__( 'Visit author homepage' ) . '">' . $theme['Author'] . '</a>';
-						$theme_meta[] = sprintf( __( 'By %s' ), $author );
-					}
+
+					if ( !empty( $theme['Author'] ) )
+						$theme_meta[] = sprintf( __( 'By %s' ), $theme['Author'] );
+
 					if ( !empty( $theme['Theme URI'] ) )
 						$theme_meta[] = '<a href="' . $theme['Theme URI'] . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
 
diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index efaba27e2..0534b28fa 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -384,7 +384,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		$actions = apply_filters( $prefix . "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
 
 		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id = md5($plugin_data['Name']) . "_checkbox";
+		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
 		$checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>";
 		if ( 'dropins' != $context ) {
 			$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 66d74e864..8f937f36a 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -442,14 +442,14 @@ function wp_network_dashboard_right_now() {
 	<form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
 			<input type="text" name="s" value="" size="17" />
-			<?php submit_button( __( 'Search Users' ), 'button', 'submit', false ); ?>
+			<?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
 		</p>
 	</form>
 
 	<form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
 			<input type="text" name="s" value="" size="17" />
-			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false ); ?>
+			<?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
 		</p>
 	</form>
 <?php
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 26946948e..f294614f2 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -213,10 +213,8 @@ if ( !empty($message) ) { ?>
 <div id="ajax-response"></div>
 <?php find_posts_div(); ?>
 <br class="clear" />
-</div>
-</form>
-<br class="clear" />
 
+</form>
 </div>
 
 <?php