Index: wp-admin/includes/plugin-install.php
===================================================================
--- wp-admin/includes/plugin-install.php	(revision 18709)
+++ wp-admin/includes/plugin-install.php	(working copy)
@@ -233,7 +233,7 @@
 }
 
 /**
- * Display plugin information in dialog box form.
+ * Display plugin information in the admin chrome.
  *
  * @since 2.7.0
  */
@@ -262,71 +262,202 @@
 	$section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
 	if ( empty($section) || ! isset($api->sections[ $section ]) )
 		$section = array_shift( $section_titles = array_keys((array)$api->sections) );
+	?>
+	<div id="plugin-information">
+		<h2><?php echo $api->name; ?></h2>
+		<?php
+		if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') )
+			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
 
-	iframe_header( __('Plugin Install') );
-	echo "<div id='$tab-header'>\n";
-	echo "<ul id='sidemenu'>\n";
-	foreach ( (array)$api->sections as $section_name => $content ) {
+		else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') )
+			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+		?>
+		<div id="col-container">
+			<div id="col-right">
+				<div class="col-wrap">
+					<h3 class="nav-tab-wrapper">
+						<?php
+						foreach ( (array)$api->sections as $section_name => $content ) {
+							$title = $section_name;
+							$title = ucwords(str_replace('_', ' ', $title));
 
-		$title = $section_name;
-		$title = ucwords(str_replace('_', ' ', $title));
+							$class = ( $section_name == $section ) ? 'nav-tab nav-tab-active' : 'nav-tab';
+							$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
+							$href = esc_url($href);
+							$san_title = esc_attr(sanitize_title_with_dashes($title));
+							echo "\t<a name='$san_title' target='' href='$href' class='$class'>$title</a>\n";
+						}
+						?>
+					</h3>
+					<?php
+					foreach ( (array)$api->sections as $section_name => $content ) {
+						$title = ucfirst( $section_name );
+						$title = ucwords(str_replace('_', ' ', $title));
+						
+						$content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
+						$content = links_add_target($content, '_blank');
 
-		$class = ( $section_name == $section ) ? ' class="current"' : '';
-		$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
-		$href = esc_url($href);
-		$san_title = esc_attr(sanitize_title_with_dashes($title));
-		echo "\t<li><a name='$san_title' target='' href='$href'$class>$title</a></li>\n";
-	}
-	echo "</ul>\n";
-	echo "</div>\n";
+						$san_title = esc_attr(sanitize_title_with_dashes($title));
+
+						$display = ( $section_name == $section ) ? 'block' : 'none';
+
+						echo "\t<div id='section-{$san_title}' class='section' style='display: {$display};'>\n";
+						echo $content;
+						echo "\t</div>\n";
+					}
+					?>
+				</div>
+			</div>
+			<div id="col-left">
+				<div class="col-wrap">
+					<h3 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h3>
+					<ul>
+					<?php if ( ! empty($api->version) ) : ?>
+						<li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
+					<?php endif; if ( ! empty($api->author) ) : ?>
+						<li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
+					<?php endif; if ( ! empty($api->last_updated) ) : ?>
+						<li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
+										printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
+					<?php endif; if ( ! empty($api->requires) ) : ?>
+						<li><strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?></li>
+					<?php endif; if ( ! empty($api->tested) ) : ?>
+						<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
+					<?php endif; if ( ! empty($api->downloaded) ) : ?>
+						<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
+					<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
+						<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
+					<?php endif; if ( ! empty($api->homepage) ) : ?>
+						<li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
+					<?php endif; ?>
+					</ul>
+					<?php if ( ! empty($api->rating) ) : ?>
+					<h3><?php _e('Average Rating') ?></h3>
+					<div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
+						<div class="star star-rating" style="width: <?php echo esc_attr($api->rating) ?>px"></div>
+						<div class="star star5"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('5 stars') ?>" /></div>
+						<div class="star star4"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('4 stars') ?>" /></div>
+						<div class="star star3"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('3 stars') ?>" /></div>
+						<div class="star star2"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('2 stars') ?>" /></div>
+						<div class="star star1"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('1 star') ?>" /></div>
+					</div>
+					<small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
+					<?php endif; ?>
+					<?php if ( ! empty($api->download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?>
+					<p class="action-button">
+					<?php
+					$status = install_plugin_install_status($api);
+					switch ( $status['status'] ) {
+						case 'install':
+							if ( $status['url'] )
+								echo '<a class="button-primary" href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
+							break;
+						case 'update_available':
+							if ( $status['url'] )
+								echo '<a class="button-primary" href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') .'</a>';
+							break;
+						case 'newer_installed':
+							echo '<a>' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . '</a>';
+							break;
+						case 'latest_installed':
+							echo '<a>' . __('Latest Version Installed') . '</a>';
+							break;
+					}
+					?>
+					</p>
+					<?php endif; ?>
+				</div>
+			</div>
+		</div>
+	</div>
+	<?php
+}
+add_action( 'install_plugins_plugin-information', 'install_plugin_information' );
+
+/**
+ * Display plugin information in plugin list table.
+ *
+ * @since 3.3.0
+ */
+function inline_install_plugin_information() {
+	global $tab;
+
+	$api = plugins_api('plugin_information', array('slug' => stripslashes( $_REQUEST['plugin'] ) ));
+
+	if ( is_wp_error($api) )
+		wp_die($api);
+
+	$plugins_allowedtags = array('a' => array('href' => array(), 'title' => array(), 'target' => array()),
+								'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
+								'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
+								'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
+								'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
+								'img' => array('src' => array(), 'class' => array(), 'alt' => array()));
+
+	//Sanitize HTML
+	foreach ( (array)$api->sections as $section_name => $content )
+		$api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
+	foreach ( array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key )
+		$api->$key = wp_kses($api->$key, $plugins_allowedtags);
+
+	$section = isset($_REQUEST['section']) ? stripslashes( $_REQUEST['section'] ) : 'description'; //Default to the Description tab, Do not translate, API returns English.
+	if ( empty($section) || ! isset($api->sections[ $section ]) )
+		$section = array_shift( $section_titles = array_keys((array)$api->sections) );
 	?>
-	<div class="alignright fyi">
-		<?php if ( ! empty($api->download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) : ?>
-		<p class="action-button">
-		<?php
-		$status = install_plugin_install_status($api);
-		switch ( $status['status'] ) {
-			case 'install':
-				if ( $status['url'] )
-					echo '<a href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
-				break;
-			case 'update_available':
-				if ( $status['url'] )
-					echo '<a href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') .'</a>';
-				break;
-			case 'newer_installed':
-				echo '<a>' . sprintf(__('Newer Version (%s) Installed'), $status['version']) . '</a>';
-				break;
-			case 'latest_installed':
-				echo '<a>' . __('Latest Version Installed') . '</a>';
-				break;
-		}
-		?>
+	<td class="name column-name" id="plugin-<?php echo $api->slug; ?>-info">
+		<h3><?php echo $api->name; ?></h3>
+		<p>
+		<?php if ( ! empty($api->author) ) : ?>
+			<strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?><br />
+		<?php endif; if ( ! empty($api->last_updated) ) : ?>
+			<strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span><br />
+		<?php endif; if ( ! empty($api->requires) ) : ?>
+			<strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?><br />
+		<?php endif; if ( ! empty($api->tested) ) : ?>
+			<strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?><br />
+		<?php endif; if ( ! empty($api->downloaded) ) : ?>
+			<strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?><br />
+		<?php endif; ?>
 		</p>
+		<p class="action-links">
+			<?php
+			if ( ! empty($api->download_link) && ( current_user_can('install_plugins') || current_user_can('update_plugins') ) ) :
+				$status = install_plugin_install_status($api);
+				switch ( $status['status'] ) {
+					case 'install':
+						if ( $status['url'] )
+							echo '<a class="button-primary" href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
+						break;
+					case 'update_available':
+						if ( $status['url'] )
+							echo '<a class="button-primary" href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') .'</a>';
+						break;
+					case 'newer_installed':
+						echo sprintf(__('Newer Version (%s) Installed'), $status['version']);
+						break;
+					case 'latest_installed':
+						echo __('Latest Version Installed');
+						break;
+				}
+			endif;
+			?>
+			<a href="<?php echo self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $api->slug ); ?>" class="close-infoinline button" title="<?php echo esc_attr( sprintf( __( 'More information about %s' ), $api->name ) ); ?>"><?php _e( 'Close Details' ); ?></a>
+		</p>
+		<p>
+		<?php if ( ! empty($api->slug) && empty($api->external) ) : ?>
+			<a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a><br />
+		<?php endif; if ( ! empty($api->homepage) ) : ?>
+			<a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a><br />
 		<?php endif; ?>
-		<h2 class="mainheader"><?php /* translators: For Your Information */ _e('FYI') ?></h2>
-		<ul>
-<?php if ( ! empty($api->version) ) : ?>
-			<li><strong><?php _e('Version:') ?></strong> <?php echo $api->version ?></li>
-<?php endif; if ( ! empty($api->author) ) : ?>
-			<li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
-<?php endif; if ( ! empty($api->last_updated) ) : ?>
-			<li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
-							printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
-<?php endif; if ( ! empty($api->requires) ) : ?>
-			<li><strong><?php _e('Requires WordPress Version:') ?></strong> <?php printf(__('%s or higher'), $api->requires) ?></li>
-<?php endif; if ( ! empty($api->tested) ) : ?>
-			<li><strong><?php _e('Compatible up to:') ?></strong> <?php echo $api->tested ?></li>
-<?php endif; if ( ! empty($api->downloaded) ) : ?>
-			<li><strong><?php _e('Downloaded:') ?></strong> <?php printf(_n('%s time', '%s times', $api->downloaded), number_format_i18n($api->downloaded)) ?></li>
-<?php endif; if ( ! empty($api->slug) && empty($api->external) ) : ?>
-			<li><a target="_blank" href="http://wordpress.org/extend/plugins/<?php echo $api->slug ?>/"><?php _e('WordPress.org Plugin Page &#187;') ?></a></li>
-<?php endif; if ( ! empty($api->homepage) ) : ?>
-			<li><a target="_blank" href="<?php echo $api->homepage ?>"><?php _e('Plugin Homepage  &#187;') ?></a></li>
-<?php endif; ?>
-		</ul>
+		</p>
+	</td>
+	<td class="vers column-version">
+	<?php if ( ! empty($api->version) ) :
+		echo $api->version;
+	endif; ?>
+	</td>
+	<td class="rating column-rating">
 		<?php if ( ! empty($api->rating) ) : ?>
-		<h2><?php _e('Average Rating') ?></h2>
 		<div class="star-holder" title="<?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?>">
 			<div class="star star-rating" style="width: <?php echo esc_attr($api->rating) ?>px"></div>
 			<div class="star star5"><img src="<?php echo admin_url('images/star.png?v=20110615'); ?>" alt="<?php _e('5 stars') ?>" /></div>
@@ -337,35 +468,51 @@
 		</div>
 		<small><?php printf(_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings), number_format_i18n($api->num_ratings)); ?></small>
 		<?php endif; ?>
-	</div>
-	<div id="section-holder" class="wrap">
-	<?php
-		if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') )
-			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
+	</td>
+	<td class="desc column-description">
+		<div id="section-holder">
+			<h3 class="nav-tab-wrapper">
+				<?php
+				foreach ( (array)$api->sections as $section_name => $content ) {
+					$title = $section_name;
+					$title = ucwords(str_replace('_', ' ', $title));
 
-		else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') )
-			echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+					$class = ( $section_name == $section ) ? 'nav-tab nav-tab-active' : 'nav-tab';
+					$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
+					$href = esc_url($href);
+					$san_title = esc_attr(sanitize_title_with_dashes($title));
+					echo "\t<a name='$san_title' target='' href='$href' class='$class'>$title</a>\n";
+				}
+				?>
+			</h3>
+			<?php
+			if ( !empty($api->tested) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->tested)), $api->tested, '>') )
+				echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
+			else if ( !empty($api->requires) && version_compare( substr($GLOBALS['wp_version'], 0, strlen($api->requires)), $api->requires, '<') )
+				echo '<div class="updated"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
+			?>
+			<?php
+			foreach ( (array)$api->sections as $section_name => $content ) {
+				$title = ucfirst( $section_name );
+				$title = ucwords(str_replace('_', ' ', $title));
+				
+				$content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
+				$content = links_add_target($content, '_blank');
 
-		foreach ( (array)$api->sections as $section_name => $content ) {
-			$title = $section_name;
-			$title[0] = strtoupper($title[0]);
-			$title = str_replace('_', ' ', $title);
+				$san_title = esc_attr(sanitize_title_with_dashes($title));
 
-			$content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
-			$content = links_add_target($content, '_blank');
+				$display = ( $section_name == $section ) ? 'block' : 'none';
 
-			$san_title = esc_attr(sanitize_title_with_dashes($title));
-
-			$display = ( $section_name == $section ) ? 'block' : 'none';
-
-			echo "\t<div id='section-{$san_title}' class='section' style='display: {$display};'>\n";
-			echo "\t\t<h2 class='long-header'>$title</h2>";
-			echo $content;
-			echo "\t</div>\n";
-		}
-	echo "</div>\n";
-
-	iframe_footer();
-	exit;
+				echo "\t<div id='section-{$san_title}' class='section' style='display: {$display};'>\n";
+				echo $content;
+				echo "\t</div>\n";
+			}
+			?>
+		</div>
+	</td>
+	<?php
+	if ( isset( $_REQUEST['no-chrome'] ) )
+		exit;
 }
-add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
+if ( isset( $_REQUEST['no-chrome'] ) )
+	add_action( 'install_plugins_pre_plugin-information', 'inline_install_plugin_information' );
\ No newline at end of file
Index: wp-admin/includes/class-wp-plugin-install-list-table.php
===================================================================
--- wp-admin/includes/class-wp-plugin-install-list-table.php	(revision 18709)
+++ wp-admin/includes/class-wp-plugin-install-list-table.php	(working copy)
@@ -187,9 +187,8 @@
 			$author = wp_kses( $author, $plugins_allowedtags );
 
 			$action_links = array();
-			$action_links[] = '<a href="' . self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-								'&amp;TB_iframe=true&amp;width=600&amp;height=550' ) . '" class="thickbox" title="' .
-								esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
+			$action_links[] = '<a href="' . self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] ) . '" 
+				class="infoinline" title="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '">' . __( 'Details' ) . '</a>';
 
 			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
 				$status = install_plugin_install_status( $plugin );
@@ -212,7 +211,7 @@
 
 			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
 		?>
-		<tr>
+		<tr id="plugin-<?php echo $plugin['slug']; ?>">
 			<td class="name column-name"<?php echo $style['name']; ?>><strong><?php echo $title; ?></strong>
 				<div class="action-links"><?php if ( !empty( $action_links ) ) echo implode( ' | ', $action_links ); ?></div>
 			</td>
@@ -239,6 +238,4 @@
 		<?php
 		}
 	}
-}
-
-?>
+}
\ No newline at end of file
Index: wp-admin/js/plugin-install.dev.js
===================================================================
--- wp-admin/js/plugin-install.dev.js	(revision 18709)
+++ wp-admin/js/plugin-install.dev.js	(working copy)
@@ -1,50 +1,45 @@
-/* Plugin Browser Thickbox related JS*/
-var tb_position;
 jQuery(document).ready(function($) {
-	tb_position = function() {
-		var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
-
-		if ( $('body.admin-bar').length )
-			adminbar_height = 28;
-
-		if ( tbWindow.size() ) {
-			tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
-			$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
-			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-			if ( typeof document.body.style.maxWidth != 'undefined' )
-				tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
-		};
-
-		return $('a.thickbox').each( function() {
-			var href = $(this).attr('href');
-			if ( ! href )
-				return;
-			href = href.replace(/&width=[0-9]+/g, '');
-			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
-		});
-	};
-
-	$(window).resize(function(){ tb_position(); });
-
-	 $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() {
-		tb_click.call(this);
-
-		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
-		return false;
+	$('a.infoinline').click(function(e) {
+		var _link = $(this);
+		if ($('#plugin-information').length < 1 ) {
+			_link.parents('tr').hide();
+			$('<tr id="plugin-information"><td id="plugin-loading" colspan="4" style="text-align: center; vertical-align: middle;"><img src="' + ajaxurl.replace( '/admin-ajax.php', '' ) + '/images/loading.gif" alt="Loading..."></td></tr>')
+				.insertAfter($(this).parents('tr'))
+				.height(_link.parents('tr').height());
+			$('#plugin-information').load($(this).attr('href') + '&no-chrome=1', function() {
+				$('#plugin-loading').remove();
+				$('#plugin-information').height('auto');
+			});
+		} else {
+			$('#plugin-information td > div').show(function() {
+				$('#plugin-information').remove();
+				_link.parents('tr').show();
+			});
+		}
+		
+		e.preventDefault();
 	});
-
+	
+	$('a.close-infoinline').live('click', function(e) {
+		var id = $(this).parents('td').attr('id');
+		var plugin = id.replace('-info', '');
+		$('#plugin-information').hide().remove();
+		$('#' + plugin).show();
+		
+		e.preventDefault();
+	});
+	
 	/* Plugin install related JS*/
-	$('#plugin-information #sidemenu a').click( function() {
+	$('#plugin-information .nav-tab-wrapper a').live('click', function(e) {
 		var tab = $(this).attr('name');
 		//Flip the tab
-		$('#plugin-information-header a.current').removeClass('current');
-		$(this).addClass('current');
+		$('#plugin-information .nav-tab-active').removeClass('nav-tab-active');
+		$(this).addClass('nav-tab-active');
 		//Flip the content.
 		$('#section-holder div.section').hide(); //Hide 'em all
 		$('#section-' + tab).show();
-		return false;
+		
+		e.preventDefault();
 	});
 
 	$('a.install-now').click( function() {
Index: wp-admin/plugin-install.php
===================================================================
--- wp-admin/plugin-install.php	(revision 18709)
+++ wp-admin/plugin-install.php	(working copy)
@@ -28,8 +28,6 @@
 $parent_file = 'plugins.php';
 
 wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
-	add_thickbox();
 
 $body_id = $tab;
 
@@ -48,14 +46,13 @@
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-
-<?php $wp_list_table->views(); ?>
-
-<br class="clear" />
+<?php if ( 'plugin-information' !== $tab ) { ?>
+	<?php screen_icon(); ?>
+	<h2><?php echo esc_html( $title ); ?></h2>
+	<?php $wp_list_table->views(); ?>
+	<br class="clear" />
+<?php } ?>
 <?php do_action('install_plugins_' . $tab, $paged); ?>
 </div>
 <?php
-include(ABSPATH . 'wp-admin/admin-footer.php');
-
+include(ABSPATH . 'wp-admin/admin-footer.php');
\ No newline at end of file
Index: wp-admin/network/plugin-install.php
===================================================================
--- wp-admin/network/plugin-install.php	(revision 18709)
+++ wp-admin/network/plugin-install.php	(working copy)
@@ -7,9 +7,6 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
-	define( 'IFRAME_REQUEST', true );
-
 /** Load WordPress Administration Bootstrap */
 require_once( './admin.php' );
 
Index: wp-admin/css/wp-admin.dev.css
===================================================================
--- wp-admin/css/wp-admin.dev.css	(revision 18709)
+++ wp-admin/css/wp-admin.dev.css	(working copy)
@@ -6498,98 +6498,33 @@
 	height: 19px;
 }
 
-/* Header on thickbox */
-#plugin-information-header {
-	margin: 0;
-	padding: 0 5px;
-	font-weight: bold;
-	position: relative;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	height: 2.5em;
+/* Plugin information page */
+#plugin-information td h3 {
+	margin-top: 0.5em;
 }
-#plugin-information ul#sidemenu {
-	font-weight: normal;
-	margin: 0 5px;
-	position: absolute;
-	left: 0;
-	bottom: -1px;
-}
 
-/* Install sidemenu */
-#plugin-information p.action-button {
-	width: 100%;
-	padding-bottom: 0;
-	margin-bottom: 0;
-	margin-top: 10px;
-	-moz-border-radius: 3px 0 0 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-bottom-left-radius: 3px;
+#plugin-information .action-links {
+	margin-top: 1.5em;
+	margin-bottom: 1.5em;
 }
 
-#plugin-information .action-button a {
-	text-align: center;
-	font-weight: bold;
-	text-decoration: none;
-	display: block;
-	line-height: 2em;
+#plugin-information td .updated p {
+	margin: 0.5em 0;
 }
 
-#plugin-information h2 {
-	clear: none !important;
-	margin-right: 200px;
+#plugin-information .section ul li {
+	list-style-type: disc;
+	list-style-image: none;
+	margin-left: 2em;
 }
 
-#plugin-information .fyi {
-	margin: 0 10px 50px;
-	width: 210px;
+#plugin-information .section ol li {
+	list-style-type: decimal;
 }
 
-#plugin-information .fyi h2 {
-	font-size: 0.9em;
-	margin-bottom: 0;
-	margin-right: 0;
-}
-
-#plugin-information .fyi h2.mainheader {
-	padding: 5px;
-	-moz-border-radius-topleft: 3px;
-	-webkit-border-top-left-radius: 3px;
-	-khtml-border-top-left-radius: 3px;
-	border-top-left-radius: 3px;
-}
-
-#plugin-information .fyi ul {
-	padding: 10px 5px 10px 7px;
-	margin: 0;
-	list-style: none;
-	-moz-border-radius-bottomleft: 3px;
-	-webkit-border-bottom-left-radius: 3px;
-	-khtml-border-bottom-left-radius: 3px;
-	border-bottom-left-radius: 3px;
-}
-
-#plugin-information .fyi li {
-	margin-right: 0;
-}
-
-#plugin-information #section-holder {
-	padding: 10px;
-}
-
-#plugin-information .section ul,
-#plugin-information .section ol {
-	margin-left: 16px;
-	list-style-type: square;
-	list-style-image: none;
-}
-
 #plugin-information #section-screenshots li img {
 	vertical-align: text-top;
+	max-width: 100%;
 }
 
 #plugin-information #section-screenshots li p {
@@ -6608,8 +6543,6 @@
 	overflow: auto;
 }
 
-
-
 /* press-this */
 body.press-this {
 	color: #333;
Index: wp-admin/css/colors-fresh.dev.css
===================================================================
--- wp-admin/css/colors-fresh.dev.css	(revision 18709)
+++ wp-admin/css/colors-fresh.dev.css	(working copy)
@@ -151,12 +151,6 @@
 textarea.disabled {
 	background-color: #ccc;
 }
-/* #upload-menu li a.upload-tab-link, */
-#plugin-information .action-button a,
-#plugin-information .action-button a:hover,
-#plugin-information .action-button a:visited {
-	color: #fff;
-}
 
 .widget .widget-top,
 .postbox h3,
@@ -569,10 +563,6 @@
 	-webkit-box-shadow: rgba(255,255,255,0.5) 0 1px 0;
 	box-shadow: rgba(255,255,255,0.5) 0 1px 0;
 }
-#plugin-information .action-button {
-	background-color: #d54e21;
-	color: #fff;
-}
 
 #adminmenu li.current a .awaiting-mod,
 #adminmenu	li a.wp-has-current-submenu .update-plugins{
@@ -584,8 +574,7 @@
 	box-shadow: rgba(255,255,255,0.5) 0 1px 0;
 }
 
-div#media-upload-header,
-div#plugin-information-header {
+div#media-upload-header {
 	background-color: #f9f9f9;
 	border-bottom-color: #dfdfdf;
 }
@@ -1332,14 +1321,6 @@
 	border-right: 1px solid #f9f9f9;
 }
 
-#plugin-information .fyi ul {
-	background-color: #eaf3fa;
-}
-
-#plugin-information .fyi h2.mainheader {
-	background-color: #cee1ef;
-}
-
 #plugin-information pre,
 #plugin-information code {
 	background-color: #ededff;
