Index: src/bp-core/admin/bp-core-admin-components.php
===================================================================
--- src/bp-core/admin/bp-core-admin-components.php	(revision 10459)
+++ src/bp-core/admin/bp-core-admin-components.php	(working copy)
@@ -160,23 +160,15 @@
 
 	<h3 class="screen-reader-text"><?php _e( 'Components list', 'buddypress' ); ?></h3>
 
-	<table class="widefat fixed plugins" cellspacing="0">
+	<table class="wp-list-table widefat plugins">
 		<thead>
 			<tr>
-				<th scope="col" id="cb" class="manage-column column-cb check-column">&nbsp;</th>
-				<th scope="col" id="name" class="manage-column column-name" style="width: 190px;"><?php _e( 'Component', 'buddypress' ); ?></th>
+				<td id="cb" class="manage-column column-cb check-column"><input id="cb-select-all-1" type="checkbox" disabled><label class="screen-reader-text" for="cb-select-all-1"><?php _e( 'Bulk selection is disabled', 'buddypress' ); ?></label></td>
+				<th scope="col" id="name" class="manage-column column-title column-primary"><?php _e( 'Component', 'buddypress' ); ?></th>
 				<th scope="col" id="description" class="manage-column column-description"><?php _e( 'Description', 'buddypress' ); ?></th>
 			</tr>
 		</thead>
 
-		<tfoot>
-			<tr>
-				<th scope="col" class="manage-column column-cb check-column">&nbsp;</th>
-				<th scope="col" class="manage-column column-name" style="width: 190px;"><?php _e( 'Component', 'buddypress' ); ?></th>
-				<th scope="col" class="manage-column column-description"><?php _e( 'Description', 'buddypress' ); ?></th>
-			</tr>
-		</tfoot>
-
 		<tbody id="the-list">
 
 			<?php if ( !empty( $current_components ) ) : ?>
@@ -190,24 +182,22 @@
 					endif; ?>
 
 					<tr id="<?php echo esc_attr( $name ); ?>" class="<?php echo esc_attr( $name ) . ' ' . esc_attr( $class ); ?>">
-						<th scope="row">
+						<th scope="row" class="check-column">
 
 							<?php if ( !in_array( $name, array( 'core', 'members' ) ) ) : ?>
 
-								<input type="checkbox" id="bp_components[<?php echo esc_attr( $name ); ?>]" name="bp_components[<?php echo esc_attr( $name ); ?>]" value="1"<?php checked( isset( $active_components[esc_attr( $name )] ) ); ?> />
+								<input type="checkbox" id="bp_components[<?php echo esc_attr( $name ); ?>]" name="bp_components[<?php echo esc_attr( $name ); ?>]" value="1"<?php checked( isset( $active_components[esc_attr( $name )] ) ); ?> /><label for="bp_components[<?php echo esc_attr( $name ); ?>]" class="screen-reader-text"><?php printf( __( 'Select %s', 'buddypress' ), esc_html( $labels['title'] ) ); ?></label>
 
+							<?php else : ?>
+
+								<input type="checkbox" id="bp_components[<?php echo esc_attr( $name ); ?>]" name="bp_components[<?php echo esc_attr( $name ); ?>]" value="1" checked="checked" disabled><label for="bp_components[<?php echo esc_attr( $name ); ?>]" class="screen-reader-text"><?php printf( __( '%s is a required component', 'buddypress' ), esc_html( $labels['title'] ) ); ?></label>
+
 							<?php endif; ?>
 
 						</th>
-						<td class="plugin-title" style="width: 190px;">
+						<td class="plugin-title column-primary">
 							<span></span>
-							<label for="bp_components[<?php echo esc_attr( $name ); ?>]">
-								<strong><?php echo esc_html( $labels['title'] ); ?></strong>
-							</label>
-
-							<div class="row-actions-visible">
-
-							</div>
+							<strong><?php echo esc_html( $labels['title'] ); ?></strong>
 						</td>
 
 						<td class="column-description desc">
@@ -214,9 +204,7 @@
 							<div class="plugin-description">
 								<p><?php echo $labels['description']; ?></p>
 							</div>
-							<div class="active second plugin-version-author-uri">
 
-							</div>
 						</td>
 					</tr>
 
@@ -231,6 +219,15 @@
 			<?php endif; ?>
 
 		</tbody>
+
+		<tfoot>
+			<tr>
+				<td class="manage-column column-cb check-column"><input id="cb-select-all-2" type="checkbox" disabled><label class="screen-reader-text" for="cb-select-all-2"><?php _e( 'Bulk selection is disabled', 'buddypress' ); ?></label></td>
+				<th class="manage-column column-title column-primary"><?php _e( 'Component', 'buddypress' ); ?></th>
+				<th class="manage-column column-description"><?php _e( 'Description', 'buddypress' ); ?></th>
+			</tr>
+		</tfoot>
+
 	</table>
 
 	<input type="hidden" name="bp_components[members]" value="1" />
Index: src/bp-core/admin/css/common-rtl.css
===================================================================
--- src/bp-core/admin/css/common-rtl.css	(revision 10459)
+++ src/bp-core/admin/css/common-rtl.css	(working copy)
@@ -126,7 +126,7 @@
 
 /* Tools */
 #adminmenu .toplevel_page_network-tools div.wp-menu-image:before {
-    content: "";
+	content: "";
 }
 
 /* Components
@@ -223,11 +223,33 @@
 	content: "\f454";
 }
 
-#bp-admin-component-form .widefat th {
-    display: table-cell;
-    vertical-align: top;
+.settings_page_bp-components tr.core td.plugin-title span:before {
+	content: "\f448";
 }
 
+.settings_page_bp-components tr.members td.plugin-title span:before {
+	content: "\f307";
+}
+
+#bp-admin-component-form .wp-list-table.plugins .plugin-title {
+	width: 25%;
+}
+
+@media screen and ( max-width: 782px ) {
+	.settings_page_bp-components td.plugin-title span {
+		margin-top: 5px;
+	}
+	#bp-admin-component-form .wp-list-table.plugins .plugin-title {
+		display: block;
+		width: auto;
+	}
+	#bp-admin-component-form .subsubsub {
+		margin-bottom: 0;
+		padding-bottom: 35px;
+	}
+}
+
+
 /* Version Badge */
 
 .bp-badge {
Index: src/bp-core/admin/css/common.css
===================================================================
--- src/bp-core/admin/css/common.css	(revision 10459)
+++ src/bp-core/admin/css/common.css	(working copy)
@@ -126,7 +126,7 @@
 
 /* Tools */
 #adminmenu .toplevel_page_network-tools div.wp-menu-image:before {
-    content: "";
+	content: "";
 }
 
 /* Components
@@ -223,11 +223,33 @@
 	content: "\f454";
 }
 
-#bp-admin-component-form .widefat th {
-    display: table-cell;
-    vertical-align: top;
+.settings_page_bp-components tr.core td.plugin-title span:before {
+	content: "\f448";
 }
 
+.settings_page_bp-components tr.members td.plugin-title span:before {
+	content: "\f307";
+}
+
+#bp-admin-component-form .wp-list-table.plugins .plugin-title {
+	width: 25%;
+}
+
+@media screen and ( max-width: 782px ) {
+	.settings_page_bp-components td.plugin-title span {
+		margin-top: 5px;
+	}
+	#bp-admin-component-form .wp-list-table.plugins .plugin-title {
+		display: block;
+		width: auto;
+	}
+	#bp-admin-component-form .subsubsub {
+		margin-bottom: 0;
+		padding-bottom: 35px;
+	}
+}
+
+
 /* Version Badge */
 
 .bp-badge {