Index: src/bp-groups/bp-groups-functions.php
===================================================================
--- src/bp-groups/bp-groups-functions.php	(revision 11016)
+++ src/bp-groups/bp-groups-functions.php	(working copy)
@@ -356,6 +356,21 @@
 }
 
 /**
+	* Renders the group ID hidden input for admin screens form submission
+	*
+	* @since 2.7.0
+	*
+	* @return string html
+	*/
+function groups_admin_screen_hidden_input() {
+	?>
+ 	<input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id(); ?>" />
+<?php
+	return;
+}
+add_action( 'bp_after_group_admin_content', 'groups_admin_screen_hidden_input' );
+
+/**
  * Check a group status (eg 'private') against the whitelist of registered statuses.
  *
  * @since 1.1.0
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/delete-group.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/delete-group.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/delete-group.php	(working copy)
@@ -0,0 +1,41 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Delete Group
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+<h2 class="bp-screen-reader-text"><?php _e( 'Delete Group', 'buddypress' ); ?></h2>
+
+<?php
+
+	/**
+	 * Fires before the display of group delete admin.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_before_group_delete_admin' ); ?>
+
+	<div id="message" class="info">
+		<p><?php _e( 'WARNING: Deleting this group will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
+	</div>
+
+	<label for="delete-group-understand"><input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-group-button').disabled = ''; } else { document.getElementById('delete-group-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?></label>
+
+	<?php
+
+	/**
+	 * Fires after the display of group delete admin.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_after_group_delete_admin' ); ?>
+
+	<div class="submit">
+		<input type="submit" disabled="disabled" value="<?php esc_attr_e( 'Delete Group', 'buddypress' ); ?>" id="delete-group-button" name="delete-group-button" />
+	</div>
+
+	<?php wp_nonce_field( 'groups_delete_group' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/edit-details.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/edit-details.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/edit-details.php	(working copy)
@@ -0,0 +1,53 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Edit Details
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+	?>
+
+	<h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Details', 'buddypress' ); ?></h2>
+
+	<?php
+
+	/**
+	 * Fires before the display of group admin details.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_before_group_details_admin' ); ?>
+
+	<label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>
+	<input type="text" name="group-name" id="group-name" value="<?php bp_group_name(); ?>" aria-required="true" />
+
+	<label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
+	<textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_group_description_editable(); ?></textarea>
+
+	<?php
+
+	/**
+	 * Fires after the group description admin details.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action( 'groups_custom_group_fields_editable' ); ?>
+
+	<p>
+		<label for="group-notify-members">
+			<input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php _e( 'Notify group members of these changes via email', 'buddypress' ); ?>
+		</label>
+	</p>
+
+	<?php
+
+	/**
+	 * Fires after the display of group admin details.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_after_group_details_admin' ); ?>
+
+	<p><input type="submit" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p>
+	<?php wp_nonce_field( 'groups_edit_group_details' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-avatar.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-avatar.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-avatar.php	(working copy)
@@ -0,0 +1,67 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Group Avatar
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+	<h2 class="bp-screen-reader-text"><?php _e( 'Group Avatar', 'buddypress' ); ?></h2>
+
+	<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
+
+			<p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
+
+			<p>
+				<label for="file" class="bp-screen-reader-text"><?php
+					/* translators: accessibility text */
+					_e( 'Select an image', 'buddypress' );
+				?></label>
+				<input type="file" name="file" id="file" />
+				<input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
+				<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
+			</p>
+
+			<?php if ( bp_get_group_has_avatar() ) : ?>
+
+				<p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
+
+				<?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_text' => __( 'Delete Group Profile Photo', 'buddypress' ) ) ); ?>
+
+			<?php endif; ?>
+
+			<?php
+			/**
+			 * Load the Avatar UI templates
+			 *
+			 * @since  2.3.0
+			 */
+			bp_avatar_get_templates(); ?>
+
+			<?php wp_nonce_field( 'bp_avatar_upload' ); ?>
+
+	<?php endif; ?>
+
+	<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
+
+		<h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
+
+		<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
+
+		<div id="avatar-crop-pane">
+			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
+		</div>
+
+		<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
+
+		<input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src(); ?>" />
+		<input type="hidden" id="x" name="x" />
+		<input type="hidden" id="y" name="y" />
+		<input type="hidden" id="w" name="w" />
+		<input type="hidden" id="h" name="h" />
+
+		<?php wp_nonce_field( 'bp_avatar_cropstore' ); ?>
+
+	<?php endif; ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-cover-image.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-cover-image.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-cover-image.php	(working copy)
@@ -0,0 +1,33 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Group Cover Image Settings
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+<h2><?php _e( 'Cover Image', 'buddypress' ); ?></h2>
+
+<?php
+
+	/**
+	 * Fires before the display of profile cover image upload content.
+	 *
+	 * @since 2.4.0
+	 */
+	do_action( 'bp_before_group_settings_cover_image' ); ?>
+
+	<p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
+
+	<?php bp_attachments_get_template_part( 'cover-images/index' ); ?>
+
+	<?php
+
+	/**
+	 * Fires after the display of group cover image upload content.
+	 *
+	 * @since 2.4.0
+	 */
+	do_action( 'bp_after_group_settings_cover_image' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-settings.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-settings.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/group-settings.php	(working copy)
@@ -0,0 +1,97 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Group Settings
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+<h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Settings', 'buddypress' ); ?></h2>
+	<?php
+
+	/**
+	 * Fires before the group settings admin display.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_before_group_settings_admin' ); ?>
+
+	<?php if ( bp_is_active( 'forums' ) ) : ?>
+
+		<?php if ( bp_forums_is_installed_correctly() ) : ?>
+
+			<div class="checkbox">
+				<label for="group-show-forum"><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php bp_group_show_forum_setting(); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
+			</div>
+
+			<hr />
+
+		<?php endif; ?>
+
+	<?php endif; ?>
+
+	<fieldset class="group-create-privacy">
+
+		<legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>
+
+		<div class="radio">
+
+			<label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
+
+			<ul id="public-group-description">
+				<li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
+			</ul>
+
+			<label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
+
+			<ul id="private-group-description">
+				<li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
+			</ul>
+
+			<label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
+
+			<ul id="hidden-group-description">
+				<li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
+				<li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
+				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
+			</ul>
+
+		</div>
+
+	</fieldset>
+
+	<fieldset class="group-create-invitations">
+
+		<legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>
+
+		<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
+
+		<div class="radio">
+
+			<label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
+
+			<label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
+
+			<label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
+
+		</div>
+
+	</fieldset>
+
+	<?php
+
+	/**
+	 * Fires after the group settings admin display.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_after_group_settings_admin' ); ?>
+
+	<p><input type="submit" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p>
+	<?php wp_nonce_field( 'groups_edit_group_settings' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/manage-members.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/manage-members.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/manage-members.php	(working copy)
@@ -0,0 +1,173 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Manage Members
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+<h2 class="bp-screen-reader-text"><?php _e( 'Manage Members', 'buddypress' ); ?></h2>
+
+<?php
+
+	/**
+	 * Fires before the group manage members admin display.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_before_group_manage_members_admin' ); ?>
+
+	<div class="bp-widget">
+		<h3><?php _e( 'Administrators', 'buddypress' ); ?></h3>
+
+		<?php if ( bp_has_members( '&include='. bp_group_admin_ids() ) ) : ?>
+
+		<ul id="admins-list" class="item-list single-line">
+
+			<?php while ( bp_members() ) : bp_the_member(); ?>
+			<li>
+				<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?>
+				<h5>
+					<a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+					<?php if ( count( bp_group_admin_ids( false, 'array' ) ) > 1 ) : ?>
+					<span class="small">
+						<a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
+					</span>
+					<?php endif; ?>
+				</h5>
+			</li>
+			<?php endwhile; ?>
+
+		</ul>
+
+		<?php endif; ?>
+
+	</div>
+
+	<?php if ( bp_group_has_moderators() ) : ?>
+		<div class="bp-widget">
+			<h3><?php _e( 'Moderators', 'buddypress' ); ?></h3>
+
+			<?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
+				<ul id="mods-list" class="item-list single-line">
+
+					<?php while ( bp_members() ) : bp_the_member(); ?>
+					<li>
+						<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?>
+						<h5>
+							<a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+							<span class="small">
+								<a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ); ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
+								<a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
+							</span>
+						</h5>
+					</li>
+					<?php endwhile; ?>
+
+				</ul>
+
+			<?php endif; ?>
+		</div>
+	<?php endif ?>
+
+
+	<div class="bp-widget">
+		<h3><?php _e( "Members", 'buddypress' ); ?></h3>
+
+		<?php if ( bp_group_has_members( 'per_page=15&exclude_banned=0' ) ) : ?>
+
+			<?php if ( bp_group_member_needs_pagination() ) : ?>
+
+				<div class="pagination no-ajax">
+
+					<div id="member-count" class="pag-count">
+						<?php bp_group_member_pagination_count(); ?>
+					</div>
+
+					<div id="member-admin-pagination" class="pagination-links">
+						<?php bp_group_member_admin_pagination(); ?>
+					</div>
+
+				</div>
+
+			<?php endif; ?>
+
+			<ul id="members-list" class="item-list single-line">
+				<?php while ( bp_group_members() ) : bp_group_the_member(); ?>
+
+					<li class="<?php bp_group_member_css_class(); ?>">
+						<?php bp_group_member_avatar_mini(); ?>
+
+						<h5>
+							<?php bp_group_member_link(); ?>
+
+							<?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress' ); ?>
+
+							<span class="small">
+
+							<?php if ( bp_get_group_member_is_banned() ) : ?>
+
+								<a href="<?php bp_group_member_unban_link(); ?>" class="button confirm member-unban" title="<?php esc_attr_e( 'Unban this member', 'buddypress' ); ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>
+
+							<?php else : ?>
+
+								<a href="<?php bp_group_member_ban_link(); ?>" class="button confirm member-ban"><?php _e( 'Kick &amp; Ban', 'buddypress' ); ?></a>
+								<a href="<?php bp_group_member_promote_mod_link(); ?>" class="button confirm member-promote-to-mod"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a>
+								<a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm member-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
+
+							<?php endif; ?>
+
+								<a href="<?php bp_group_member_remove_link(); ?>" class="button confirm"><?php _e( 'Remove from group', 'buddypress' ); ?></a>
+
+								<?php
+
+								/**
+								 * Fires inside the display of a member admin item in group management area.
+								 *
+								 * @since 1.1.0
+								 */
+								do_action( 'bp_group_manage_members_admin_item' ); ?>
+
+							</span>
+						</h5>
+					</li>
+
+				<?php endwhile; ?>
+			</ul>
+
+			<?php if ( bp_group_member_needs_pagination() ) : ?>
+
+				<div class="pagination no-ajax">
+
+					<div id="member-count" class="pag-count">
+						<?php bp_group_member_pagination_count(); ?>
+					</div>
+
+					<div id="member-admin-pagination" class="pagination-links">
+						<?php bp_group_member_admin_pagination(); ?>
+					</div>
+
+				</div>
+
+			<?php endif; ?>
+
+		<?php else: ?>
+
+			<div id="message" class="info">
+				<p><?php _e( 'This group has no members.', 'buddypress' ); ?></p>
+			</div>
+
+		<?php endif; ?>
+
+	</div>
+
+	<?php
+
+	/**
+	 * Fires after the group manage members admin display.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_after_group_manage_members_admin' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin/membership-requests.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin/membership-requests.php	(nonexistent)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin/membership-requests.php	(working copy)
@@ -0,0 +1,36 @@
+<?php
+/**
+ * BuddyPress - Groups Admin - Membership Requests
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+
+?>
+
+
+<h2 class="bp-screen-reader-text"><?php _e( 'Manage Membership Requests', 'buddypress' ); ?></h2>
+
+	<?php
+
+	/**
+	 * Fires before the display of group membership requests admin.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_before_group_membership_requests_admin' ); ?>
+
+		<div class="requests">
+
+			<?php bp_get_template_part( 'groups/single/requests-loop' ); ?>
+
+		</div>
+
+	<?php
+
+	/**
+	 * Fires after the display of group membership requests admin.
+	 *
+	 * @since 1.1.0
+	 */
+	do_action( 'bp_after_group_membership_requests_admin' ); ?>
Index: src/bp-templates/bp-legacy/buddypress/groups/single/admin.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(revision 11016)
+++ src/bp-templates/bp-legacy/buddypress/groups/single/admin.php	(working copy)
@@ -13,35 +13,10 @@
 	</ul>
 </div><!-- .item-list-tabs -->
 
-<?php /* Add headings before respective forms. */ ?>
 
-<?php if ( bp_is_group_admin_screen( 'edit-details' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Details', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'group-settings' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Manage Group Settings', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'manage-members' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Manage Members', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'group-avatar' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Group Avatar', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'group-cover-image' ) ) : ?>
-	<h2><?php _e( 'Cover Image', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'membership-requests' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Manage Membership Requests', 'buddypress' ); ?></h2>
-
-<?php elseif ( bp_is_group_admin_screen( 'delete-group' ) ) : ?>
-	<h2 class="bp-screen-reader-text"><?php _e( 'Delete Group', 'buddypress' ); ?></h2>
-
-<?php endif; ?>
-
 <form action="<?php bp_group_admin_form_action(); ?>" name="group-settings-form" id="group-settings-form" class="standard-form" method="post" enctype="multipart/form-data">
 
 <?php
-
 /**
  * Fires inside the group admin form and before the content.
  *
@@ -49,429 +24,14 @@
  */
 do_action( 'bp_before_group_admin_content' ); ?>
 
-<?php /* Edit Group Details */ ?>
-<?php if ( bp_is_group_admin_screen( 'edit-details' ) ) : ?>
+<?php /* Fetch the template for the current admin screen being viewed */ ?>
 
-	<?php
+<?php if ( bp_is_group_admin_screen( bp_action_variable() ) ) : ?>
 
-	/**
-	 * Fires before the display of group admin details.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_before_group_details_admin' ); ?>
+	<?php bp_get_template_part( 'groups/single/admin/' . bp_action_variable() ); ?>
 
-	<label for="group-name"><?php _e( 'Group Name (required)', 'buddypress' ); ?></label>
-	<input type="text" name="group-name" id="group-name" value="<?php bp_group_name(); ?>" aria-required="true" />
-
-	<label for="group-desc"><?php _e( 'Group Description (required)', 'buddypress' ); ?></label>
-	<textarea name="group-desc" id="group-desc" aria-required="true"><?php bp_group_description_editable(); ?></textarea>
-
-	<?php
-
-	/**
-	 * Fires after the group description admin details.
-	 *
-	 * @since 1.0.0
-	 */
-	do_action( 'groups_custom_group_fields_editable' ); ?>
-
-	<p>
-		<label for="group-notify-members">
-			<input type="checkbox" name="group-notify-members" id="group-notify-members" value="1" /> <?php _e( 'Notify group members of these changes via email', 'buddypress' ); ?>
-		</label>
-	</p>
-
-	<?php
-
-	/**
-	 * Fires after the display of group admin details.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_after_group_details_admin' ); ?>
-
-	<p><input type="submit" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p>
-	<?php wp_nonce_field( 'groups_edit_group_details' ); ?>
-
 <?php endif; ?>
 
-<?php /* Manage Group Settings */ ?>
-<?php if ( bp_is_group_admin_screen( 'group-settings' ) ) : ?>
-
-	<?php
-
-	/**
-	 * Fires before the group settings admin display.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_before_group_settings_admin' ); ?>
-
-	<?php if ( bp_is_active( 'forums' ) ) : ?>
-
-		<?php if ( bp_forums_is_installed_correctly() ) : ?>
-
-			<div class="checkbox">
-				<label for="group-show-forum"><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php bp_group_show_forum_setting(); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
-			</div>
-
-			<hr />
-
-		<?php endif; ?>
-
-	<?php endif; ?>
-
-	<fieldset class="group-create-privacy">
-
-		<legend><?php _e( 'Privacy Options', 'buddypress' ); ?></legend>
-
-		<div class="radio">
-
-			<label for="group-status-public"><input type="radio" name="group-status" id="group-status-public" value="public"<?php if ( 'public' == bp_get_new_group_status() || !bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="public-group-description" /> <?php _e( 'This is a public group', 'buddypress' ); ?></label>
-
-			<ul id="public-group-description">
-				<li><?php _e( 'Any site member can join this group.', 'buddypress' ); ?></li>
-				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
-				<li><?php _e( 'Group content and activity will be visible to any site member.', 'buddypress' ); ?></li>
-			</ul>
-
-			<label for="group-status-private"><input type="radio" name="group-status" id="group-status-private" value="private"<?php if ( 'private' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="private-group-description" /> <?php _e( 'This is a private group', 'buddypress' ); ?></label>
-
-			<ul id="private-group-description">
-				<li><?php _e( 'Only users who request membership and are accepted can join the group.', 'buddypress' ); ?></li>
-				<li><?php _e( 'This group will be listed in the groups directory and in search results.', 'buddypress' ); ?></li>
-				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
-			</ul>
-
-			<label for="group-status-hidden"><input type="radio" name="group-status" id="group-status-hidden" value="hidden"<?php if ( 'hidden' == bp_get_new_group_status() ) { ?> checked="checked"<?php } ?> aria-describedby="hidden-group-description" /> <?php _e('This is a hidden group', 'buddypress' ); ?></label>
-
-			<ul id="hidden-group-description">
-				<li><?php _e( 'Only users who are invited can join the group.', 'buddypress' ); ?></li>
-				<li><?php _e( 'This group will not be listed in the groups directory or search results.', 'buddypress' ); ?></li>
-				<li><?php _e( 'Group content and activity will only be visible to members of the group.', 'buddypress' ); ?></li>
-			</ul>
-
-		</div>
-
-	</fieldset>
-
-	<fieldset class="group-create-invitations">
-
-		<legend><?php _e( 'Group Invitations', 'buddypress' ); ?></legend>
-
-		<p><?php _e( 'Which members of this group are allowed to invite others?', 'buddypress' ); ?></p>
-
-		<div class="radio">
-
-			<label for="group-invite-status-members"><input type="radio" name="group-invite-status" id="group-invite-status-members" value="members"<?php bp_group_show_invite_status_setting( 'members' ); ?> /> <?php _e( 'All group members', 'buddypress' ); ?></label>
-
-			<label for="group-invite-status-mods"><input type="radio" name="group-invite-status" id="group-invite-status-mods" value="mods"<?php bp_group_show_invite_status_setting( 'mods' ); ?> /> <?php _e( 'Group admins and mods only', 'buddypress' ); ?></label>
-
-			<label for="group-invite-status-admins"><input type="radio" name="group-invite-status" id="group-invite-status-admins" value="admins"<?php bp_group_show_invite_status_setting( 'admins' ); ?> /> <?php _e( 'Group admins only', 'buddypress' ); ?></label>
-
-		</div>
-
-	</fieldset>
-
-	<?php
-
-	/**
-	 * Fires after the group settings admin display.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_after_group_settings_admin' ); ?>
-
-	<p><input type="submit" value="<?php esc_attr_e( 'Save Changes', 'buddypress' ); ?>" id="save" name="save" /></p>
-	<?php wp_nonce_field( 'groups_edit_group_settings' ); ?>
-
-<?php endif; ?>
-
-<?php /* Group Avatar Settings */ ?>
-<?php if ( bp_is_group_admin_screen( 'group-avatar' ) ) : ?>
-
-	<?php if ( 'upload-image' == bp_get_avatar_admin_step() ) : ?>
-
-			<p><?php _e("Upload an image to use as a profile photo for this group. The image will be shown on the main group page, and in search results.", 'buddypress' ); ?></p>
-
-			<p>
-				<label for="file" class="bp-screen-reader-text"><?php
-					/* translators: accessibility text */
-					_e( 'Select an image', 'buddypress' );
-				?></label>
-				<input type="file" name="file" id="file" />
-				<input type="submit" name="upload" id="upload" value="<?php esc_attr_e( 'Upload Image', 'buddypress' ); ?>" />
-				<input type="hidden" name="action" id="action" value="bp_avatar_upload" />
-			</p>
-
-			<?php if ( bp_get_group_has_avatar() ) : ?>
-
-				<p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
-
-				<?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_text' => __( 'Delete Group Profile Photo', 'buddypress' ) ) ); ?>
-
-			<?php endif; ?>
-
-			<?php
-			/**
-			 * Load the Avatar UI templates
-			 *
-			 * @since  2.3.0
-			 */
-			bp_avatar_get_templates(); ?>
-
-			<?php wp_nonce_field( 'bp_avatar_upload' ); ?>
-
-	<?php endif; ?>
-
-	<?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
-
-		<h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
-
-		<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
-
-		<div id="avatar-crop-pane">
-			<img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
-		</div>
-
-		<input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
-
-		<input type="hidden" name="image_src" id="image_src" value="<?php bp_avatar_to_crop_src(); ?>" />
-		<input type="hidden" id="x" name="x" />
-		<input type="hidden" id="y" name="y" />
-		<input type="hidden" id="w" name="w" />
-		<input type="hidden" id="h" name="h" />
-
-		<?php wp_nonce_field( 'bp_avatar_cropstore' ); ?>
-
-	<?php endif; ?>
-
-<?php endif; ?>
-
-<?php /* Group Cover image Settings */ ?>
-<?php if ( bp_is_group_admin_screen( 'group-cover-image' ) ) : ?>
-
-	<?php
-
-	/**
-	 * Fires before the display of profile cover image upload content.
-	 *
-	 * @since 2.4.0
-	 */
-	do_action( 'bp_before_group_settings_cover_image' ); ?>
-
-	<p><?php _e( 'The Cover Image will be used to customize the header of your group.', 'buddypress' ); ?></p>
-
-	<?php bp_attachments_get_template_part( 'cover-images/index' ); ?>
-
-	<?php
-
-	/**
-	 * Fires after the display of group cover image upload content.
-	 *
-	 * @since 2.4.0
-	 */
-	do_action( 'bp_after_group_settings_cover_image' ); ?>
-
-<?php endif; ?>
-
-<?php /* Manage Group Members */ ?>
-<?php if ( bp_is_group_admin_screen( 'manage-members' ) ) : ?>
-
-	<?php
-
-	/**
-	 * Fires before the group manage members admin display.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_before_group_manage_members_admin' ); ?>
-
-	<div class="bp-widget">
-		<h3><?php _e( 'Administrators', 'buddypress' ); ?></h3>
-
-		<?php if ( bp_has_members( '&include='. bp_group_admin_ids() ) ) : ?>
-
-		<ul id="admins-list" class="item-list single-line">
-
-			<?php while ( bp_members() ) : bp_the_member(); ?>
-			<li>
-				<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?>
-				<h5>
-					<a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
-					<?php if ( count( bp_group_admin_ids( false, 'array' ) ) > 1 ) : ?>
-					<span class="small">
-						<a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
-					</span>
-					<?php endif; ?>
-				</h5>
-			</li>
-			<?php endwhile; ?>
-
-		</ul>
-
-		<?php endif; ?>
-
-	</div>
-
-	<?php if ( bp_group_has_moderators() ) : ?>
-		<div class="bp-widget">
-			<h3><?php _e( 'Moderators', 'buddypress' ); ?></h3>
-
-			<?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
-				<ul id="mods-list" class="item-list single-line">
-
-					<?php while ( bp_members() ) : bp_the_member(); ?>
-					<li>
-						<?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => sprintf( __( 'Profile picture of %s', 'buddypress' ), bp_get_member_name() ) ) ); ?>
-						<h5>
-							<a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
-							<span class="small">
-								<a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ); ?>" class="button confirm mod-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
-								<a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ); ?>"><?php _e( 'Demote to Member', 'buddypress' ); ?></a>
-							</span>
-						</h5>
-					</li>
-					<?php endwhile; ?>
-
-				</ul>
-
-			<?php endif; ?>
-		</div>
-	<?php endif ?>
-
-
-	<div class="bp-widget">
-		<h3><?php _e( "Members", 'buddypress' ); ?></h3>
-
-		<?php if ( bp_group_has_members( 'per_page=15&exclude_banned=0' ) ) : ?>
-
-			<?php if ( bp_group_member_needs_pagination() ) : ?>
-
-				<div class="pagination no-ajax">
-
-					<div id="member-count" class="pag-count">
-						<?php bp_group_member_pagination_count(); ?>
-					</div>
-
-					<div id="member-admin-pagination" class="pagination-links">
-						<?php bp_group_member_admin_pagination(); ?>
-					</div>
-
-				</div>
-
-			<?php endif; ?>
-
-			<ul id="members-list" class="item-list single-line">
-				<?php while ( bp_group_members() ) : bp_group_the_member(); ?>
-
-					<li class="<?php bp_group_member_css_class(); ?>">
-						<?php bp_group_member_avatar_mini(); ?>
-
-						<h5>
-							<?php bp_group_member_link(); ?>
-
-							<?php if ( bp_get_group_member_is_banned() ) _e( '(banned)', 'buddypress' ); ?>
-
-							<span class="small">
-
-							<?php if ( bp_get_group_member_is_banned() ) : ?>
-
-								<a href="<?php bp_group_member_unban_link(); ?>" class="button confirm member-unban" title="<?php esc_attr_e( 'Unban this member', 'buddypress' ); ?>"><?php _e( 'Remove Ban', 'buddypress' ); ?></a>
-
-							<?php else : ?>
-
-								<a href="<?php bp_group_member_ban_link(); ?>" class="button confirm member-ban"><?php _e( 'Kick &amp; Ban', 'buddypress' ); ?></a>
-								<a href="<?php bp_group_member_promote_mod_link(); ?>" class="button confirm member-promote-to-mod"><?php _e( 'Promote to Mod', 'buddypress' ); ?></a>
-								<a href="<?php bp_group_member_promote_admin_link(); ?>" class="button confirm member-promote-to-admin"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
-
-							<?php endif; ?>
-
-								<a href="<?php bp_group_member_remove_link(); ?>" class="button confirm"><?php _e( 'Remove from group', 'buddypress' ); ?></a>
-
-								<?php
-
-								/**
-								 * Fires inside the display of a member admin item in group management area.
-								 *
-								 * @since 1.1.0
-								 */
-								do_action( 'bp_group_manage_members_admin_item' ); ?>
-
-							</span>
-						</h5>
-					</li>
-
-				<?php endwhile; ?>
-			</ul>
-
-			<?php if ( bp_group_member_needs_pagination() ) : ?>
-
-				<div class="pagination no-ajax">
-
-					<div id="member-count" class="pag-count">
-						<?php bp_group_member_pagination_count(); ?>
-					</div>
-
-					<div id="member-admin-pagination" class="pagination-links">
-						<?php bp_group_member_admin_pagination(); ?>
-					</div>
-
-				</div>
-
-			<?php endif; ?>
-
-		<?php else: ?>
-
-			<div id="message" class="info">
-				<p><?php _e( 'This group has no members.', 'buddypress' ); ?></p>
-			</div>
-
-		<?php endif; ?>
-
-	</div>
-
-	<?php
-
-	/**
-	 * Fires after the group manage members admin display.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_after_group_manage_members_admin' ); ?>
-
-<?php endif; ?>
-
-<?php /* Manage Membership Requests */ ?>
-<?php if ( bp_is_group_admin_screen( 'membership-requests' ) ) : ?>
-
-	<?php
-
-	/**
-	 * Fires before the display of group membership requests admin.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_before_group_membership_requests_admin' ); ?>
-
-		<div class="requests">
-
-			<?php bp_get_template_part( 'groups/single/requests-loop' ); ?>
-
-		</div>
-
-	<?php
-
-	/**
-	 * Fires after the display of group membership requests admin.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_after_group_membership_requests_admin' ); ?>
-
-<?php endif; ?>
-
 <?php
 
 /**
@@ -483,44 +43,6 @@
  */
 do_action( 'groups_custom_edit_steps' ); ?>
 
-<?php /* Delete Group Option */ ?>
-<?php if ( bp_is_group_admin_screen( 'delete-group' ) ) : ?>
-
-	<?php
-
-	/**
-	 * Fires before the display of group delete admin.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_before_group_delete_admin' ); ?>
-
-	<div id="message" class="info">
-		<p><?php _e( 'WARNING: Deleting this group will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
-	</div>
-
-	<label for="delete-group-understand"><input type="checkbox" name="delete-group-understand" id="delete-group-understand" value="1" onclick="if(this.checked) { document.getElementById('delete-group-button').disabled = ''; } else { document.getElementById('delete-group-button').disabled = 'disabled'; }" /> <?php _e( 'I understand the consequences of deleting this group.', 'buddypress' ); ?></label>
-
-	<?php
-
-	/**
-	 * Fires after the display of group delete admin.
-	 *
-	 * @since 1.1.0
-	 */
-	do_action( 'bp_after_group_delete_admin' ); ?>
-
-	<div class="submit">
-		<input type="submit" disabled="disabled" value="<?php esc_attr_e( 'Delete Group', 'buddypress' ); ?>" id="delete-group-button" name="delete-group-button" />
-	</div>
-
-	<?php wp_nonce_field( 'groups_delete_group' ); ?>
-
-<?php endif; ?>
-
-<?php /* This is important, don't forget it */ ?>
-	<input type="hidden" name="group-id" id="group-id" value="<?php bp_group_id(); ?>" />
-
 <?php
 
 /**