diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index a13b437eb..e879ea093 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -139,14 +139,17 @@ endif; ?>
 
 <div class="wrap">
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
+</form>
+<br class="clear" />
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
 <?php
@@ -179,7 +182,7 @@ if ( $page_links )
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <table class="widefat">
 	<thead>
diff --git a/wp-admin/css/global.css b/wp-admin/css/global.css
index a8191b699..c44a49478 100644
--- a/wp-admin/css/global.css
+++ b/wp-admin/css/global.css
@@ -131,8 +131,10 @@ h6 {
 
 .subsubsub {
 	list-style: none;
-	margin: 0 0 8px;
+	margin: 0;
 	padding: 0;
+	position: relative;
+	top: -5px;
 	white-space: nowrap;
 	font-size: 12px;
 	float: left;
@@ -223,7 +225,7 @@ th.check-column + th, th.check-column + td {
 	border-width: 1px;
 	border-style: solid;
 	padding: 0 0.6em;
-	margin-bottom: 1em;
+	margin: 3px 15px 5px;
 }
 
 .updated p, .error p {
diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css
index a2507d0ab..471c1145c 100644
--- a/wp-admin/css/ie.css
+++ b/wp-admin/css/ie.css
@@ -117,10 +117,6 @@ table.ie-fixed {
 	table-layout: fixed;
 }
 
-.search-box .button, #widget-search .button {
-	padding: 1px;
-}
-
 .widefat tr, .widefat th {
 	margin-bottom: 0;
 	border-spacing: 0;
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index aeb903dff..fe079375f 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -173,14 +173,12 @@ unset($status_links);
 </form>
 </div>
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo $search; ?>" />
 	<input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
 </p>
-
 </form>
 
 <?php
@@ -249,7 +247,7 @@ if ( 'spam' == $comment_status ) {
 
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <?php if ( $comments ) { ?>
 <table class="widefat">
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index b110ac734..7185bc3a8 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -75,14 +75,17 @@ endif; ?>
 
 <div class="wrap">
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<ul class="subsubsub"><li><a class="current"><br /></a></li></ul>
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
+</form>
+<br class="clear" />
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
 <?php
@@ -115,7 +118,7 @@ if ( $page_links )
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <table class="widefat">
 	<thead>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index b90b04823..5da23b026 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -110,8 +110,6 @@ require_once('admin-header.php'); ?>
 </div></form>
 </div>
 
-<div class="wrap">
-
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
 <div id="message" class="updated fade"><p>
 <?php if ( (int) $_GET['updated'] ) {
@@ -136,6 +134,7 @@ if ( (int) $_GET['locked'] ) {
 <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 endif; ?>
 
+<div class="wrap">
 <ul class="subsubsub">
 <?php
 
@@ -163,13 +162,15 @@ endif;
 ?>
 </ul>
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
 </p>
+</form>
+
+<form id="posts-filter" action="" method="get">
 
 <?php if ( isset($_GET['post_status'] ) ) : ?>
 <input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
@@ -209,7 +210,7 @@ if ( $page_links )
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <?php
 
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 3e7993c05..1ab2706d6 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -142,14 +142,17 @@ endif; ?>
 
 <div class="wrap">
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
+</form>
+<br class="clear" />
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
 <?php
@@ -182,7 +185,7 @@ if ( $page_links )
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <table class="widefat">
 	<thead>
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 352a8f89b..0066f54b8 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -99,7 +99,6 @@ else
 <br class="clear" />
 </div></form>
 </div>
-<div class="wrap">
 
 <?php
 if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?>
@@ -110,7 +109,7 @@ endif; ?>
 <?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) ) { ?>
 <div id="message" class="updated fade"><p>
 <?php if ( (int) $_GET['updated'] ) {
-	printf( __ngettext( '%d page updated.', '%d pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
+	printf( __ngettext( '%d post updated.', '%d posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) );
 	unset($_GET['updated']);
 }
 
@@ -118,12 +117,13 @@ if ( (int) $_GET['skipped'] )
 	unset($_GET['skipped']);
 
 if ( (int) $_GET['locked'] ) {
-	printf( __ngettext( ' %d page not updated, somebody is editing it.', ' %d pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) );
+	printf( __ngettext( ' %d post not updated, somebody is editing it.', ' %d posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) );
 	unset($_GET['locked']);
 } ?>
 </p></div>
 <?php } ?>
 
+<div class="wrap">
 <ul class="subsubsub">
 <?php
 if ( empty($locked_post_status) ) :
@@ -197,18 +197,15 @@ do_action('restrict_manage_posts');
 </form>
 </div>
 
-<div class="view-switch">
-	<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> src="images/list.gif" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
-	<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> src="images/exc.gif" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
-</div>
-
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
 </p>
+</form>
+
+<form id="posts-filter" action="" method="get">
 
 <?php if ( isset($_GET['post_status'] ) ) : ?>
 <input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" />
@@ -224,8 +221,6 @@ $page_links = paginate_links( array(
 	'current' => $_GET['paged']
 ));
 
-if ( $page_links )
-	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
 <div class="alignleft">
@@ -238,10 +233,19 @@ if ( $page_links )
 <?php wp_nonce_field('bulk-posts'); ?>
 </div>
 
-<br class="clear" />
+<?php if ( $page_links ) { ?>
+<div class="tablenav-pages"><?php echo $page_links; ?></div>
+<?php } ?>
+
+<div class="view-switch">
+	<a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> src="images/list.gif" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a>
+	<a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> src="images/exc.gif" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a>
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
+</div>
+
+<div class="clear"></div>
 
 <?php include( 'edit-post-rows.php' ); ?>
 
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 82aec80f2..1afdef0c5 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -96,6 +96,7 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
+<div class="filter">
 <form id="list-filter" action="" method="get">
 <?php
 $categories = get_terms('link_category', "hide_empty=1");
@@ -117,16 +118,19 @@ echo $select_order;
 
 ?>
 <input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
-</form>
+</form></div>
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<ul class="subsubsub"><li><a class="current"><br /></a></li></ul>
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
 	<input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
+</form>
+<br class="clear" />
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 
 <div class="alignleft">
@@ -140,7 +144,7 @@ echo $select_order;
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <?php
 if ( 'all' == $cat_id )
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 21d342570..c7b4800d2 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -344,7 +344,7 @@ function print_plugins_table($plugins, $context = '') {
 		<input type="submit" name="doaction_active" value="<?php _e('Apply'); ?>" class="button-secondary action" />
 	</div>
 </div>
-<br class="clear" />
+<div class="clear"></div>
 <?php print_plugins_table($active_plugins, 'active') ?>
 </form>
 
@@ -370,7 +370,7 @@ function print_plugins_table($plugins, $context = '') {
 		<input type="submit" name="clear-recent-list" value="<?php _e('Clear List') ?>" class="button-secondary" />
 	</div>
 </div>
-<br class="clear" />
+<div class="clear"></div>
 <?php print_plugins_table($recent_plugins, 'recent') ?>
 </form>
 <?php endif; ?>
@@ -388,7 +388,7 @@ function print_plugins_table($plugins, $context = '') {
 <?php endif; ?>
 	</div>
 </div>
-<br class="clear" />
+<div class="clear"></div>
 <?php print_plugins_table($inactive_plugins, 'inactive') ?>
 </form>
 <?php endif; ?>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 6240ceec8..6b8d4acbb 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -252,14 +252,15 @@ foreach ($arc_result as $arc_row) {
 <?php } // ! is_singular ?>
 </form></div>
 
-<form id="posts-filter" action="" method="get">
-
-<p id="post-search">
+<form class="search-form" action="<?php echo $pagenow ?>" method="get">
+<p class="search-box">
 	<label class="hidden" for="post-search-input"><?php _e( 'Search Media' ); ?>:</label>
-	<input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
+	<input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
 </p>
+</form>
 
+<form id="posts-filter" action="" method="get">
 <div class="tablenav">
 <?php
 if ( ! isset($page_links_total) )
@@ -296,7 +297,7 @@ if ( $page_links )
 <br class="clear" />
 </div>
 
-<br class="clear" />
+<div class="clear"></div>
 
 <?php if ( isset($orphans) ) { ?>
 <table class="widefat">
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 39a568d43..f2c26a1e0 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -544,12 +544,14 @@ p.pagenav {
 }
 
 .tablenav {
+	clear: both;
+	vertical-align: text-top;
+	/*
 	height: 2em;
 	padding: 7px 10px;
-	clear: both;
 	margin-bottom: -10px;
 	margin-top: 8px;
-	vertical-align: text-top;
+	*/
 }
 
 .tablenav .tablenav-pages {
@@ -1565,20 +1567,15 @@ p#big-add-button .button {
 
 p.search-box {
 	position: absolute;
-	right: 15px;
-	top: 52px;
+	right: 0;
+	top: -5px;
 	margin: 0;
 }
 
-p.search-box .button, #widget-search .button {
-	padding: 3px;
-	font-size: 13px;
-}
-
 .search-input {
-	margin-right: 2px;
 	border-width: 1px;
 	border-style: solid;
+	padding: 2px;
 }
 
 #posts-filter fieldset {
@@ -1628,8 +1625,9 @@ body.wp-admin {
 
 .view-switch {
 	float: right;
-	margin: 3px 5px;
+	margin: 0 20px;
 	position: relative;
+	top: 2px;
 }
 
 .view-switch img {
@@ -1642,8 +1640,9 @@ body.wp-admin {
 }
 
 .filter {
-	float: left;
-	margin: 0 30px;
+	left: 180px;
+	position: absolute;
+	top: 24px;
 }
 
 #the-comment-list td.comment p.comment-author {