Index: src/wp-admin/css/themes.css
===================================================================
--- src/wp-admin/css/themes.css	(revision 27965)
+++ src/wp-admin/css/themes.css	(working copy)
@@ -1248,6 +1248,9 @@
 	box-shadow: 0 1px 1px rgba(0,0,0,0.04);
 	padding: 10px;
 }
+.more-filters-container .filters-group.features {
+	width: 38%;
+}
 .more-filters-container .feature-name {
 	margin: 0;
 	position: relative;
Index: src/wp-admin/includes/theme.php
===================================================================
--- src/wp-admin/includes/theme.php	(revision 27965)
+++ src/wp-admin/includes/theme.php	(working copy)
@@ -192,7 +192,10 @@
 				'light'   => __( 'Light' ),
 			),
 
-		__( 'Columns' ) => array(
+		__( 'Layout' ) => array(
+			'fixed-layout'      => __( 'Fixed Layout' ),
+			'fluid-layout'      => __( 'Fluid Layout' ),
+			'responsive-layout' => __( 'Responsive Layout' ),
 			'one-column'    => __( 'One Column' ),
 			'two-columns'   => __( 'Two Columns' ),
 			'three-columns' => __( 'Three Columns' ),
@@ -201,12 +204,6 @@
 			'right-sidebar' => __( 'Right Sidebar' ),
 		),
 
-		__( 'Layout' ) => array(
-			'fixed-layout'      => __( 'Fixed Layout' ),
-			'fluid-layout'      => __( 'Fluid Layout' ),
-			'responsive-layout' => __( 'Responsive Layout' ),
-		),
-
 		__( 'Features' ) => array(
 			'accessibility-ready'   => __( 'Accessibility Ready' ),
 			'blavatar'              => __( 'Blavatar' ),
@@ -256,7 +253,6 @@
 
 	$category_translations = array(
 		'Colors'   => __( 'Colors' ),
-		'Columns'  => __( 'Columns' ),
 		'Layout'   => __( 'Layout' ),
 		'Features' => __( 'Features' ),
 		'Subject'  => __( 'Subject' )
Index: src/wp-admin/theme-install.php
===================================================================
--- src/wp-admin/theme-install.php	(revision 27965)
+++ src/wp-admin/theme-install.php	(working copy)
@@ -127,9 +127,14 @@
 			<a class="clear-filters button button-secondary" href="#"><?php _e( 'Clear' ); ?></a>
 			<br class="clear" />
 		<?php
-		$feature_list = get_theme_feature_list();
+		$feature_list = get_theme_feature_list( false /* temporary */ );
 		foreach ( $feature_list as $feature_name => $features ) {
-			echo '<div class="filters-group">';
+			if ( $feature_name === 'Features' || $feature_name === __( 'Features' ) ) {
+				// hack hack hack
+				echo '<div class="filters-group features">';
+			} else {
+				echo '<div class="filters-group">';
+			}
 			$feature_name = esc_html( $feature_name );
 			echo '<h4 class="feature-name">' . $feature_name . '</h4>';
 			echo '<ol class="feature-group">';