Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 14285)
+++ wp-admin/includes/template.php	(working copy)
@@ -3242,7 +3242,7 @@
  */
 function manage_columns_prefs($page) {
 	$columns = get_column_headers($page);
-
+	
 	$hidden = get_hidden_columns($page);
 
 	foreach ( $columns as $column => $title ) {
@@ -3582,30 +3582,37 @@
 	if ( !isset($_wp_contextual_help) )
 		$_wp_contextual_help = array();
 
-	$settings = '';
+	$settings = apply_filters('screen_settings', '', $screen);
 
 	switch ( $screen->id ) {
 		case 'widgets':
 			$settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
-			$show_screen = true;
 			break;
 	}
+	if( $settings )
+		$show_screen = true;
 ?>
 <div id="screen-meta">
 <?php
 	if ( $show_screen ) :
+		$default_text = __('Show on screen');
 ?>
 <div id="screen-options-wrap" class="hidden">
 	<form id="adv-settings" action="" method="post">
-	<h5><?php _e('Show on screen') ?></h5>
-	<div class="metabox-prefs">
-<?php
-	if ( !meta_box_prefs($screen) && isset($column_screens) ) {
-		manage_columns_prefs($screen);
-	}
-?>
-	<br class="clear" />
-	</div>
+	<?php if ( isset($wp_meta_boxes[$screen->id]) ) : ?>
+		<h5><?php echo apply_filters('meta_box_prefs_header', $default_text); ?></h5>
+		<div class="metabox-prefs">
+			<?php meta_box_prefs($screen); ?>
+			<br class="clear" />
+		</div>
+	<?php endif; ?>
+	<?php if ( isset($column_screens) ) : ?>
+		<h5><?php echo apply_filters('columns_prefs_header', $default_text); ?></h5>
+		<div class="metabox-prefs">
+			<?php manage_columns_prefs($screen); ?>
+			<br class="clear" />
+		</div>
+	<?php endif; ?>
 <?php echo screen_layout($screen); ?>
 <?php echo $screen_options; ?>
 <?php echo $settings; ?>
Index: wp-admin/includes/nav-menu.php
===================================================================
--- wp-admin/includes/nav-menu.php	(revision 14285)
+++ wp-admin/includes/nav-menu.php	(working copy)
@@ -34,7 +34,13 @@
 		);
 		?>
 		<li id="menu-item-<?php echo $item_id; ?>">
-			<dl>
+			<dl class="<?php 
+				if ( isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item'] ) :
+					echo 'menu-item-edit-active';
+				else :
+					echo 'menu-item-edit-inactive';
+				endif;
+			?>">
 				<dt>
 					<span class="item-title"><?php echo esc_html( $item->title ); ?></span>
 					<span class="item-controls">
@@ -65,52 +71,40 @@
 									'move-item'
 								); 
 							?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
-							|
 						</span>
 						<a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php _e('Edit Menu Item'); ?>" href="<?php 
 							echo add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) ); 
-						?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Edit'); ?></a> |
-						<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php 
-						echo wp_nonce_url(
-							add_query_arg(
-								array(
-									'action' => 'delete-menu-item',
-									'menu-item' => $item_id,
-								),
-								remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) 
-							),
-							'delete-menu_item_' . $item_id
-						); ?>"><?php _e('Delete'); ?></a>
+						?>#menu-item-settings-<?php echo $item_id; ?>">Edit Menu Item</a>
 					</span>
 				</dt>
 			</dl>
 
 			<div class="menu-item-settings <?php 
 				if ( isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item'] ) :
-					echo ' menu-item-edit-active';
+					echo 'menu-item-edit-active';
 				else :
-					echo ' menu-item-edit-inactive';
+					echo 'menu-item-edit-inactive';
 				endif;
-			?>" id="menu-item-settings-<?php echo $item_id; ?>">
-				<p class="description">
-					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
-						<?php _e( 'Menu Title' ); ?><br />
-						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
-					</label>
-				</p>
-				<p class="description">
+			?>" id="menu-item-settings-<?php echo $item_id; ?>">					
+				<p class="description description-wide">
 					<label for="edit-menu-item-url-<?php echo $item_id; ?>">
 						<?php _e( 'URL' ); ?><br />
 						<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
 					</label>
 				</p>
-				<p class="description">
+				<p class="description description-thin">
+					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
+						<?php _e( 'Navigation Label' ); ?><br />
+						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+					</label>
+				</p>
+				<p class="description description-thin">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
 						<?php _e( 'Title Attribute' ); ?><br />
 						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
 					</label>
 				</p>
-				<p class="description">
+				<p class="field-link-target description description-thin">
 					<label for="edit-menu-item-target-<?php echo $item_id; ?>">
 						<?php _e( 'Link Target' ); ?><br />
 						<select id="edit-menu-item-target-<?php echo $item_id; ?>" class="widefat edit-menu-item-target" name="menu-item-target[<?php echo $item_id; ?>]">
@@ -119,26 +113,41 @@
 						</select>
 					</label>
 				</p>
-				<p class="description">
+				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
 						<?php _e( 'CSS Classes (optional)' ); ?><br />
 						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->classes ); ?>" />
 					</label>
 				</p>
-				<p class="description">
+				<p class="field-xfn description description-thin">
 					<label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-						<?php _e( 'Link Relationship (XFN) (optional)' ); ?><br />
+						<?php _e( 'Link Relationship (XFN)' ); ?><br />
 						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
 					</label>
 				</p>
-				<p class="description">
+				<p class="field-description description description-wide">
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
-						<?php _e( 'Description (optional)' ); ?><br />
+						<?php _e( 'Description' ); ?><br />
 						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); ?></textarea>
 						<span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
 					</label>
 				</p>
 				
+				<span class="menu-item-actions description-wide submitbox">
+					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php 
+					echo wp_nonce_url(
+						add_query_arg(
+							array(
+								'action' => 'delete-menu-item',
+								'menu-item' => $item_id,
+							),
+							remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) 
+						),
+						'delete-menu_item_' . $item_id
+					); ?>"><?php _e('Remove'); ?></a> | <a class="item-close submitclose" id="close-<?php echo $item_id; ?>" href=""><?php _e('Close'); ?></a>
+					<input class="button-primary save-menu-item" name="save_menu_item" type="submit" value="<?php esc_attr_e('Save Menu Item'); ?>" />
+				</span>
+				
 				<input type="hidden" name="menu-item-append[<?php echo $item_id; ?>]" value="<?php echo $item->append; ?>" />
 				<input type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
 				<input type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
@@ -146,6 +155,8 @@
 				<input type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_parent ); ?>" />
 				<input type="hidden" class="menu-item-position" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
 				<input type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+				
+				<div class="clear"></div>
 			</div><!-- .menu-item-settings-->
 		<?php
 		$output .= ob_get_clean();
@@ -259,14 +270,24 @@
 }
 
 /**
- * Register nav menu metaboxes
+ * Register nav menu metaboxes and advanced menu items
  *
  * @since 3.0.0
  **/
-function wp_nav_menu_meta_boxes_setup() {
+function wp_nav_menu_setup() {
+	// Register meta boxes
 	add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
 	wp_nav_menu_post_type_meta_boxes();
 	wp_nav_menu_taxonomy_meta_boxes();
+	
+	
+	// Register advanced menu items (columns)
+	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
+	
+	add_filter( 'columns_prefs_header', create_function( '', "return __('Show advanced menu properties');" ));
+	// If first time editing, disable advanced items by default.
+	if( false === get_user_option( 'managenav-menuscolumnshidden' ) )
+		update_user_option($user->ID, "managenav-menuscolumnshidden", array ( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', ), true);
 }
 
 /**
@@ -373,7 +394,7 @@
 	?>
 	<div class="customlinkdiv">
 		<ul id="customlink-tabs" class="customlink-tabs add-menu-item-tabs">
-			<li <?php echo ( 'create' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg('customlink-tab', 'create', remove_query_arg($removed_args)); ?>#tabs-panel-create-custom"><?php _e('Create New'); ?></a></li>
+			<li <?php echo ( 'create' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg('customlink-tab', 'create', remove_query_arg($removed_args)); ?>#tabs-panel-create-custom"><?php _e('Create New'); ?></a></li>
 		</ul>
 
 		<div class="tabs-panel <?php 
@@ -390,7 +411,7 @@
 			<p id="menu-item-name-wrap">
 				<label class="howto" for="custom-menu-item-name">
 					<span><?php _e('Text'); ?></span>
-					<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" value="<?php echo esc_attr( __('Menu Item') ); ?>" />
+					<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox label-with-default-title" value="<?php esc_attr_e('Menu Item'); ?>" />
 				</label>
 			</p>
 		</div><!-- /.tabs-panel -->
@@ -508,8 +529,8 @@
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#<?php echo $post_type_name; ?>-all"><?php _e('View All'); ?></a></li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search"><?php _e('Search'); ?></a></li>
+			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#<?php echo $post_type_name; ?>-all"><?php _e('View All'); ?></a></li>
+			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search"><?php _e('Search'); ?></a></li>
 		</ul>
 
 		<div class="tabs-panel <?php 
@@ -664,9 +685,9 @@
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>"><?php _e('Search'); ?></a></li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="menu-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all"><?php _e('View All'); ?></a></li>
+			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
+			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>"><?php _e('Search'); ?></a></li>
+			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>><a class="nav-tab-link" href="<?php echo add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all"><?php _e('View All'); ?></a></li>
 		</ul>
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
@@ -885,4 +906,22 @@
 
 }
 
+/**
+ * Returns the columns for the nav menus page.
+ *
+ * @since 3.0.0
+ *
+ * @param string $menu_item_id The ID of the menu item to format.
+ * @return string|WP_Error $output The menu formatted to edit or error object on failure.
+ */
+function wp_nav_menu_manage_columns() {
+	return array(
+		'cb' => '<input type="checkbox" />',
+		'link-target' => __('Link Target'),
+		'css-classes' => __('CSS Classes'),
+		'xfn' => __('Link Relationship (XFN)'),
+		'description' => __('Description'),
+	);
+}
+
 ?>
Index: wp-admin/js/common.dev.js
===================================================================
--- wp-admin/js/common.dev.js	(revision 14285)
+++ wp-admin/js/common.dev.js	(working copy)
@@ -123,26 +123,48 @@
 // show/hide/save table columns
 columns = {
 	init : function() {
+		var that = this;
 		$('.hide-column-tog', '#adv-settings').click( function() {
-			var column = $(this).val();
-			if ( $(this).attr('checked') )
-				$('.column-' + column).show();
+			var $t = $(this), column = $t.val();
+			if ( $t.attr('checked') )
+				that.checked(column);
 			else
-				$('.column-' + column).hide();
+				that.unchecked(column);
 
-			columns.save_manage_columns_state();
+			columns.saveManageColumnsState();
 		});
 	},
 
-	save_manage_columns_state : function() {
-		var hidden = $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(',');
+	saveManageColumnsState : function() {
+		var hidden = this.hidden();
 		$.post(ajaxurl, {
 			action: 'hidden-columns',
 			hidden: hidden,
 			screenoptionnonce: $('#screenoptionnonce').val(),
 			page: pagenow
 		});
-	}
+	},
+	
+	checked : function(column) {
+		$('.column-' + column).show();
+	},
+	
+	unchecked : function(column) {
+		$('.column-' + column).hide();
+	},
+	
+	hidden : function() {
+		return $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(',');
+	},
+	
+	useCheckboxesForHidden : function() {
+		this.hidden = function(){
+			return $('.hide-column-tog').not(':checked').map(function() {
+				var id = this.id;
+				return id.substring( id, id.length - 5 );
+			}).get().join(',');
+		};
+	},
 }
 
 $(document).ready(function(){columns.init();});
Index: wp-admin/js/nav-menu.dev.js
===================================================================
--- wp-admin/js/nav-menu.dev.js	(revision 14285)
+++ wp-admin/js/nav-menu.dev.js	(working copy)
@@ -111,28 +111,6 @@
 		}
 	},
 
-	/**
-	 * Get the parent element with the matching class, but go no higher than the form.
-	 *
-	 * @param DOM-element el The descendant element up from which we'll be searching
-	 * @param string parentClass The class name of the desired parent element.
-	 * @return DOM-element The parent element.
-	 */
-	getParentWrapper = function( el, parentClass ) {
-		var form = document.getElementById('nav-menu-meta'),
-		i;
-
-		while ( 
-			el.parentNode &&
-			( ! el.className || -1 == el.className.indexOf(parentClass) ) &&
-			el.parentNode != form
-		) {
-			el = el.parentNode;
-		}
-
-		return el;
-	},
-
 	makeDroppable = function(el) {
 		var that = this;
 
@@ -189,7 +167,25 @@
 			// init drag and drop
 			setupListItemsDragAndDrop.call(this, menuList); 
 
+			this.initToggles();
+		},
+		
+		initToggles : function() {
+			// init postboxes
 			postboxes.add_postbox_toggles('nav-menus');
+			
+			// adjust columns functions for menus UI
+			columns.useCheckboxesForHidden();
+			columns.checked = function(field) {
+				$('.field-' + field).removeClass('hidden-field');
+			}
+			columns.unchecked = function(field) {
+				$('.field-' + field).addClass('hidden-field');
+			}
+			// hide fields
+			$('.hide-column-tog').not(':checked').each(function(){
+				$('.field-' + $(this).val() ).addClass('hidden-field');
+			});
 		},
 		
 		attachMenuEditListeners : function() {
@@ -202,6 +198,8 @@
 						return that.eventOnClickMenuDelete(e.target);
 					} else if ( -1 != e.target.className.indexOf('item-delete') ) {
 						return that.eventOnClickMenuItemDelete(e.target);
+					} else if ( -1 != e.target.className.indexOf('item-close') ) {
+						return that.eventOnClickCloseLink(e.target);
 					}
 				}
 			});
@@ -211,24 +209,24 @@
 			if ( ! formEL )
 				return;
 
-			var that = this;
+			var that = this, lwd = 'label-with-default-title';
+			
+			$('.'+lwd).each(function(){
+				var $t = $(this), title = $t.attr('title'), val = $t.val();
+				$t.data(lwd, title);
+				if( '' == val ) $t.val(title);
+				else if ( title == val ) return;
+				else $t.removeClass(lwd);
+			}).focus(function(){
+				var $t = $(this);
+				if( $t.val() == $t.data(lwd) )
+					$t.val('').removeClass(lwd);
+			}).blur(function(){
+				var $t = $(this);
+				if( '' == $t.val() )
+					$t.val( $t.data(lwd) ).addClass(lwd);
+			});
 
-			// set default value for custom link name
-			customLinkNameInput = document.getElementById('custom-menu-item-name');
-			customLinkURLInput = document.getElementById('custom-menu-item-url');
-
-			if ( customLinkNameInput ) {
-				customLinkNameDefault = 'undefined' != typeof customLinkNameInput.defaultValue ? customLinkNameInput.defaultValue : customLinkNameInput.getAttribute('value');
-				customLinkURLDefault = 'undefined' != typeof customLinkURLInput.defaultValue ? customLinkURLInput.defaultValue : customLinkURLInput.getAttribute('value');
-				$(customLinkNameInput).bind('focus', function(e) {
-					this.value = customLinkNameDefault == this.value ? '' : this.value;
-				});
-				
-				$(customLinkNameInput).bind('blur', function(e) {
-					this.value = '' == this.value ? customLinkNameDefault : this.value;
-				});
-			}
-
 			// auto-suggest for the quick-search boxes
 			$('input.quick-search').each(function(i, el) {
 				that.setupQuickSearchEventListeners(el); 
@@ -241,7 +239,7 @@
 
 		attachTabsPanelListeners : function() {
 			$('#menu-settings-column').bind('click', function(e) {
-				if ( e.target && e.target.className && -1 != e.target.className.indexOf('menu-tab-link') ) {
+				if ( e.target && e.target.className && -1 != e.target.className.indexOf('nav-tab-link') ) {
 					var activePanel,
 					panelIdMatch = /#(.*)$/.exec(e.target.href),
 					tabPanels,
@@ -327,21 +325,32 @@
 		},
 
 		eventOnClickEditLink : function(clickedEl) {
-			var activeEdit,
+			var activeEdit, parent,
 			matchedSection = /#(.*)$/.exec(clickedEl.href);
 			if ( matchedSection && matchedSection[1] ) {
-				activeEdit = document.getElementById(matchedSection[1]);
-				if ( activeEdit ) {
-					if ( -1 != activeEdit.className.indexOf('menu-item-edit-inactive') ) {
-						activeEdit.className = activeEdit.className.replace('menu-item-edit-inactive', 'menu-item-edit-active');
-					} else { 
-						activeEdit.className = activeEdit.className.replace('menu-item-edit-active', 'menu-item-edit-inactive');
+				activeEdit = $('#'+matchedSection[1]);
+				if( 0 != activeEdit.length ) {
+					if( activeEdit.hasClass('menu-item-edit-inactive') ) {
+						activeEdit.slideDown('fast')
+							.siblings('dl').andSelf()
+							.removeClass('menu-item-edit-inactive')
+							.addClass('menu-item-edit-active');
+					} else {
+						activeEdit.slideUp('fast')
+							.siblings('dl').andSelf()
+							.removeClass('menu-item-edit-active')
+							.addClass('menu-item-edit-inactive');
 					}
 					return false;
 				}
 			}
 		},
 		
+		eventOnClickCloseLink : function(clickedEl) {
+			$(clickedEl).closest('.menu-item-settings').siblings('dl').find('.item-edit').click();
+			return false;
+		},
+		
 		eventOnClickMenuDelete : function(clickedEl) {
 			// Delete warning AYS
 			if ( confirm( navMenuL10n.warnDeleteMenu ) ) {
@@ -460,8 +469,7 @@
 		 * @param object e The event object.
 		 */
 		eventSubmitMetaForm : function(thisForm, e) {
-			var ancestor,
-			inputs = thisForm.getElementsByTagName('input'),
+			var inputs = thisForm.getElementsByTagName('input'),
 			i = inputs.length,
 			j,
 			listItemData,
@@ -471,6 +479,7 @@
 			processMethod = function(){},
 			re = new RegExp('menu-item\\[(\[^\\]\]*)');
 
+			thisForm.className = thisForm.className + ' processing',
 			that = this;
 
 			params['action'] = '';
@@ -498,7 +507,6 @@
 						params['menu-item[' + listItemDBID + '][' + j + ']'] = listItemData[j];
 					}
 
-					ancestor = getParentWrapper(inputs[i], 'inside');
 					inputs[i].checked = false;
 
 				// we're submitting a search term
@@ -508,7 +516,6 @@
 					inputs[i].className &&
 					-1 != inputs[i].className.search(/quick-search\b[^-]/)
 				) {
-					ancestor = getParentWrapper(inputs[i], 'inside');
 					params['action'] = 'menu-quick-search';
 					params['q'] = inputs[i].value;
 					params['response-format'] = 'markup';
@@ -516,16 +523,12 @@
 					processMethod = that.processQuickSearchQueryResponse;
 				}
 			}
-
-			if ( ancestor )
-				ancestor.className = ancestor.className + ' processing',
-
 			params['menu'] = thisForm.elements['menu'].value;
 			params['menu-settings-column-nonce'] = thisForm.elements['menu-settings-column-nonce'].value;
 
 			$.post( ajaxurl, params, function(menuMarkup) {
 				processMethod.call(that, menuMarkup, params);	
-				ancestor.className = ancestor.className.replace(/processing/g, '');
+				thisForm.className = thisForm.className.replace(/processing/g, '');
 			});
 
 			return false;
@@ -639,7 +642,6 @@
 			if ( items[0] && req.object_type ) {
 				resultList = document.getElementById(req.object_type + '-search-checklist');
 				if ( resultList ) {
-					resultList.innerHTML = '';
 					resultList.appendChild(items[0]);
 				}
 			} else if ( req.type ) {
@@ -647,7 +649,6 @@
 				if ( matched && matched[2] ) {
 					resultList = document.getElementById(matched[2] + '-search-checklist');
 					if ( resultList ) {
-						resultList.innerHTML = '';
 						i = items.length;
 						if ( ! i ) {
 							message = document.createElement('li');
Index: wp-admin/nav-menus.php
===================================================================
--- wp-admin/nav-menus.php	(revision 14285)
+++ wp-admin/nav-menus.php	(working copy)
@@ -316,13 +316,13 @@
 
 // The theme supports menus
 if ( current_theme_supports('nav-menus') ) {
-	// Register nav menu metaboxes
-	wp_nav_menu_meta_boxes_setup();
+	// Set up nav menu
+	wp_nav_menu_setup();
 
 // The theme does not support menus but supports widgets
 } elseif ( current_theme_supports('widgets') ) {
-	// Register nav menu metaboxes
-	wp_nav_menu_meta_boxes_setup();
+	// Set up nav menu
+	wp_nav_menu_setup();
 	$messages_div = '<div id="message" class="error"><p>' . __('The current theme does not natively support menus, but you can use the &#8220;Navigation Menu&#8221; widget to add any menus you create here to the theme&#8217;s sidebar.') . '</p></div>';
 
 // The theme supports neither menus nor widgets.
@@ -340,6 +340,7 @@
 	<?php echo $messages_div; ?>
 	
 	<?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?>
+	<div id="nav-menus-frame">
 	<div id="menu-settings-column" class="metabox-holder">
 
 		<form id="nav-menu-meta" action="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-menu-meta" method="post" enctype="multipart/form-data">
@@ -350,15 +351,13 @@
 		</form>
 
 	</div><!-- /#menu-settings-column -->
-	
 	<div id="menu-management-liquid">
-		<div id="menu-management" class="">
-			<h2>
+		<div id="menu-management">
+			<div class="nav-tabs">
 				<?php 
 				foreach( (array) $nav_menus as $_nav_menu ) :
-				
-					?>
-					<a href="<?php 
+			
+					?><a href="<?php 
 						echo add_query_arg(
 							array(
 								'action' => 'edit',
@@ -366,15 +365,12 @@
 							),
 							admin_url( 'nav-menus.php' )
 						);
-					?>" class="menu-tabs<?php 
-						if ( $nav_menu_selected_id != $_nav_menu->term_id ) 
-							echo ' menu-tab-inactive';
-					?>"><?php echo esc_html( $_nav_menu->name ); ?></a>
-
-					<?php
+					?>" class="nav-tab<?php 
+						if ( $nav_menu_selected_id == $_nav_menu->term_id ) 
+							echo ' nav-tab-active';
+					?>"><?php echo esc_html( $_nav_menu->name ); ?></a><?php
 				endforeach;
-				?>
-				<a href="<?php 
+				?><a href="<?php 
 					echo add_query_arg(
 						array(
 							'action' => 'edit',
@@ -382,44 +378,41 @@
 						),
 						admin_url( 'nav-menus.php' )
 					);
-				?>" class="menu-tabs menu-add-new<?php 
-					if ( 0 != $nav_menu_selected_id ) 
-						echo ' menu-tab-inactive';
+				?>" class="nav-tab menu-add-new<?php 
+					if ( 0 == $nav_menu_selected_id ) 
+						echo ' nav-tab-active';
 				?>"><?php printf( '<abbr title="%s">+</abbr>', esc_html__( 'Add menu' ) ); ?></a>
-			</h2>
+			</div>
 			<div class="menu-edit">
 				<form id="update-nav-menu" action="<?php echo admin_url( 'nav-menus.php' ); ?>" method="post" enctype="multipart/form-data">
-					<div id="submitpost" class="submitbox">
-						<div id="minor-publishing">
-							<div class="misc-pub-section misc-pub-section-last">
-								<label class="howto" for="menu-name">
-									<span><?php _e('Name'); ?></span>
-									<input id="menu-name" name="menu-name" type="text" class="regular-text menu-item-textbox" value="<?php echo esc_attr( $nav_menu_selected_title  ); ?>" />
+					<div id="nav-menu-header">
+						<div id="submitpost" class="submitbox">
+							<div class="major-publishing-actions">
+								<label class="menu-name-label howto open-label" for="menu-name">
+									<span><?php _e('Menu Name'); ?></span>
+									<input name="menu-name" type="text" class="menu-name regular-text menu-item-textbox label-with-default-title" title="Enter menu name here." value="<?php echo esc_attr( $nav_menu_selected_title  ); ?>" />
 									<br class="clear" />
 								</label>
-							</div><!--END .misc-pub-section misc-pub-section-last-->
-							<br class="clear" />
-						</div><!--END #misc-publishing-actions-->
-						<div id="major-publishing-actions">
-
-							<?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
-							<div id="delete-action">
-								<a class="submitdelete deletion menu-delete" href="<?php echo wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ); ?>"><?php _e('Delete Menu'); ?></a>
-							</div><!--END #delete-action-->
-							<?php endif; ?>
-
-							<div id="publishing-action">
-								<input class="button-primary" name="save_menu" type="submit" value="<?php esc_attr_e('Save Menu'); ?>" />
-							</div><!--END #publishing-action-->
-							<br class="clear" />
-						</div><!--END #major-publishing-actions-->
-					</div><!--END #submitpost .submitbox-->
-					<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
-					<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
-					<?php wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' ); ?>
-					<input type="hidden" name="action" value="update" />
-					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
-					<input type="hidden" id="hidden-metaboxes" value="<?php echo wp_initial_nav_menu_meta_boxes(); ?>" />
+							
+								<div class="publishing-action">
+									<input class="button-primary" name="save_menu" type="submit" value="<?php esc_attr_e('Save Menu'); ?>" />
+								</div><!--END .publishing-action-->
+							
+								<?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
+								<div class="delete-action">
+									<a class="submitdelete deletion menu-delete" href="<?php echo wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ); ?>"><?php _e('Delete Menu'); ?></a>
+								</div><!--END .delete-action-->
+								<?php endif; ?>
+								<br class="clear" />
+							</div><!--END .major-publishing-actions-->
+						</div><!--END #submitpost .submitbox-->
+						<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+						<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+						<?php wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' ); ?>
+						<input type="hidden" name="action" value="update" />
+						<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+						<input type="hidden" id="hidden-metaboxes" value="<?php echo wp_initial_nav_menu_meta_boxes(); ?>" />
+					</div><!--END #nav-menu-header-->
 					<div id="post-body">
 						<div id="post-body-content">
 							<?php if ( is_nav_menu( $nav_menu_selected_id ) && ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) ) : ?>
@@ -445,6 +438,7 @@
 			</div><!-- /.menu-edit -->
 		</div><!-- /#menu-management -->
 	</div><!-- /#menu-management-liquid -->
+	</div><!-- /#nav-menus-frame-->
 	<?php endif; // if menus supported in current theme ?>
 </div><!-- /.wrap-->
 
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 14285)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -494,6 +494,10 @@
 	padding-top: 10px;
 }
 
+.nav-menus-php #wpbody-content .metabox-holder {
+	padding-top: 24px;
+}
+
 #content {
 	margin: 0;
 	width: 100%;
@@ -3720,15 +3724,19 @@
 
 /* Tab Interface */
 
-.menu-tabs {
-	border-width: 1px 1px 2px;
+.nav-tab {
 	border-style: solid;
 	border-color: #ccc #ccc #f9f9f9;
-	color: #464646;
-	padding: 4px 20px 6px;
+	border-width: 1px 1px 0;
+	color: #c1c1c1;
+	text-shadow: rgba(255,255,255,1) 0 1px 0;
+	font-size: 12px;
+	line-height: 16px;
+	display: inline-block;
+	padding: 4px 14px 6px;
 	text-decoration: none;
 	background-color: #fafafa;
-	margin: 0 6px 0 0;
+	margin: 0 6px -1px 0;
 	-moz-border-radius: 5px 5px 0 0;
 	-webkit-border-top-left-radius: 5px;
 	-webkit-border-top-right-radius: 5px;
@@ -3738,12 +3746,17 @@
 	border-top-right-radius: 5px;
 }
 
+.nav-tab-active {
+	border-width: 1px;
+	color: #464646;
+}
+
 .themes-php .wrap h2, .theme-install-php .wrap h2 {
 	border-bottom: 1px solid #ccc;
+	padding-bottom: 0;
 }
 
-.menu-tab-inactive {
-	border-width: 1px 1px 0;
-	background-color: #fafafa;
-	color: #c1c1c1;
+h2 .nav-tab, h2 .nav-tab {
+	padding: 4px 20px 6px;
+	font: italic normal normal 24px/35px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 }
Index: wp-admin/css/nav-menu.dev.css
===================================================================
--- wp-admin/css/nav-menu.dev.css	(revision 14285)
+++ wp-admin/css/nav-menu.dev.css	(working copy)
@@ -2,16 +2,22 @@
  * WordPress Administration Custom Navigation
  * Interface CSS
  *
- * @version 2.0.0
+ * @version 3.0.0
  *
  * @package WordPress
  * @subpackage Administration
  */
 
+#nav-menus-frame {
+	margin-left: 300px;
+}
+
 #menu-settings-column {
 	display:block;
-	float:left;
 	width:281px;
+	margin-left: -300px;
+	clear: both;
+	float: left;
 }
 
 #menu-settings-column .inside {
@@ -22,23 +28,47 @@
 	background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
 }
 
+#wpbody {
+	position: relative;
+}
+
 /* Menu Container */
-#menu-management-liquid { 
-	float:right;
-	margin-left:-300px;
-	width: 100%;
+#menu-management-liquid {
+	float: left;
+	min-width: 100%;
 }
 #menu-management {
-	margin-left:300px;
-	max-width: 600px;
+	position: relative;
+	margin-right: 20px;
+	margin-top: -3px;
+	width: 100%;
 }
 	#menu-management .menu-edit {
-		background-color:#fff;
-		border-color: #dfdfdf;
-		border-width: 1px;
+		margin-bottom: 20px;
+	}
+	
+	#nav-menu-header, #post-body {
+		border-color: #ccc;
 		border-style: solid;
-		margin-bottom: 20px;
-		padding:0 10px 10px;
+	}
+	
+	#nav-menu-header {
+		background: url("../images/gray-grad.png") repeat-x scroll left top #dfdfdf;
+		border-width: 1px 1px 0 1px;
+		-moz-border-radius-topleft: 6px;
+		-webkit-border-top-left-radius: 6px;
+		-khtml-border-top-left-radius: 6px;
+		border-top-left-radius: 6px;
+		-moz-border-radius-topright: 6px;
+		-webkit-border-top-right-radius: 6px;
+		-khtml-border-top-right-radius: 6px;
+		border-top-right-radius: 6px;
+	}
+	
+	#post-body {
+		background: #fff;
+		padding:0 0 10px 10px;
+		border-width: 0 1px 1px 1px;
 		-moz-border-radius-bottomleft: 6px;
 		-webkit-border-bottom-left-radius: 6px;
 		-khtml-border-bottom-left-radius: 6px;
@@ -47,33 +77,61 @@
 		-webkit-border-bottom-right-radius: 6px;
 		-khtml-border-bottom-right-radius: 6px;
 		border-bottom-right-radius: 6px;
-		-moz-border-radius-topright: 6px;
-		-webkit-border-top-right-radius: 6px;
-		-khtml-border-top-right-radius: 6px;
-		border-top-right-radius: 6px;
 	}
 
 	#menu-management .menu-add-new abbr {
 		font-weight:bold;
 	}
+	
+	#menu-management .nav-tabs {
+		padding-left: 20px;
+	}
 
-	#menu-management .menu-tabs {
-		background-color:#fff;
-		border-color:#dfdfdf;
-		border-bottom-color:#fff;
+	#menu-management .nav-tab {
+		background: #f4f4f4;
+		font-weight: bold;
+		border-color: #dfdfdf;
 	}
 	
-	#menu-management .menu-tab-inactive {
-		background-color:#fafafa;
-		border-bottom-color:#fafafa;
+	#menu-management .nav-tab-active {
+		background: #ececec;
+/*		background: url("../images/gray-grad.png") repeat-x scroll left top #DFDFDF;*/
+		border-color:#ccc;
+		border-bottom-color: #ececec;
 	}
+	
+	#menu-management #major-publishing-actions #delete-action {
+		float: right;
+		margin-right: 10px;
+	}
+	
+	#menu-name-label {
+		margin-top: -2px;
+	}
+	
+	#wpbody .open-label {
+		display: inline-block;
+	}
+	#wpbody .open-label span {
+		padding-right: 10px;
+	}
+	
+	.js .label-with-default-title {
+		color: #aaa;
+		font-style: italic;
+	}
 
 #menu-management .inside { padding: 0 10px; }
 
+/* Add Menu Item Boxes */
+.tabs-panel .howto input {
+	width: 180px;
+}
+
 /* Button Primary Actions */
 #menu-container .submit { margin: 0px 0px 10px; padding: 0px; }
 
-.submitdelete { font-size: 11px; }
+.submitdelete, .submitclose { font-size: 11px; }
 #cancel-save { color: #ff0000; text-decoration: underline; font-size: 11px; margin-left: 20px; margin-top: 5px; }
 #cancel-save:hover { background-color: #FF0000; color: #fff; }
 
@@ -83,7 +141,7 @@
 	float: right;
 }
 
-.processing .add-to-menu {
+form.processing .add-to-menu {
 	background: url("../images/wpspin_light.gif") no-repeat top center;
 	display:block;
 	height:20px;
@@ -148,17 +206,33 @@
 	position:relative;
 }
 .menu li dl dt {
-	-webkit-border-radius: 6px; 
-	border-radius: 6px; 
-	-moz-border-radius: 6px; 
+	background: url("../images/gray-grad.png") repeat-x scroll left top #DFDFDF;
 	border: 1px solid #E6E6E6; 
 	clear:both;
 	position: relative; 
 	padding-left: 10px; 
-	background-color: #f1f1f1; 
-	height: 35px; 
+/*	background-color: #f1f1f1; */
+	height: 35px;
+	width: 400px; 
 	line-height: 35px;
+	text-shadow: 0 1px 0 #FFFFFF;
+	font-weight:bold;
 }
+.menu li dl.menu-item-edit-inactive dt {
+	border-radius: 6px;
+	-webkit-border-radius: 6px; 
+	-moz-border-radius: 6px;
+	-khtml-border-radius: 6px;
+}
+.menu li dl.menu-item-edit-active dt {
+	-moz-border-radius: 6px 6px 0 0;
+	-webkit-border-top-right-radius: 6px;
+	-webkit-border-top-left-radius: 6px;
+	-khtml-border-top-right-radius: 6px;
+	-khtml-border-top-left-radius: 6px;
+	border-top-right-radius: 6px;
+	border-top-left-radius: 6px;
+}
 .js .menu li dl dt {
 	cursor: move;
 }
@@ -177,10 +251,13 @@
 	margin-right:18em;
 }
 
+.menu li .sortable-placeholder {
+	width: 430px;
+}
 .menu li div.sortable-placeholder {
 	background: #f5f5f5;
 	border: 1px dashed #bbb;
-	margin: 10px 0px;
+	margin: 10px 0;
 	padding-top:40px;
 }
 
@@ -189,20 +266,17 @@
 	padding-bottom:40px;
 }
 
-.menu li ul li { margin-left: 20px; opacity: .7; }
-.menu li ul li ul li { opacity: .9; }
-.menu li ul li ul li ul li { opacity: .9; }
-.menu li ul li ul li ul li ul li { opacity: .95; }
+.menu li ul li { margin-left: 20px; }
 
 /* Drag and Drop */
 .dropzone { height: 7px; margin: 3px 0 3px 0; }
-.ui-draggable-dragging  { width: 600px; }
 
 /* Menu item controls */
 .item-type { text-transform: uppercase; font-size: 11px; color: #999999; padding-right: 10px; }
-.item-controls { font-size: 11px; position: absolute; right: 15px; top: -1px; }
+.item-controls { font-size: 11px; position: absolute; right: 20px; top: -1px; }
 .item-controls a { text-decoration: none; }
 .item-controls a:hover { cursor: pointer; }
+.item-controls .item-order { padding-right: 10px;}
 .item-controls .item-order a {
 	font-weight:bold;
 }
@@ -213,12 +287,36 @@
 
 .item-controls .menu-item-delete:hover { color: #ff0000; }
 
+.item-edit {
+	background: url("../images/menu-bits.gif") no-repeat scroll 0 -105px;
+	position: absolute;
+	right: -20px;
+	top: 0;
+	display: block;
+	width: 23px;
+	height: 36px;
+	overflow: hidden;
+	text-indent:-999em;
+}
+
 /* Menu editing */
-.menu-item-edit-active {
+.menu-item-settings {
+	background: #F9F9F9;
+	width: 400px;
+	padding: 10px 0 10px 10px;
+	border: solid #E6E6E6;
+	border-width: 0 1px 1px 1px;
+	-moz-border-radius: 0 0 6px 6px;
+	-webkit-border-bottom-right-radius: 6px;
+	-webkit-border-bottom-left-radius: 6px;
+	-khtml-border-bottom-right-radius: 6px;
+	-khtml-border-bottom-left-radius: 6px;
+}
+.menu-item-settings.menu-item-edit-active {
 	display:block;
 }
 
-.menu-item-edit-inactive {
+.menu-item-settings.menu-item-edit-inactive {
 	display:none;
 }
 
@@ -227,6 +325,31 @@
 	text-align:center;
 }
 
+.hidden-field {
+	display: none;
+}
+
+.description-thin, .description-wide {
+	padding-right: 10px;
+	float: left;
+}
+.description-thin {
+	width: 190px;
+	height: 40px;
+}
+.description-wide {
+	width: 390px;
+}
+
+.menu-item-actions {
+	padding-top: 15px;
+	line-height: 25px;
+}
+.save-menu-item {
+	padding-left: 10px;
+	float: right;
+}
+
 #cancel-save { cursor: pointer; }
 #cancel-save:hover { color: #fff !important; }
 #update-menu-item { color: #fff !important; }
@@ -234,6 +357,39 @@
 #update-menu-item:active,
 #update-menu-item:focus { color: #eaf2fa !important; border-color: #13455b !important; }
 
+/* Major/minor publishing actions (classes) */
+.major-publishing-actions {
+	padding: 5px 10px;
+	border-bottom: 1px solid #eee;
+}
+.major-publishing-actions .publishing-action {
+	text-align: right;
+	float: right;
+	line-height: 23px;
+}
+.major-publishing-actions .delete-action {
+	line-height: 25px;
+	vertical-align: middle;
+	text-align: left;
+	float: right;
+	padding-right: 15px;
+}
+.menu-name-label span {
+	font-size: 11px;
+	font-style: normal;
+}
+.submitbox .submitclose {
+	color: #21759B;
+	border-bottom: 1px solid #21759B;
+	padding: 1px 2px;
+	text-decoration: none;
+}
+.submitbox .submitclose:hover {
+	background: #21759B;
+	color: #fff;
+}
+
+
 /* Clearfix */
 .button-controls:after, #menu-item-url-wrap:after, #menu-item-name-wrap:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 .button-controls, #menu-item-url-wrap, #menu-item-name-wrap { display: block; }
Index: wp-admin/theme-install.php
===================================================================
--- wp-admin/theme-install.php	(revision 14285)
+++ wp-admin/theme-install.php	(working copy)
@@ -59,7 +59,7 @@
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><a href="themes.php" class="menu-tabs menu-tab-inactive"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="menu-tabs"><?php echo esc_html( $title ); ?></a></h2>
+<h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
 
 	<ul class="subsubsub">
 <?php
Index: wp-admin/themes.php
===================================================================
--- wp-admin/themes.php	(revision 14285)
+++ wp-admin/themes.php	(working copy)
@@ -134,7 +134,7 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><a href="themes.php" class="menu-tabs"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="menu-tabs menu-tab-inactive"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
+<h2><a href="themes.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a><?php if ( current_user_can('install_themes') ) { ?><a href="theme-install.php" class="nav-tab"><?php echo esc_html_x('Install Themes', 'theme'); ?></a><?php } ?></h2>
 
 <h3><?php _e('Current Theme'); ?></h3>
 <div id="current-theme">