diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 00000000..d738c0ce
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,6 @@
+{
+  "extends": [ "plugin:@wordpress/eslint-plugin/recommended" ],
+  "rules": {
+    "prettier/prettier": "off"
+  }
+}
diff --git a/buddypress/activity/index.php b/buddypress/activity/index.php
index e8707721..10b83295 100755
--- a/buddypress/activity/index.php
+++ b/buddypress/activity/index.php
@@ -20,7 +20,7 @@
 					<?php do_action( 'bp_before_activity_type_tab_all' ); ?>
 
 					<?php /* translators: total member count for site */ ?>
-					<li class="selected" id="activity-all"><a href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/' ); ?>" title="<?php esc_attr_e( 'The public activity for everyone on this site.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'All Members (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_site_member_count() ) ); ?></a></li>
+					<li class="selected" id="activity-all"><a href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ bp_get_activity_slug() ] ) ) ); ?>" title="<?php esc_attr_e( 'The public activity for everyone on this site.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'All Members (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_site_member_count() ) ); ?></a></li>
 
 					<?php if ( is_user_logged_in() ) : ?>
 
@@ -29,7 +29,7 @@
 						<?php if ( function_exists( 'bp_get_total_friend_count' ) ) : ?>
 							<?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
 								<?php /* translators: friend count for user */ ?>
-								<li id="activity-friends"><a href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/' . BP_FRIENDS_SLUG . '/' ); ?>" title="<?php esc_attr_e( 'The activity of my friends only.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'My Friends (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_friend_count( bp_loggedin_user_id() ) ) ); ?></a></li>
+								<li id="activity-friends"><a href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ bp_get_activity_slug(), bp_get_friends_slug() ] ) ) ); ?>" title="<?php esc_attr_e( 'The activity of my friends only.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'My Friends (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_friend_count( bp_loggedin_user_id() ) ) ); ?></a></li>
 							<?php endif; ?>
 						<?php endif; ?>
 
@@ -38,7 +38,7 @@
 						<?php if ( function_exists( 'bp_get_total_group_count_for_user' ) ) : ?>
 							<?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
 								<?php /* translators: group count for user */ ?>
-								<li id="activity-groups"><a href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/' . BP_GROUPS_SLUG . '/' ); ?>" title="<?php esc_attr_e( 'The activity of groups I am a member of.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'My Groups (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ); ?></a></li>
+								<li id="activity-groups"><a href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ bp_get_activity_slug(), bp_get_groups_slug() ] ) ) ); ?>" title="<?php esc_attr_e( 'The activity of groups I am a member of.', 'commons-in-a-box' ); ?>"><?php printf( esc_html__( 'My Groups (%s)', 'commons-in-a-box' ), esc_html( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ); ?></a></li>
 							<?php endif; ?>
 						<?php endif; ?>
 
@@ -46,13 +46,13 @@
 
 						<?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
 							<?php /* translators: favorite activity count */ ?>
-							<li id="activity-favorites"><a href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/favorites/' ); ?>" title="<?php esc_attr_e( "The activity I've marked as a favorite.", 'commons-in-a-box' ); ?>"><?php printf( esc_html_e( 'My Favorites (%s)', 'commons-in-a-box' ), '<span>' . esc_html( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) . '</span>' ); ?></a></li>
+							<li id="activity-favorites"><a href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ bp_get_activity_slug(), 'favorites' ] ) ) ); ?>" title="<?php esc_attr_e( "The activity I've marked as a favorite.", 'commons-in-a-box' ); ?>"><?php printf( esc_html_e( 'My Favorites (%s)', 'commons-in-a-box' ), '<span>' . esc_html( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) . '</span>' ); ?></a></li>
 						<?php endif; ?>
 
 						<?php do_action( 'bp_before_activity_type_tab_mentions' ); ?>
 
 						<li id="activity-mentions">
-							<a href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/mentions/' ); ?>" title="<?php esc_attr_e( 'Activity that I have been mentioned in.', 'commons-in-a-box' ); ?>">
+							<a href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ bp_get_activity_slug(), 'mentions' ] ) ) ); ?>" title="<?php esc_attr_e( 'Activity that I have been mentioned in.', 'commons-in-a-box' ); ?>">
 								<?php /* translators: username of user whose mentions are being displayed */ ?>
 								<?php printf( esc_html__( '@%s Mentions', 'commons-in-a-box' ), esc_html( bp_get_loggedin_user_username() ) ); ?>
 								<?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?>
diff --git a/buddypress/activity/post-form.php b/buddypress/activity/post-form.php
index 9e8b31e2..08b5a620 100755
--- a/buddypress/activity/post-form.php
+++ b/buddypress/activity/post-form.php
@@ -12,7 +12,7 @@
 	<?php // phpcs:enable WordPress.Security.NonceVerification.Recommended ?>
 
 	<div id="whats-new-avatar">
-		<a href="<?php echo esc_attr( bp_loggedin_user_domain() ); ?>">
+		<a href="<?php echo esc_attr( bp_loggedin_user_url() ); ?>">
 			<?php bp_loggedin_user_avatar( 'width=' . BP_AVATAR_THUMB_WIDTH . '&height=' . BP_AVATAR_THUMB_HEIGHT ); ?>
 		</a>
 	</div>
diff --git a/buddypress/docs/docs-loop.php b/buddypress/docs/docs-loop.php
index aa8ed9eb..355f8919 100644
--- a/buddypress/docs/docs-loop.php
+++ b/buddypress/docs/docs-loop.php
@@ -71,7 +71,7 @@
 					</td>
 
 					<td class="author-cell hidden-xs">
-						<a href="<?php echo esc_attr( bp_core_get_user_domain( get_the_author_meta( 'ID' ) ) ); ?>" title="<?php echo esc_attr( bp_core_get_user_displayname( get_the_author_meta( 'ID' ) ) ); ?>"><?php echo esc_html( bp_core_get_user_displayname( get_the_author_meta( 'ID' ) ) ); ?></a>
+						<a href="<?php echo esc_attr( bp_members_get_user_url( get_the_author_meta( 'ID' ) ) ); ?>" title="<?php echo esc_attr( bp_core_get_user_displayname( get_the_author_meta( 'ID' ) ) ); ?>"><?php echo esc_html( bp_core_get_user_displayname( get_the_author_meta( 'ID' ) ) ); ?></a>
 					</td>
 
 					<td class="date-cell created-date-cell hidden-sm hidden-xs">
diff --git a/buddypress/groups/create.php b/buddypress/groups/create.php
index 8516fb1b..e1e4b7b9 100755
--- a/buddypress/groups/create.php
+++ b/buddypress/groups/create.php
@@ -153,21 +153,10 @@
 
 					<div class="panel-body">
 
-						<?php if ( $group_type->get_is_portfolio() ) : ?>
-							<p class="ol-tooltip"><?php echo esc_html( $group_type->get_label( 'name_help_text' ) ); ?></p>
+						<p class="ol-tooltip"><?php echo esc_html( $group_type->get_label( 'name_help_text' ) ); ?></p>
 
-							<ul class="ol-tooltip">
-								<li><?php esc_html_e( 'FirstName LastName\'s Portfolio', 'commons-in-a-box' ); ?></li>
-								<li><?php esc_html_e( 'Jane Smith\'s Portfolio (Example)', 'commons-in-a-box' ); ?></li>
-							</ul>
-
-							<input class="form-control" size="80" type="text" name="group-name" id="group-name" value="<?php echo esc_attr( bp_get_new_group_name() ); ?>" required />
-
-						<?php else : ?>
-							<p class="ol-tooltip"><?php echo esc_html( $group_type->get_label( 'name_help_text' ) ); ?></p>
-							<input class="form-control" size="80" type="text" name="group-name" id="group-name" value="<?php bp_new_group_name(); ?>" required />
+						<input class="form-control" size="80" type="text" name="group-name" id="group-name" value="<?php echo esc_attr( bp_get_new_group_name() ); ?>" required />
 
-						<?php endif ?>
 					</div><!-- /.panel-body -->
 				</div>
 
diff --git a/buddypress/groups/groups-loop.php b/buddypress/groups/groups-loop.php
index 3f2aa4d2..8ffbc521 100644
--- a/buddypress/groups/groups-loop.php
+++ b/buddypress/groups/groups-loop.php
@@ -22,7 +22,7 @@
 	$current_group_type = openlab_get_current_filter( 'group-types' );
 	if ( ! $current_group_type ) {
 		$current_group_type = array_map(
-			function( $type ) {
+			function ( $type ) {
 				return $type->get_slug();
 			},
 			cboxol_get_group_types()
@@ -144,6 +144,15 @@ function( $type ) {
 	);
 }
 
+// Exclude private groups if not current user's profile or don't have moderate access.
+$private_groups = [];
+if ( bp_is_user() ) {
+	$private_groups = openlab_get_user_private_memberships( bp_displayed_user_id() );
+	if ( ! bp_is_my_profile() && ! current_user_can( 'bp_moderate' ) ) {
+		$group_args['exclude'] = $private_groups;
+	}
+}
+
 ?>
 
 <?php if ( bp_has_groups( $group_args ) ) : ?>
@@ -231,12 +240,7 @@ function( $type ) {
 										<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 										<?php echo openlab_output_course_info_line( $group_id ); ?>
 									</div>
-								<?php elseif ( $group_type->get_is_portfolio() ) : ?>
-									<div class="info-line">
-										<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-										<?php echo bp_core_get_userlink( openlab_get_user_id_from_portfolio_group_id( bp_get_group_id() ) ); ?>
-									</div>
-								<?php else : ?>
+								<?php elseif ( ! $group_type->get_is_portfolio() ) : ?>
 									<div class="info-line uppercase">
 										<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 										<?php echo openlab_output_group_contact_line( $group_id ); ?>
@@ -247,6 +251,10 @@ function( $type ) {
 									<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 									<p class="hyphenate truncate-on-the-fly" data-basevalue="105" data-basewidth="250"><?php echo bp_get_group_description_excerpt(); ?></p>
 								</div>
+
+								<?php if ( current_user_can( 'bp_moderate' ) && in_array( $group_id, $private_groups, true ) ) : ?>
+								<p class="private-membership-indicator"><span class="fa fa-eye-slash"></span> <?php esc_html_e( 'Membership hidden', 'commons-in-a-box' ); ?></p>
+								<?php endif; ?>
 							</div><!-- .item-content-wrapper -->
 						</div>
 					</div><!-- .row -->
diff --git a/buddypress/groups/index-directory.php b/buddypress/groups/index-directory.php
index a05fb383..4884cb5a 100644
--- a/buddypress/groups/index-directory.php
+++ b/buddypress/groups/index-directory.php
@@ -4,7 +4,7 @@
 
 // Redirect to the home page if we're not on a valid group directory page.
 if ( is_wp_error( $type_object ) ) {
-	bp_core_redirect( bp_get_root_domain() );
+	bp_core_redirect( bp_get_root_url() );
 }
 
 get_header();
@@ -19,7 +19,13 @@
 }
 
 $create_text = $type_object->get_can_be_cloned() ? __( 'Create / Clone', 'commons-in-a-box' ) : __( 'Create New', 'commons-in-a-box' );
-$create_link = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-details/?group_type=' . $type_object->get_slug() . '&new=true';
+$create_link = add_query_arg(
+	[
+		'group_type' => $type_object->get_slug(),
+		'new'        => 'true',
+	],
+	bp_groups_get_create_url( [ 'group-details' ] )
+);
 ?>
 
 <div id="content" class="hfeed row">
diff --git a/buddypress/groups/single/activity-list.php b/buddypress/groups/single/activity-list.php
index f9ea8eeb..f82dcd95 100644
--- a/buddypress/groups/single/activity-list.php
+++ b/buddypress/groups/single/activity-list.php
@@ -13,6 +13,13 @@
 
 	$group     = groups_get_current_group();
 	$group_url = bp_get_group_permalink( $group );
+
+	if ( current_user_can( 'view_private_members_of_group', $group->id ) ) {
+		$group_private_members = [];
+	} else {
+		$group_private_members = openlab_get_private_members_of_group( $group->id );
+	}
+
 	?>
 
 	<?php if ( bp_is_group_home() ) { ?>
@@ -39,9 +46,16 @@
 									if ( ! empty( $forum_ids ) ) {
 										$forum_id = (int) is_array( $forum_ids ) ? $forum_ids[0] : $forum_ids;
 									}
+
+									$topic_args = [
+										'posts_per_page' => 3,
+										'post_parent'    => $forum_id,
+										'author__not_in' => $group_private_members,
+									];
+
 									?>
 
-									<?php if ( $forum_id && bbp_has_topics( 'posts_per_page=3&post_parent=' . $forum_id ) ) : ?>
+									<?php if ( $forum_id && bbp_has_topics( $topic_args ) ) : ?>
 										<?php while ( bbp_topics() ) : ?>
 											<?php bbp_the_topic(); ?>
 
@@ -53,16 +67,24 @@
 													$last_reply_id = bbp_get_topic_last_reply_id( $topic_id );
 
 													// Oh, bbPress.
-													$last_reply = get_post( $last_reply_id );
-													if ( ! empty( $last_reply->post_content ) ) {
-														$last_topic_content = bp_create_excerpt(
-															wp_strip_all_tags( $last_reply->post_content ),
-															250,
-															array(
-																'ending' => '',
-															)
-														);
+													$topic_replies = get_posts(
+														[
+															'post_type'      => 'reply',
+															'post_parent'    => $topic_id,
+															'author__not_in' => $group_private_members,
+															'posts_per_page' => 1,
+															'orderby'        => [ 'post_date' => 'DESC' ],
+														]
+													);
+
+													if ( $topic_replies ) {
+														$last_reply_content = $topic_replies[0]->post_content;
+													} else {
+														$topic_post         = get_post( $topic_id );
+														$last_reply_content = $topic_post->post_content;
 													}
+
+													$last_reply_content = bp_create_excerpt( wp_strip_all_tags( $last_reply_content ), 250 );
 													?>
 
 													<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
@@ -139,8 +161,18 @@
 					?>
 
 					<h2 class="title activity-title"><a class="no-deco" href="<?php echo esc_attr( $href ); ?>"><?php esc_html_e( 'Members', 'commons-in-a-box' ); ?><span class="fa fa-chevron-circle-right" aria-hidden="true"></span></a></h2>
-					<?php $member_arg = array( 'exclude_admins_mods' => false ); ?>
-					<?php if ( bp_group_has_members( $member_arg ) ) : ?>
+
+					<?php
+					$group_member_args = [
+						'exclude_admins_mods' => false,
+					];
+
+					if ( ! current_user_can( 'bp_moderate' ) ) {
+						$group_member_args['exclude'] = openlab_get_private_members_of_group( bp_get_current_group_id() );
+					}
+					?>
+
+					<?php if ( bp_group_has_members( $group_member_args ) ) : ?>
 
 						<ul id="member-list" class="inline-element-list">
 							<?php
@@ -152,7 +184,7 @@
 								$user_avatar = bp_core_fetch_avatar(
 									array(
 										'item_id' => $member->ID,
-										'object'  => 'member',
+										'object'  => 'user',
 										'type'    => 'full',
 										'html'    => false,
 									)
@@ -165,7 +197,9 @@
 								</li>
 							<?php endwhile; ?>
 						</ul>
-						<?php bp_group_member_pagination(); ?>
+
+						<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+						<?php echo openlab_members_pagination_links( 'mlpage' ); ?>
 					<?php else : ?>
 
 						<div id="message" class="info">
diff --git a/buddypress/groups/single/admin.php b/buddypress/groups/single/admin.php
index 98bf14b6..d39f16e7 100755
--- a/buddypress/groups/single/admin.php
+++ b/buddypress/groups/single/admin.php
@@ -4,6 +4,10 @@
 $group_type = cboxol_get_group_group_type( bp_get_current_group_id() );
 
 openlab_group_admin_js_data( $group_type );
+
+// Get private users of the group.
+$private_users = openlab_get_private_members_of_group( bp_get_group_id() );
+
 ?>
 
 <?php //the following switches out the membership menu for the regular admin menu on membership-based admin pages ?>
@@ -21,7 +25,7 @@
 
 			<div class="submenu-text pull-left bold"><?php esc_html_e( 'Settings:', 'commons-in-a-box' ); ?></div>
 			<ul class="nav nav-inline">
-				<?php openlab_group_admin_tabs(); ?>
+				<?php bp_get_template_part( 'groups/single/nav/admin' ); ?>
 			</ul>
 		<?php endif; ?>
 	</div><!-- .submenu -->
@@ -52,6 +56,18 @@
 
 					<?php do_action( 'groups_custom_group_fields_editable' ); ?>
 
+					<?php if ( cboxol_is_portfolio() ) : ?>
+						<fieldset class="portfolio-profile-link-wrapper">
+							<legend><?php esc_html_e( 'Portfolio Link on my Profile', 'ocommons-in-a-box' ); ?></legend>
+
+							<p><?php esc_html_e( 'You can choose to show a link to your Portfolio on your Profile page by checking the box below.', 'commons-in-a-box' ); ?></p>
+
+							<input name="portfolio-profile-link" id="portfolio-profile-link-toggle" <?php checked( openlab_show_portfolio_link_on_user_profile( openlab_get_user_id_from_portfolio_group_id( bp_get_current_group_id() ) ) ); ?> type="checkbox" name="portfolio-profile-link-toggle" value="1" /> <label for="portfolio-profile-link-toggle"><?php esc_html_e( 'Show link to my Portfolio on my public Profile', 'commons-in-a-box' ); ?></label>
+
+							<?php wp_nonce_field( 'portfolio_profile_link', 'portfolio-profile-link-nonce', false ); ?>
+						</fieldset>
+					<?php endif; ?>
+
 					<?php if ( ! cboxol_is_portfolio() ) : ?>
 						<div class="notify-settings">
 							<p class="ol-tooltip notify-members"><?php esc_html_e( 'Notify group members of changes via email', 'commons-in-a-box' ); ?></p>
@@ -344,7 +360,7 @@
 							$user_avatar = bp_core_fetch_avatar(
 								array(
 									'item_id' => bp_get_member_user_id(),
-									'object'  => 'member',
+									'object'  => 'user',
 									'type'    => 'full',
 									'html'    => false,
 								)
@@ -382,7 +398,7 @@
 				<div class="bp-widget">
 					<h4><?php esc_html_e( 'Moderators', 'commons-in-a-box' ); ?></h4>
 
-						<?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
+					<?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
 						<div id="group-manage-moderators-members" class="item-list single-line inline-element-list row group-manage-members group-list">
 
 							<?php
@@ -392,7 +408,7 @@
 								$user_avatar = bp_core_fetch_avatar(
 									array(
 										'item_id' => bp_get_member_user_id(),
-										'object'  => 'member',
+										'object'  => 'user',
 										'type'    => 'full',
 										'html'    => false,
 									)
@@ -426,27 +442,40 @@
 				</div>
 			<?php endif ?>
 
-
 			<div class="bp-widget">
-				<h4><?php esc_html_e( 'Members', 'commons-in-a-box' ); ?></h4>
+				<?php
+				$manage_members_args = [
+					'per_page'       => 96,
+					'exclude_banned' => false,
+				];
+
+				/**
+				 * Filters the arguments used to query members on the Manage Members screen.
+				 *
+				 * @since 1.6.0
+				 *
+				 * @param array $manage_members_args Array of arguments used to query members on the Manage Members screen.
+				 */
+				$manage_members_args = apply_filters( 'cboxol_group_manage_members_args', $manage_members_args );
+				?>
 
-				<?php if ( bp_group_has_members( 'per_page=48&exclude_banned=0' ) ) : ?>
+				<?php if ( bp_group_has_members( $manage_members_args ) ) : ?>
+					<h4><?php esc_html_e( 'Members', 'commons-in-a-box' ); ?></h4>
 
 					<?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 class="group-manage-members-pagination">
+							<div class="pagination no-ajax">
+								<div id="member-admin-pagination-top" class="group-manage-members-pagination-links pagination-links">
+									<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+									<?php echo openlab_members_pagination_links( 'mlpage' ); ?>
+								</div>
 							</div>
 
-							<div id="member-admin-pagination" class="pagination-links">
-								<?php bp_group_member_admin_pagination(); ?>
+							<div class="pag-count">
+								<?php bp_group_member_pagination_count(); ?>
 							</div>
-
 						</div>
-
-						<?php endif; ?>
+					<?php endif; ?>
 
 					<div id="group-manage-members" class="item-list inline-element-list row group-manage-members group-list">
 						<?php
@@ -456,7 +485,7 @@
 							$user_avatar = bp_core_fetch_avatar(
 								array(
 									'item_id' => bp_get_member_user_id(),
-									'object'  => 'member',
+									'object'  => 'user',
 									'type'    => 'full',
 									'html'    => false,
 								)
@@ -499,14 +528,32 @@
 											</ul>
 
 											<?php do_action( 'bp_group_manage_members_admin_item' ); ?>
+
+											<?php if ( in_array( bp_get_member_user_id(), $private_users, true ) ) : ?>
+												<p class="private-membership-indicator"><span class="fa fa-eye-slash"></span> <?php esc_html_e( 'Membership hidden', 'commons-in-a-box' ); ?></p>
+											<?php endif; ?>
 										</div>
 									</div>
 								</div>
 							</div>
-
-					<?php endwhile; ?>
+						<?php endwhile; ?>
 					</div>
 
+					<?php if ( bp_group_member_needs_pagination() ) : ?>
+						<div class="group-manage-members-pagination">
+							<div class="pagination no-ajax">
+								<div id="member-admin-pagination-top" class="group-manage-members-pagination-links pagination-links">
+									<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+									<?php echo openlab_members_pagination_links( 'mlpage' ); ?>
+								</div>
+							</div>
+
+							<div class="pag-count">
+								<?php bp_group_member_pagination_count(); ?>
+							</div>
+						</div>
+					<?php endif; ?>
+
 				<?php else : ?>
 
 					<div id="message" class="info">
@@ -538,7 +585,7 @@
 						$user_avatar = bp_core_fetch_avatar(
 							array(
 								'item_id' => $GLOBALS['requests_template']->request->user_id,
-								'object'  => 'member',
+								'object'  => 'user',
 								'type'    => 'full',
 								'html'    => false,
 							)
diff --git a/buddypress/groups/single/documents.php b/buddypress/groups/single/documents.php
index 489806ac..f4ab7085 100644
--- a/buddypress/groups/single/documents.php
+++ b/buddypress/groups/single/documents.php
@@ -10,7 +10,7 @@
 
 $non_empty_folders = array_filter(
 	$folders,
-	function( $folder ) {
+	function ( $folder ) {
 		return $folder->count > 0;
 	}
 );
@@ -171,11 +171,13 @@ function( $folder ) {
 								<?php esc_html_e( 'No files have been added yet. Add a new file below.', 'commons-in-a-box' ); ?>
 							</p>
 
-							<div class="upload-new-file">
-								<?php if ( 'add' === $template->operation ) { ?>
-									<a class="btn btn-primary link-btn" id="bp-group-documents-upload-button" href="" style="display:none;"><?php esc_html_e( 'Add new file', 'commons-in-a-box' ); ?></a>
-								<?php } ?>
-							</div>
+							<?php if ( $user_can_upload ) : ?>
+								<div class="upload-new-file">
+									<?php if ( 'add' === $template->operation ) { ?>
+										<a class="btn btn-primary link-btn" id="bp-group-documents-upload-button" href="" style="display:none;"><?php esc_html_e( 'Add new file', 'commons-in-a-box' ); ?></a>
+									<?php } ?>
+								</div>
+							<?php endif; ?>
 						</div>
 
 					<?php endif; ?>
diff --git a/buddypress/groups/single/group-home.php b/buddypress/groups/single/group-home.php
index 0f47010c..0f6215bc 100644
--- a/buddypress/groups/single/group-home.php
+++ b/buddypress/groups/single/group-home.php
@@ -251,7 +251,7 @@
 						$group_contact_label = $group_type->get_label( 'group_contact' );
 						?>
 
-						<?php if ( $group_contacts ) : ?>
+						<?php if ( ! cboxol_is_portfolio() && ! empty( $group_contacts ) ) : ?>
 							<div class="table-row row">
 								<div class="bold col-sm-7"><?php echo esc_html( $group_contact_label ); ?></div>
 								<?php // phpcs:ignore WordPress.Security.EscapeOutput ?>
@@ -282,16 +282,6 @@
 							</div>
 						<?php endif; ?>
 
-						<?php if ( $group_type->get_is_portfolio() ) : ?>
-
-							<div class="table-row row">
-								<div class="bold col-sm-7"><?php esc_html_e( 'Member Profile', 'commons-in-a-box' ); ?></div>
-								<?php // phpcs:ignore WordPress.Security.EscapeOutput ?>
-								<div class="col-sm-17 row-content"><?php echo bp_core_get_userlink( openlab_get_user_id_from_portfolio_group_id( bp_get_group_id() ) ); ?></div>
-							</div>
-
-						<?php endif; ?>
-
 						<?php if ( openlab_group_can_be_cloned( bp_get_current_group_id() ) ) : ?>
 							<div class="table-row row">
 								<div class="col-xs-24 status-message italics">
diff --git a/buddypress/groups/single/invite-anyone.php b/buddypress/groups/single/invite-anyone.php
index f0be5784..34c8ed86 100644
--- a/buddypress/groups/single/invite-anyone.php
+++ b/buddypress/groups/single/invite-anyone.php
@@ -95,7 +95,7 @@
 
 				<p class="invite-copy"><?php esc_html_e( 'This link will take you to My Invitations, where you may invite people to join the community and this group.', 'commons-in-a-box' ); ?></p>
 
-				<p><a class="btn btn-primary no-deco" href="<?php echo esc_attr( bp_loggedin_user_domain() . BP_INVITE_ANYONE_SLUG . '/invite-new-members/group-invites/' . bp_get_group_id() ); ?>"><?php esc_html_e( 'Invite New Members to This Community', 'commons-in-a-box' ); ?></a></p>
+				<p><a class="btn btn-primary no-deco" href="<?php echo esc_attr( bp_loggedin_user_url( bp_members_get_path_chunks( [ BP_INVITE_ANYONE_SLUG, 'invite-new-members', 'group-invites', bp_get_group_id() ] ) ) ); ?>"><?php esc_html_e( 'Invite New Members to This Community', 'commons-in-a-box' ); ?></a></p>
 
 			</div>
 		</div>
diff --git a/buddypress/groups/single/members.php b/buddypress/groups/single/members.php
index a6f1633e..72128a06 100755
--- a/buddypress/groups/single/members.php
+++ b/buddypress/groups/single/members.php
@@ -1,4 +1,20 @@
-<?php if ( bp_group_has_members( 'exclude_admins_mods=0' ) ) : ?>
+<?php
+
+$members_args = [];
+
+// Get private users of the group
+$private_users = openlab_get_private_members_of_group( bp_get_current_group_id() );
+
+// If user is not mod and there are private users, exclude them from the list
+if ( ! current_user_can( 'view_private_members_of_group' ) && ! empty( $private_users ) ) {
+	$members_args['exclude'] = $private_users;
+}
+
+// Don't exclude admins from the list.
+$members_args['exclude_admins_mods'] = 0;
+?>
+
+<?php if ( bp_group_has_members( $members_args ) ) : ?>
 
 	<?php do_action( 'bp_before_group_members_content' ); ?>
 	<div class="row">
@@ -24,7 +40,7 @@
 			$user_avatar = bp_core_fetch_avatar(
 				array(
 					'item_id' => bp_get_member_user_id(),
-					'object'  => 'member',
+					'object'  => 'user',
 					'type'    => 'full',
 					'html'    => false,
 				)
@@ -44,7 +60,22 @@
 								<a class="no-deco truncate-on-the-fly hyphenate" href="<?php bp_member_permalink(); ?>" data-basevalue="28" data-minvalue="20" data-basewidth="152"><?php bp_member_name(); ?></a><span class="original-copy hidden"><?php bp_member_name(); ?></span>
 							</p>
 
-							<span class="activity"><?php bp_group_member_joined_since(); ?></span>
+							<span class="activity"><?php openlab_group_member_joined_since(); ?></span>
+
+							<?php // Only logged-in non-moderators see "Hide my membership". ?>
+							<?php if ( ( bp_get_member_user_id() === bp_loggedin_user_id() ) && ! current_user_can( 'bp_moderate' ) ) : ?>
+								<div class="group-item-membership-privacy">
+									<label>
+										<input type="checkbox" name="membership_privacy" id="membership_privacy" data-group_id="<?php echo esc_attr( bp_get_current_group_id() ); ?>" value="<?php echo esc_attr( bp_loggedin_user_id() ); ?>" <?php checked( openlab_is_my_membership_private( bp_get_current_group_id() ) ); ?> /> <?php esc_html_e( 'Hide my membership', 'commons-in-a-box' ); ?>
+										<?php wp_nonce_field( 'openlab_hide_membership_' . bp_get_current_group_id(), 'openlab_hide_membership_nonce_' . bp_get_current_group_id(), false, true ); ?>
+									</label>
+								</div>
+							<?php endif; ?>
+
+							<?php // Moderators see hidden membership label. ?>
+							<?php if ( current_user_can( 'bp_moderate' ) && in_array( bp_get_member_user_id(), $private_users, true ) ) : ?>
+								<p class="private-membership-indicator"><span class="fa fa-eye-slash"></span> <?php esc_html_e( 'Membership hidden', 'commons-in-a-box' ); ?></p>
+							<?php endif ?>
 
 							<?php do_action( 'bp_group_members_list_item' ); ?>
 
diff --git a/buddypress/groups/single/nav/admin.php b/buddypress/groups/single/nav/admin.php
new file mode 100644
index 00000000..7004eaf6
--- /dev/null
+++ b/buddypress/groups/single/nav/admin.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * 'Admin' nav markup.
+ *
+ * @since 1.6.0 Moved to this file from openlab_group_admin_tabs().
+ */
+
+$group = groups_get_current_group();
+
+$current_tab = bp_action_variable( 0 );
+
+$group_type = cboxol_get_group_group_type( $group->id );
+
+// Portfolio tabs look different from other groups
+?>
+<?php if ( cboxol_is_portfolio() ) : ?>
+	<?php if ( bp_is_item_admin() || bp_is_item_mod() ) { ?>
+		<li class="<?php echo ( 'edit-details' === $current_tab || empty( $current_tab ) ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'edit-details' ], 'manage' ) ) ); ?>"><?php echo esc_html( $group_type->get_label( 'group_details' ) ); ?></a></li>
+	<?php } ?>
+
+	<li class="<?php echo 'site-details' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'site-details' ], 'manage' ) ) ); ?>"><?php echo esc_html_x( 'Site', 'Group admin nav item', 'commons-in-a-box' ); ?></a></li>
+
+	<li class="<?php echo 'group-settings' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'group-settings' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Settings', 'commons-in-a-box' ); ?></a></li>
+
+	<li class="delete-button <?php echo 'delete-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-minus-circle"></span><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'delete-group' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Delete Portfolio', 'commons-in-a-box' ); ?></a></li>
+
+<?php else : ?>
+
+	<?php if ( bp_is_item_admin() || bp_is_item_mod() ) { ?>
+		<li class="<?php echo ( 'edit-details' === $current_tab || empty( $current_tab ) ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'edit-details' ], 'manage' ) ) ); ?>"><?php echo esc_html( $group_type->get_label( 'group_details' ) ); ?></a></li>
+	<?php } ?>
+
+	<?php
+	if ( ! bp_is_item_admin() ) {
+		return false;
+	}
+	?>
+
+	<li class="<?php echo 'site-details' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'site-details' ], 'manage' ) ) ); ?>"><?php echo esc_html_x( 'Site', 'Group admin nav item', 'commons-in-a-box' ); ?></a></li>
+
+	<li class="<?php echo 'group-settings' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'group-settings' ], 'manage' ) ) ); ?>"><?php esc_attr_e( 'Settings', 'commons-in-a-box' ); ?></a></li>
+
+	<?php if ( $group_type->get_can_be_cloned() ) : ?>
+		<?php
+		$clone_link = add_query_arg(
+			array(
+				'group_type' => $group_type->get_slug(),
+				'clone'      => bp_get_current_group_id(),
+			),
+			bp_get_groups_directory_permalink() . 'create/step/group-details/'
+		);
+		?>
+
+		<li class="clone-button <?php 'clone-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-plus-circle"></span><a href="<?php echo esc_url( $clone_link ); ?>"><?php esc_html_e( 'Clone', 'commons-in-a-box' ); ?></a></li>
+	<?php endif ?>
+
+	<li class="delete-button last-item <?php echo 'delete-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-minus-circle"></span><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'delete-group' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Delete', 'commons-in-a-box' ); ?></a></li>
+
+	<?php if ( $group_type->get_is_portfolio() ) : ?>
+		<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+		<li class="portfolio-displayname pull-right"><span class="highlight"><?php echo bp_core_get_userlink( openlab_get_user_id_from_portfolio_group_id( bp_get_group_id() ) ); ?></span></li>
+	<?php else : ?>
+		<?php // translators: last active timestamp ?>
+		<li class="info-line pull-right"><span class="timestamp info-line-timestamp visible-lg"><span class="fa fa-undo"></span> <?php echo esc_html( sprintf( __( 'active %s', 'commons-in-a-box' ), bp_get_group_last_active() ) ); ?></span></li>
+	<?php endif; ?>
+
+<?php endif; ?>
diff --git a/buddypress/groups/single/nav/docs.php b/buddypress/groups/single/nav/docs.php
new file mode 100644
index 00000000..282258a6
--- /dev/null
+++ b/buddypress/groups/single/nav/docs.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Markup for the Docs nav tabs.
+ *
+ * @since 1.6.0 Moved to this file from openlab_docs_tabs().
+ */
+
+$group = groups_get_current_group();
+
+$group_permalink = bp_get_group_permalink( $group );
+
+?>
+
+<li <?php echo ( 'list' === bp_docs_current_view() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_url( $group_permalink . bp_docs_get_docs_slug() ); ?>/"><?php esc_html_e( 'View Docs', 'commons-in-a-box' ); ?></a></li>
+<?php if ( current_user_can( 'bp_docs_create' ) && current_user_can( 'bp_docs_associate_with_group', bp_get_current_group_id() ) ) : ?>
+	<li <?php echo ( 'create' === bp_docs_current_view() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_url( $group_permalink . bp_docs_get_docs_slug() ); ?>/create/"><?php esc_html_e( 'New Doc', 'commons-in-a-box' ); ?></a></li>
+<?php endif; ?>
+<?php if ( ( 'edit' === bp_docs_current_view() || 'single' === bp_docs_current_view() ) && bp_docs_is_existing_doc() ) : ?>
+	<?php $doc_obj = bp_docs_get_current_doc(); ?>
+	<li class="current-menu-item"><?php echo esc_html( $doc_obj->post_title ); ?></li>
+<?php endif; ?>
diff --git a/buddypress/groups/single/nav/forum.php b/buddypress/groups/single/nav/forum.php
new file mode 100644
index 00000000..59bbc16c
--- /dev/null
+++ b/buddypress/groups/single/nav/forum.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Markup for the Forum nav tabs.
+ *
+ * @since 1.6.0 Moved to this file from openlab_forum_tabs().
+ */
+
+$group = groups_get_current_group();
+
+// Load up bbPress once
+$bbp = bbpress();
+
+/** Query Resets ***************************************************** */
+// Forum data
+$forum_ids = bbp_get_group_forum_ids( bp_get_current_group_id() );
+$forum_id  = array_shift( $forum_ids );
+$offset    = 0;
+
+$bbp->current_forum_id = $forum_id;
+
+bbp_set_query_name( 'bbp_single_forum' );
+
+// Get the topic
+bbp_has_topics(
+	array(
+		'name'           => bp_action_variable( $offset + 1 ),
+		'posts_per_page' => 1,
+		'show_stickies'  => false,
+	)
+);
+
+// Setup the topic
+while ( bbp_topics() ) {
+	bbp_the_topic();
+	$topic_title = bbp_get_topic_title();
+}
+
+$group_forum_permalink = bp_get_group_url( $group->id, bp_groups_get_path_chunks( [ 'forum' ] ) );
+
+?>
+
+<li <?php echo ( ! bp_action_variable() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_attr( $group_forum_permalink ); ?>"><?php esc_html_e( 'Discussion', 'commons-in-a-box' ); ?></a></li><!--
+<?php if ( bp_is_action_variable( 'topic' ) ) : ?>
+	--><li class="current-menu-item hyphenate"><span><?php echo esc_html( $topic_title ); ?></span></li><!--
+		<?php endif; ?>
+-->
+<?php
diff --git a/buddypress/groups/single/nav/membership.php b/buddypress/groups/single/nav/membership.php
new file mode 100644
index 00000000..782e7611
--- /dev/null
+++ b/buddypress/groups/single/nav/membership.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * 'Membership' tabs.
+ *
+ * @since 1.6.0 Moved from openlab_group_membership_tabs() into this file.
+ */
+
+$group = groups_get_current_group();
+
+$current_tab = bp_action_variable( 0 );
+
+?>
+
+<?php if ( bp_is_item_admin() ) : ?>
+	<li class="<?php echo 'manage-members' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'manage-members' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Membership', 'commons-in-a-box' ); ?></a></li>
+
+	<?php if ( 'private' === $group->status ) : ?>
+		<li class="<?php echo 'membership-requests' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'membership-requests' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Member Requests', 'commons-in-a-box' ); ?></a></li>
+	<?php endif; ?>
+<?php else : ?>
+	<li class="<?php echo bp_is_current_action( 'members' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_url( $group, bp_groups_get_path_chunks( [ 'members' ] ) ) ); ?>"><?php esc_html_e( 'Membership', 'commons-in-a-box' ); ?></a></li>
+<?php endif; ?>
+
+<?php if ( bp_group_is_member() && invite_anyone_access_test() && openlab_is_admin_truly_member() ) : ?>
+	<li class="<?php echo bp_is_current_action( 'invite-anyone' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_url( $group, bp_groups_get_path_chunks( [ 'invite-anyone' ] ) ) ); ?>"><?php esc_html_e( 'Invite New Members', 'commons-in-a-box' ); ?></a></li>
+<?php endif; ?>
+
+<?php if ( bp_is_item_admin() ) : ?>
+	<li class="<?php echo 'notifications' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_manage_url( $group, bp_groups_get_path_chunks( [ 'notifications' ], 'manage' ) ) ); ?>"><?php esc_html_e( 'Email Members', 'commons-in-a-box' ); ?></a></li>
+<?php endif; ?>
+
+<?php if ( bp_group_is_member() && openlab_is_admin_truly_member() ) : ?>
+	<li class="<?php echo bp_is_current_action( 'notifications' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_group_url( $group, bp_groups_get_path_chunks( [ 'notifications' ] ) ) ); ?>"><?php esc_html_e( 'Your Email Options', 'commons-in-a-box' ); ?></a></li>
+<?php endif; ?>
+
+<?php
diff --git a/buddypress/groups/single/plugins.php b/buddypress/groups/single/plugins.php
index 3443165f..09ee1320 100755
--- a/buddypress/groups/single/plugins.php
+++ b/buddypress/groups/single/plugins.php
@@ -26,7 +26,7 @@
 				<?php elseif ( bp_is_current_action( 'docs' ) ) : ?>
 
 					<ul class="nav nav-inline">
-						<?php openlab_docs_tabs(); ?>
+						<?php bp_get_template_part( 'groups/single/nav/docs' ); ?>
 					</ul>
 
 				<?php elseif ( bp_is_current_action( BP_GROUP_DOCUMENTS_SLUG ) ) : ?>
diff --git a/buddypress/members/index-directory.php b/buddypress/members/index-directory.php
index 8c7cd3b5..2ecc8a98 100755
--- a/buddypress/members/index-directory.php
+++ b/buddypress/members/index-directory.php
@@ -3,16 +3,12 @@
 get_header();
 ?>
 
-<?php
-global $wp_query;
-$post_obj = $wp_query->get_queried_object();
-?>
 <div id="content" class="hfeed row">
 	<?php get_template_part( 'parts/sidebar/groups' ); ?>
 	<div <?php post_class( 'col-sm-18 col-xs-24' ); ?> role="main">
 		<div id="openlab-main-content" class="content-wrapper">
 			<div class="entry-title">
-				<h1><?php echo esc_attr( $post_obj->post_title ); ?></h1>
+				<h1><?php echo esc_html( bp_get_directory_title( 'members' ) ); ?></h1>
 
 				<div class="directory-title-meta">
 					<button data-target="#sidebar" class="mobile-toggle direct-toggle pull-right visible-xs" type="button"><span class="fa fa-binoculars"></span><span class="sr-only"><?php esc_html_e( 'Search', 'commons-in-a-box' ); ?></span></button>
diff --git a/buddypress/members/members-loop.php b/buddypress/members/members-loop.php
index 2b86ba60..5cdb5b40 100755
--- a/buddypress/members/members-loop.php
+++ b/buddypress/members/members-loop.php
@@ -18,7 +18,7 @@
 						$user_avatar = bp_core_fetch_avatar(
 							array(
 								'item_id' => bp_get_member_user_id(),
-								'object'  => 'member',
+								'object'  => 'user',
 								'type'    => 'full',
 								'html'    => false,
 							)
diff --git a/buddypress/members/single/friends/requests.php b/buddypress/members/single/friends/requests.php
index 6cdad93b..772734f4 100755
--- a/buddypress/members/single/friends/requests.php
+++ b/buddypress/members/single/friends/requests.php
@@ -13,7 +13,7 @@
 							$user_avatar = bp_core_fetch_avatar(
 								array(
 									'item_id' => bp_get_member_user_id(),
-									'object'  => 'member',
+									'object'  => 'user',
 									'type'    => 'full',
 									'html'    => false,
 								)
diff --git a/buddypress/members/single/header.php b/buddypress/members/single/header.php
index e4564a9a..622ec821 100644
--- a/buddypress/members/single/header.php
+++ b/buddypress/members/single/header.php
@@ -27,16 +27,6 @@
 );
 ?>
 
-<?php
-// Get the displayed user's base domain
-// This is required because the my-* pages aren't really displayed user pages from BP's
-// point of view
-$dud = bp_displayed_user_domain();
-if ( ! $dud ) {
-	$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
-}
-?>
-
 <div id="member-header" class="member-header row">
 <?php
 do_action( 'bp_before_member_header' );
@@ -50,7 +40,7 @@
 				$avatar_src = bp_core_fetch_avatar(
 					array(
 						'item_id' => $this_user_id,
-						'object'  => 'member',
+						'object'  => 'user',
 						'type'    => 'full',
 						'html'    => false,
 					)
@@ -63,8 +53,8 @@
 		<div id="profile-action-wrapper">
 			<?php if ( is_user_logged_in() && openlab_is_my_profile() ) : ?>
 				<div id="group-action-wrapper">
-					<a class="btn btn-default btn-block btn-primary link-btn" href="<?php echo esc_attr( $dud . 'profile/edit/' ); ?>"><i class="fa fa-pencil" aria-hidden="true"></i> <?php esc_html_e( 'Edit Profile', 'commons-in-a-box' ); ?></a>
-					<a class="btn btn-default btn-block btn-primary link-btn" href="<?php echo esc_attr( $dud . 'profile/change-avatar/' ); ?>"><i class="fa fa-camera" aria-hidden="true"></i> <?php esc_html_e( 'Change Avatar', 'commons-in-a-box' ); ?></a>
+					<a class="btn btn-default btn-block btn-primary link-btn" href="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_profile_slug(), 'edit' ] ) ) ); ?>"><i class="fa fa-pencil" aria-hidden="true"></i> <?php esc_html_e( 'Edit Profile', 'commons-in-a-box' ); ?></a>
+					<a class="btn btn-default btn-block btn-primary link-btn" href="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_profile_slug(), 'change-avatar' ] ) ) ); ?>"><i class="fa fa-camera" aria-hidden="true"></i> <?php esc_html_e( 'Change Avatar', 'commons-in-a-box' ); ?></a>
 				</div>
 			<?php elseif ( is_user_logged_in() && ! openlab_is_my_profile() ) : ?>
 				<?php bp_add_friend_button( openlab_fallback_user(), bp_loggedin_user_id() ); ?>
diff --git a/buddypress/members/single/member-home.php b/buddypress/members/single/member-home.php
index 7bfbc01f..9842e64c 100644
--- a/buddypress/members/single/member-home.php
+++ b/buddypress/members/single/member-home.php
@@ -47,7 +47,7 @@
 
 		<?php if ( $friend_ids ) : ?>
 			<?php // translators: user display name ?>
-			<h2 class="title activity-title"><a class="no-deco" href="<?php echo esc_attr( bp_displayed_user_domain() . bp_get_friends_slug() ); ?>"><?php bp_word_or_name( __( 'My Friends', 'commons-in-a-box' ), __( "%s's Friends", 'commons-in-a-box' ) ); ?><span class="fa fa-chevron-circle-right font-size font-18" aria-hidden="true"></span></a></h2>
+			<h2 class="title activity-title"><a class="no-deco" href="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_friends_slug() ] ) ) ); ?>"><?php bp_word_or_name( __( 'My Friends', 'commons-in-a-box' ), __( "%s's Friends", 'commons-in-a-box' ) ); ?><span class="fa fa-chevron-circle-right font-size font-18" aria-hidden="true"></span></a></h2>
 
 			<ul id="member-list" class="inline-element-list">
 				<?php foreach ( $friend_ids as $friend_id ) : ?>
@@ -55,14 +55,14 @@
 					$user_avatar = bp_core_fetch_avatar(
 						array(
 							'item_id' => $friend_id,
-							'object'  => 'member',
+							'object'  => 'user',
 							'type'    => 'full',
 							'html'    => false,
 						)
 					);
 					?>
 					<li class="inline-element">
-						<a href="<?php echo esc_attr( bp_core_get_user_domain( $friend_id ) ); ?>">
+						<a href="<?php echo esc_attr( bp_members_get_user_url( $friend_id ) ); ?>">
 							<img class="img-responsive" src="<?php echo esc_attr( $user_avatar ); ?>" alt="<?php echo esc_attr( bp_core_get_user_displayname( $friend_id ) ); ?>"/>
 						</a>
 					</li>
diff --git a/buddypress/members/single/messages/messages-loop.php b/buddypress/members/single/messages/messages-loop.php
index 2653fe44..3cfd1f13 100755
--- a/buddypress/members/single/messages/messages-loop.php
+++ b/buddypress/members/single/messages/messages-loop.php
@@ -25,7 +25,7 @@
 			$user_avatar = bp_core_fetch_avatar(
 				array(
 					'item_id' => $messages_template->thread->last_sender_id,
-					'object'  => 'member',
+					'object'  => 'user',
 					'type'    => 'full',
 					'html'    => false,
 				)
diff --git a/buddypress/members/single/profile/change-avatar.php b/buddypress/members/single/profile/change-avatar.php
index 8fa64af1..5789f120 100755
--- a/buddypress/members/single/profile/change-avatar.php
+++ b/buddypress/members/single/profile/change-avatar.php
@@ -1,5 +1,21 @@
 <?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 <?php echo openlab_submenu_markup(); ?>
+
+<?php
+if ( bp_get_user_has_avatar() ) {
+	$avatar_url = bp_core_fetch_avatar(
+		array(
+			'item_id' => bp_displayed_user_id(),
+			'object'  => 'user',
+			'type'    => 'full',
+			'html'    => false,
+		)
+	);
+} else {
+	$avatar_url = get_template_directory_uri() . '/images/avatar_blank.png';
+}
+?>
+
 <div id="item-body" role="main">
 <?php do_action( 'bp_before_profile_avatar_upload_content' ); ?>
 
@@ -7,48 +23,75 @@
 
 	<form action="" method="post" id="avatar-upload-form" enctype="multipart/form-data" class="form-inline form-panel">
 
-		<div class="panel panel-default">
-
-			<?php if ( 'upload-image' === bp_get_avatar_admin_step() ) : ?>
+		<?php if ( 'upload-image' === bp_get_avatar_admin_step() ) : ?>
+			<div class="panel panel-default">
 				<div class="panel-heading"><?php esc_html_e( 'Upload Avatar', 'commons-in-a-box' ); ?></div>
-					<div class="panel-body">
-						<?php do_action( 'template_notices' ); ?>
-						<div class="row">
-							<div class="col-sm-8">
-								<div id="avatar-wrapper">
-									<div class="padded-img">
-										<img class="img-responsive padded" src ="<?php echo esc_attr( get_template_directory_uri() ); ?>/images/avatar_blank.png" alt="avatar-blank"/>
-									</div>
+				<div class="panel-body">
+					<?php do_action( 'template_notices' ); ?>
+					<div class="row">
+						<div class="col-sm-8">
+							<div id="avatar-wrapper">
+								<div class="padded-img">
+									<img class="img-responsive padded" src="<?php echo esc_attr( $avatar_url ); ?>" alt="" />
 								</div>
 							</div>
-							<div class="col-sm-16">
-
-								<p class="italics"><?php esc_html_e( 'Your avatar will be used on your profile and throughout the site. If there is a Gravatar associated with your account email we will use that, or you can upload an image from your computer. Click below to select a JPG, GIF or PNG format photo from your computer and then click "Upload Image" to proceed.', 'buddypress' ); ?></p>
+						</div>
+						<div class="col-sm-16">
 
-								<p id="avatar-upload">
-									<div class="form-group form-inline">
-										<div class="form-control type-file-wrapper">
-											<input type="file" name="file" id="file" />
-										</div>
+							<p class="italics"><?php esc_html_e( 'Your avatar will be used on your profile and throughout the site. If there is a Gravatar associated with your account email we will use that, or you can upload an image from your computer. Click below to select a JPG, GIF or PNG format photo from your computer and then click "Upload Image" to proceed.', 'buddypress' ); ?></p>
 
-										<input class="btn btn-primary top-align" 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 id="avatar-upload">
+								<div class="form-group form-inline">
+									<div class="form-control type-file-wrapper">
+										<input type="file" name="file" id="file" />
 									</div>
-								</p>
 
-								<?php if ( bp_get_user_has_avatar() ) : ?>
-									<p class="italics"><?php esc_html_e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
-									<a class="btn btn-primary no-deco" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>"><?php esc_html_e( 'Delete My Avatar', 'buddypress' ); ?></a>
-								<?php endif; ?>
+									<input class="btn btn-primary top-align" 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" />
+								</div>
+							</p>
+
+							<?php if ( bp_get_user_has_avatar() ) : ?>
+								<p class="italics"><?php esc_html_e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
+								<a class="btn btn-primary no-deco" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>"><?php esc_html_e( 'Delete My Avatar', 'buddypress' ); ?></a>
+							<?php endif; ?>
 
-								<?php wp_nonce_field( 'bp_avatar_upload' ); ?>
-							</div>
+							<?php wp_nonce_field( 'bp_avatar_upload' ); ?>
 						</div>
 					</div>
+				</div>
+			</div>
 
-			<?php endif; ?>
+			<?php wp_enqueue_script( 'openlab-avatar-privacy' ); ?>
 
-			<?php if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?>
+			<div class="panel panel-default panel-avatar-privacy" id="panel-avatar-privacy">
+				<div class="panel-heading"><?php esc_html_e( 'Avatar Privacy', 'commons-in-box' ); ?></div>
+
+				<div class="panel-body">
+					<fieldset>
+						<legend><?php esc_html_e( 'Who can see your avatar?', 'commons-in-box' ); ?></legend>
+
+						<div class="radio">
+							<?php foreach ( bp_xprofile_get_visibility_levels() as $level ) : ?>
+								<label for="avatar-visibility-level-<?php echo esc_attr( $level['id'] ); ?>">
+									<input type="radio" class="avatar-visibility-radio" name="avatar-privacy" id="avatar-visibility-level-<?php echo esc_attr( $level['id'] ); ?>" value="<?php echo esc_attr( $level['id'] ); ?>"<?php checked( cboxol_get_user_avatar_visibility() === $level['id'] ); ?> />
+									<?php echo esc_html( $level['label'] ); ?>
+								</label>
+
+							<?php endforeach; ?>
+						</div>
+					</fieldset>
+
+					<input type="hidden" id="avatar-privacy-user-id" value="<?php echo esc_attr( bp_displayed_user_id() ); ?>" />
+
+					<?php wp_nonce_field( 'openlab_avatar_privacy', 'openlab-avatar-privacy-nonce' ); ?>
+				</div>
+			</div>
+
+		<?php endif; ?>
+
+		<?php if ( 'crop-image' === bp_get_avatar_admin_step() ) : ?>
+			<div class="panel panel-default">
 
 				<div class="panel-heading"><?php esc_html_e( 'Crop Avatar', 'commons-in-a-box' ); ?></div>
 				<div class="panel-body">
@@ -70,11 +113,9 @@
 
 					<?php wp_nonce_field( 'bp_avatar_cropstore' ); ?>
 				</div>
+			</div>
 
-			<?php endif; ?>
-
-		</div><!--.panel-->
-
+		<?php endif; ?>
 	</form>
 
 <?php else : ?>
diff --git a/buddypress/members/single/settings/delete-account.php b/buddypress/members/single/settings/delete-account.php
index bb503a15..55ef1f7c 100644
--- a/buddypress/members/single/settings/delete-account.php
+++ b/buddypress/members/single/settings/delete-account.php
@@ -13,7 +13,7 @@
 
 		<?php do_action( 'bp_template_content' ); ?>
 
-		<form action="<?php echo esc_attr( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account' ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+		<form action="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_settings_slug(), 'delete-account' ] ) ) ); ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
 			<div class="bp-template-notice error margin-bottom">
 				<p><?php esc_html_e( 'WARNING: Deleting your account will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'commons-in-a-box' ); ?></p>
 			</div>
diff --git a/buddypress/members/single/settings/general.php b/buddypress/members/single/settings/general.php
index a2f7a800..95586cd5 100644
--- a/buddypress/members/single/settings/general.php
+++ b/buddypress/members/single/settings/general.php
@@ -14,7 +14,7 @@
 
 	<?php do_action( 'bp_template_content' ); ?>
 
-	<form action="<?php echo esc_attr( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ); ?>" method="post" class="standard-form form-panel" id="settings-form">
+	<form action="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_settings_slug(), 'general' ] ) ) ); ?>" method="post" class="standard-form form-panel" id="settings-form">
 
 		<div class="panel panel-default">
 			<div class="panel-heading"><?php esc_html_e( 'Account Settings', 'commons-in-a-box' ); ?></div>
diff --git a/buddypress/members/single/settings/notifications.php b/buddypress/members/single/settings/notifications.php
index 09ea3381..ebd9a416 100644
--- a/buddypress/members/single/settings/notifications.php
+++ b/buddypress/members/single/settings/notifications.php
@@ -13,7 +13,7 @@
 
 	<?php do_action( 'bp_template_content' ); ?>
 
-	<form action="<?php echo esc_attr( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications' ); ?>" method="post" class="standard-form form-panel" id="settings-form">
+	<form action="<?php echo esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_settings_slug(), 'notifications' ] ) ) ); ?>" method="post" class="standard-form form-panel" id="settings-form">
 
 		<div class="panel panel-default">
 			<div class="panel-heading"><?php esc_html_e( 'Email Notifications', 'commons-in-a-box' ); ?></div>
diff --git a/buddypress/members/single/sidebar.php b/buddypress/members/single/sidebar.php
index c93c5a5b..c1f00589 100644
--- a/buddypress/members/single/sidebar.php
+++ b/buddypress/members/single/sidebar.php
@@ -1,11 +1,4 @@
 <?php
-// Get the displayed user's base domain
-// This is required because the my-* pages aren't really displayed user pages from BP's
-// point of view
-$dud = bp_displayed_user_domain();
-if ( ! $dud ) {
-	$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
-}
 
 if ( ( bp_is_user_activity() || ! bp_current_component() ) && ! ( strpos( $post->post_name, 'my-' ) > -1 ) ) {
 	$mobile_hide = true;
@@ -22,68 +15,3 @@
 	<?php openlab_member_sidebar_menu(); ?>
 
 </div>
-
-<?php /* End portfolio links */ ?>
-
-<?php /* Recent Account Activity / Recent Friend Activity */ ?>
-
-<?php
-// The 'user_id' param is the displayed user, but displayed user is not set on
-// my-* pages
-$user_id = bp_is_user() ? bp_displayed_user_id() : bp_loggedin_user_id();
-
-$activity_args = array(
-	'user_id'     => $user_id,
-	'per_page'    => openlab_is_my_profile() ? 4 : 2, // Legacy. Not sure why
-	'scope'       => bp_is_user_friends() ? 'friends' : '',
-	'show_hidden' => openlab_is_my_profile(),
-	'primary_id'  => false,
-);
-?>
-
-<?php if ( bp_is_user_friends() ) : ?>
-	<h2 class="sidebar-header"><?php esc_html_e( 'Recent Friend Activity', 'commons-in-a-box' ); ?></h2>
-<?php else : ?>
-	<h2 class="sidebar-header"><?php esc_html_e( 'Recent Activity', 'commons-in-a-box' ); ?></h2>
-<?php endif ?>
-
-<div class="activity-wrapper">
-	<?php if ( bp_has_activities( $activity_args ) ) : ?>
-		<div id="activity-stream" class="activity-list item-list inline-element-list sidebar-sublinks">
-			<?php
-			while ( bp_activities() ) :
-				bp_the_activity();
-				?>
-				<div class="sidebar-block activity-block">
-					<div class="row activity-row">
-						<div class="activity-avatar col-sm-8 col-xs-7">
-							<a href="<?php bp_activity_user_link(); ?>">
-								<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-								<?php echo openlab_activity_user_avatar(); ?>
-							</a>
-						</div>
-
-						<div class="activity-content overflow-hidden col-sm-16 col-xs-17">
-
-							<div class="activity-header">
-								<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-								<?php echo openlab_get_custom_activity_action(); ?>
-							</div>
-
-						</div>
-					</div>
-				</div>
-			<?php endwhile; ?>
-		</div>
-	<?php else : ?>
-		<div id="activity-stream" class="activity-list item-list">
-			<div class="sidebar-block">
-				<div class="row activity-row">
-					<div id="message" class="info col-sm-24">
-						<p><?php esc_html_e( 'No recent activity.', 'commons-in-a-box' ); ?></p>
-					</div>
-				</div>
-			</div>
-		</div>
-	<?php endif; ?>
-</div>
diff --git a/composer.lock b/composer.lock
index d893756e..e019bfc6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -146,28 +146,28 @@
         },
         {
             "name": "phpcompatibility/phpcompatibility-paragonie",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
-                "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26"
+                "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26",
-                "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac",
+                "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac",
                 "shasum": ""
             },
             "require": {
                 "phpcompatibility/php-compatibility": "^9.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
                 "paragonie/random_compat": "dev-master",
                 "paragonie/sodium_compat": "dev-master"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
             "type": "phpcodesniffer-standard",
@@ -197,22 +197,37 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues",
+                "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy",
                 "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie"
             },
-            "time": "2022-10-25T01:46:02+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCompatibility",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-04-24T21:30:46+00:00"
         },
         {
             "name": "phpcompatibility/phpcompatibility-wp",
-            "version": "2.1.4",
+            "version": "2.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
-                "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5"
+                "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5",
-                "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082",
+                "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082",
                 "shasum": ""
             },
             "require": {
@@ -220,10 +235,10 @@
                 "phpcompatibility/phpcompatibility-paragonie": "^1.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7"
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0"
             },
             "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
                 "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
             },
             "type": "phpcodesniffer-standard",
@@ -252,35 +267,50 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues",
+                "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy",
                 "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP"
             },
-            "time": "2022-10-24T09:00:36+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCompatibility",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-04-24T21:37:59+00:00"
         },
         {
             "name": "phpcsstandards/phpcsextra",
-            "version": "1.0.3",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSExtra.git",
-                "reference": "7029c051cd310e2e17c6caea3429bfbe290c41ae"
+                "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/7029c051cd310e2e17c6caea3429bfbe290c41ae",
-                "reference": "7029c051cd310e2e17c6caea3429bfbe290c41ae",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489",
+                "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4",
-                "phpcsstandards/phpcsutils": "^1.0",
-                "squizlabs/php_codesniffer": "^3.7.1"
+                "phpcsstandards/phpcsutils": "^1.0.9",
+                "squizlabs/php_codesniffer": "^3.8.0"
             },
             "require-dev": {
                 "php-parallel-lint/php-console-highlighter": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcsstandards/phpcsdevcs": "^1.1.5",
-                "phpcsstandards/phpcsdevtools": "^1.2.0",
-                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0"
+                "phpcsstandards/phpcsdevcs": "^1.1.6",
+                "phpcsstandards/phpcsdevtools": "^1.2.1",
+                "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -315,35 +345,50 @@
             ],
             "support": {
                 "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues",
+                "security": "https://github.com/PHPCSStandards/PHPCSExtra/security/policy",
                 "source": "https://github.com/PHPCSStandards/PHPCSExtra"
             },
-            "time": "2023-03-28T17:48:27+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-12-08T16:49:07+00:00"
         },
         {
             "name": "phpcsstandards/phpcsutils",
-            "version": "1.0.6",
+            "version": "1.0.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHPCSUtils.git",
-                "reference": "ba259eaaefac118648e1263919b9530667ffcf01"
+                "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/ba259eaaefac118648e1263919b9530667ffcf01",
-                "reference": "ba259eaaefac118648e1263919b9530667ffcf01",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/87b233b00daf83fb70f40c9a28692be017ea7c6c",
+                "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
                 "php": ">=5.4",
-                "squizlabs/php_codesniffer": "^3.7.1 || 4.0.x-dev@dev"
+                "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev"
             },
             "require-dev": {
                 "ext-filter": "*",
                 "php-parallel-lint/php-console-highlighter": "^1.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcsstandards/phpcsdevcs": "^1.1.6",
-                "yoast/phpunit-polyfills": "^1.0.5"
+                "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -388,22 +433,37 @@
             "support": {
                 "docs": "https://phpcsutils.com/",
                 "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues",
+                "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy",
                 "source": "https://github.com/PHPCSStandards/PHPCSUtils"
             },
-            "time": "2023-05-27T13:39:12+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-05-20T13:34:27+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.10.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877",
+                "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877",
                 "shasum": ""
             },
             "require": {
@@ -413,11 +473,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ],
             "type": "library",
             "extra": {
@@ -432,22 +492,45 @@
             "authors": [
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ],
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": [
                 "phpcs",
                 "standards",
                 "static analysis"
             ],
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-05-22T21:24:41+00:00"
         },
         {
             "name": "wp-coding-standards/wpcs",
@@ -455,29 +538,33 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
-                "reference": "a328aff1e0b05e55e61a02b9f4faae6482cfc3ad"
+                "reference": "29488feb64b723674fe463e691a4f83682c2dd5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/a328aff1e0b05e55e61a02b9f4faae6482cfc3ad",
-                "reference": "a328aff1e0b05e55e61a02b9f4faae6482cfc3ad",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/29488feb64b723674fe463e691a4f83682c2dd5e",
+                "reference": "29488feb64b723674fe463e691a4f83682c2dd5e",
                 "shasum": ""
             },
             "require": {
                 "ext-filter": "*",
+                "ext-libxml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlreader": "*",
                 "php": ">=5.4",
-                "phpcsstandards/phpcsextra": "^1.0",
-                "phpcsstandards/phpcsutils": "^1.0.5",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "phpcsstandards/phpcsextra": "^1.2.1",
+                "phpcsstandards/phpcsutils": "^1.0.10",
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "require-dev": {
                 "php-parallel-lint/php-console-highlighter": "^1.0.0",
                 "php-parallel-lint/php-parallel-lint": "^1.3.2",
                 "phpcompatibility/php-compatibility": "^9.0",
                 "phpcsstandards/phpcsdevtools": "^1.2.0",
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
             },
             "suggest": {
+                "ext-iconv": "For improved results",
                 "ext-mbstring": "For improved results"
             },
             "default-branch": true,
@@ -504,7 +591,13 @@
                 "source": "https://github.com/WordPress/WordPress-Coding-Standards",
                 "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
             },
-            "time": "2023-05-28T19:30:57+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "custom"
+                }
+            ],
+            "time": "2024-04-25T09:28:10+00:00"
         }
     ],
     "aliases": [],
@@ -516,5 +609,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/css/color-schemes/blue.css b/css/color-schemes/blue.css
index 15ffdc6f..6d29ce65 100644
--- a/css/color-schemes/blue.css
+++ b/css/color-schemes/blue.css
@@ -4,7 +4,7 @@ Theme URL: https://commonsinabox.org
 Description: Commons In A Box theme, based on the OpenLab at City Tech.
 Author: The Commons In A Box OpenLab team
 Author URI: https://commonsinabox.org
-Version: 1.5.1
+Version: 1.6.0
 Text Domain: commons-in-a-box
 */
 /**import bootstrap**/
@@ -7367,6 +7367,7 @@ blockquote .h6 {
 .pagination li a .fa,
 .pagination li span .fa {
   font-size: 16px;
+  line-height: 1;
 }
 .pagination li a:hover,
 .pagination li span:hover {
@@ -7872,6 +7873,12 @@ body .font-size.font-18 {
 body.js .group-creator-empty-row {
   display: none;
 }
+body .portfolio-profile-link-wrapper {
+  margin-top: 32px;
+}
+body .portfolio-profile-link-wrapper label {
+  font-weight: 600;
+}
 body .group-creators-section {
   margin-bottom: 20px;
   margin-top: 20px;
@@ -8387,6 +8394,17 @@ body label.passive {
 body label.block {
   display: block;
 }
+.panel-avatar-privacy.loading .radio {
+  opacity: 0.5;
+  pointer-events: none;
+}
+.panel-avatar-privacy .panel-body legend {
+  margin-bottom: 1em;
+}
+.panel-avatar-privacy .panel-body .radio label {
+  font-weight: normal;
+  margin-right: 16px;
+}
 /**shortcodes**/
 .callout-list .row {
   margin-bottom: 34px;
@@ -8461,6 +8479,7 @@ body form .checkbox-list-container {
 .ct-group-meta .site-path {
   display: table;
   padding-left: 25px;
+  white-space: nowrap;
   width: 90%;
 }
 .ct-group-meta .site-path span {
@@ -9051,15 +9070,7 @@ body form .checkbox-list-container {
   margin-bottom: 25px;
 }
 .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
-  height: 0;
   position: relative;
-  padding-top: 100%;
-}
-.home-page .activity-list .activity-wrapper .activity-item .item-avatar a {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
 }
 @media (max-width: 767px) {
   .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
@@ -9096,6 +9107,15 @@ body form .checkbox-list-container {
     width: 100%;
   }
 }
+.clickable-card.card-is-hovered {
+  border-color: #999999 !important;
+}
+.clickable-card .see-more {
+  text-decoration: underline;
+}
+.clickable-card .see-more:hover {
+  text-decoration: none;
+}
 /**sidebar**/
 @media (max-width: 767px) {
   .mobile-dropdown {
@@ -9182,6 +9202,20 @@ body form .checkbox-list-container {
   color: #333333;
   text-decoration: none;
 }
+.portfolio-profile-link-toggle-wrapper {
+  align-items: flex-start;
+  display: flex;
+  gap: 8px;
+  margin-left: 5%;
+  padding-bottom: 10px;
+}
+.portfolio-profile-link-toggle-wrapper label {
+  display: block;
+  font-weight: normal;
+  font-size: 12px;
+  padding-top: 3px;
+  margin-bottom: 0;
+}
 .mobile-group-site-links {
   margin-top: 30px;
 }
@@ -9865,11 +9899,34 @@ input#group-request-send {
   }
 }
 .group-members.group-list .group-item-wrapper {
-  height: 118px;
+  height: 128px;
 }
 .group-members.group-list .group-item-wrapper p {
   margin: 10px 0 7px;
 }
+.group-members.group-list .group-item-membership-privacy {
+  margin-top: 15px;
+}
+.group-members.group-list .group-item-membership-privacy label {
+  font-size: 12px;
+  font-weight: 400;
+}
+.group-members.group-list .group-item-membership-privacy label:hover {
+  cursor: pointer;
+}
+.group-manage-members-pagination {
+  align-items: center;
+  display: flex;
+  gap: 10px;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+@media screen and (max-width: 767px) {
+  .group-manage-members-pagination {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
 .group-manage-members.group-list.group-manage-requests .group-item .group-item-wrapper ul.group-member-actions {
   font-weight: normal;
 }
@@ -9885,7 +9942,7 @@ input#group-request-send {
   height: 127px;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members {
-  height: 318px;
+  height: auto;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members .link-btn {
   margin-right: 3px;
@@ -11102,6 +11159,13 @@ input.help-search {
     margin-top: 10px;
   }
 }
+/* Private membership indicator */
+p.private-membership-indicator {
+  margin-top: 15px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #666 !important;
+}
 /**contact form**/
 .wpcf7 .wpcf7-response-output {
   border: none;
diff --git a/css/color-schemes/green.css b/css/color-schemes/green.css
index e6d654bc..1b2b0fc7 100644
--- a/css/color-schemes/green.css
+++ b/css/color-schemes/green.css
@@ -4,7 +4,7 @@ Theme URL: https://commonsinabox.org
 Description: Commons In A Box theme, based on the OpenLab at City Tech.
 Author: The Commons In A Box OpenLab team
 Author URI: https://commonsinabox.org
-Version: 1.5.1
+Version: 1.6.0
 Text Domain: commons-in-a-box
 */
 /**import bootstrap**/
@@ -7367,6 +7367,7 @@ blockquote .h6 {
 .pagination li a .fa,
 .pagination li span .fa {
   font-size: 16px;
+  line-height: 1;
 }
 .pagination li a:hover,
 .pagination li span:hover {
@@ -7872,6 +7873,12 @@ body .font-size.font-18 {
 body.js .group-creator-empty-row {
   display: none;
 }
+body .portfolio-profile-link-wrapper {
+  margin-top: 32px;
+}
+body .portfolio-profile-link-wrapper label {
+  font-weight: 600;
+}
 body .group-creators-section {
   margin-bottom: 20px;
   margin-top: 20px;
@@ -8387,6 +8394,17 @@ body label.passive {
 body label.block {
   display: block;
 }
+.panel-avatar-privacy.loading .radio {
+  opacity: 0.5;
+  pointer-events: none;
+}
+.panel-avatar-privacy .panel-body legend {
+  margin-bottom: 1em;
+}
+.panel-avatar-privacy .panel-body .radio label {
+  font-weight: normal;
+  margin-right: 16px;
+}
 /**shortcodes**/
 .callout-list .row {
   margin-bottom: 34px;
@@ -8461,6 +8479,7 @@ body form .checkbox-list-container {
 .ct-group-meta .site-path {
   display: table;
   padding-left: 25px;
+  white-space: nowrap;
   width: 90%;
 }
 .ct-group-meta .site-path span {
@@ -9051,15 +9070,7 @@ body form .checkbox-list-container {
   margin-bottom: 25px;
 }
 .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
-  height: 0;
   position: relative;
-  padding-top: 100%;
-}
-.home-page .activity-list .activity-wrapper .activity-item .item-avatar a {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
 }
 @media (max-width: 767px) {
   .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
@@ -9096,6 +9107,15 @@ body form .checkbox-list-container {
     width: 100%;
   }
 }
+.clickable-card.card-is-hovered {
+  border-color: #999999 !important;
+}
+.clickable-card .see-more {
+  text-decoration: underline;
+}
+.clickable-card .see-more:hover {
+  text-decoration: none;
+}
 /**sidebar**/
 @media (max-width: 767px) {
   .mobile-dropdown {
@@ -9182,6 +9202,20 @@ body form .checkbox-list-container {
   color: #333333;
   text-decoration: none;
 }
+.portfolio-profile-link-toggle-wrapper {
+  align-items: flex-start;
+  display: flex;
+  gap: 8px;
+  margin-left: 5%;
+  padding-bottom: 10px;
+}
+.portfolio-profile-link-toggle-wrapper label {
+  display: block;
+  font-weight: normal;
+  font-size: 12px;
+  padding-top: 3px;
+  margin-bottom: 0;
+}
 .mobile-group-site-links {
   margin-top: 30px;
 }
@@ -9865,11 +9899,34 @@ input#group-request-send {
   }
 }
 .group-members.group-list .group-item-wrapper {
-  height: 118px;
+  height: 128px;
 }
 .group-members.group-list .group-item-wrapper p {
   margin: 10px 0 7px;
 }
+.group-members.group-list .group-item-membership-privacy {
+  margin-top: 15px;
+}
+.group-members.group-list .group-item-membership-privacy label {
+  font-size: 12px;
+  font-weight: 400;
+}
+.group-members.group-list .group-item-membership-privacy label:hover {
+  cursor: pointer;
+}
+.group-manage-members-pagination {
+  align-items: center;
+  display: flex;
+  gap: 10px;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+@media screen and (max-width: 767px) {
+  .group-manage-members-pagination {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
 .group-manage-members.group-list.group-manage-requests .group-item .group-item-wrapper ul.group-member-actions {
   font-weight: normal;
 }
@@ -9885,7 +9942,7 @@ input#group-request-send {
   height: 127px;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members {
-  height: 318px;
+  height: auto;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members .link-btn {
   margin-right: 3px;
@@ -11102,6 +11159,13 @@ input.help-search {
     margin-top: 10px;
   }
 }
+/* Private membership indicator */
+p.private-membership-indicator {
+  margin-top: 15px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #666 !important;
+}
 /**contact form**/
 .wpcf7 .wpcf7-response-output {
   border: none;
diff --git a/css/color-schemes/red.css b/css/color-schemes/red.css
index 539cfb20..5803902e 100644
--- a/css/color-schemes/red.css
+++ b/css/color-schemes/red.css
@@ -4,7 +4,7 @@ Theme URL: https://commonsinabox.org
 Description: Commons In A Box theme, based on the OpenLab at City Tech.
 Author: The Commons In A Box OpenLab team
 Author URI: https://commonsinabox.org
-Version: 1.5.1
+Version: 1.6.0
 Text Domain: commons-in-a-box
 */
 /**import bootstrap**/
@@ -7367,6 +7367,7 @@ blockquote .h6 {
 .pagination li a .fa,
 .pagination li span .fa {
   font-size: 16px;
+  line-height: 1;
 }
 .pagination li a:hover,
 .pagination li span:hover {
@@ -7872,6 +7873,12 @@ body .font-size.font-18 {
 body.js .group-creator-empty-row {
   display: none;
 }
+body .portfolio-profile-link-wrapper {
+  margin-top: 32px;
+}
+body .portfolio-profile-link-wrapper label {
+  font-weight: 600;
+}
 body .group-creators-section {
   margin-bottom: 20px;
   margin-top: 20px;
@@ -8387,6 +8394,17 @@ body label.passive {
 body label.block {
   display: block;
 }
+.panel-avatar-privacy.loading .radio {
+  opacity: 0.5;
+  pointer-events: none;
+}
+.panel-avatar-privacy .panel-body legend {
+  margin-bottom: 1em;
+}
+.panel-avatar-privacy .panel-body .radio label {
+  font-weight: normal;
+  margin-right: 16px;
+}
 /**shortcodes**/
 .callout-list .row {
   margin-bottom: 34px;
@@ -8461,6 +8479,7 @@ body form .checkbox-list-container {
 .ct-group-meta .site-path {
   display: table;
   padding-left: 25px;
+  white-space: nowrap;
   width: 90%;
 }
 .ct-group-meta .site-path span {
@@ -9051,15 +9070,7 @@ body form .checkbox-list-container {
   margin-bottom: 25px;
 }
 .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
-  height: 0;
   position: relative;
-  padding-top: 100%;
-}
-.home-page .activity-list .activity-wrapper .activity-item .item-avatar a {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
 }
 @media (max-width: 767px) {
   .home-page .activity-list .activity-wrapper .activity-item .item-avatar {
@@ -9096,6 +9107,15 @@ body form .checkbox-list-container {
     width: 100%;
   }
 }
+.clickable-card.card-is-hovered {
+  border-color: #999999 !important;
+}
+.clickable-card .see-more {
+  text-decoration: underline;
+}
+.clickable-card .see-more:hover {
+  text-decoration: none;
+}
 /**sidebar**/
 @media (max-width: 767px) {
   .mobile-dropdown {
@@ -9182,6 +9202,20 @@ body form .checkbox-list-container {
   color: #333333;
   text-decoration: none;
 }
+.portfolio-profile-link-toggle-wrapper {
+  align-items: flex-start;
+  display: flex;
+  gap: 8px;
+  margin-left: 5%;
+  padding-bottom: 10px;
+}
+.portfolio-profile-link-toggle-wrapper label {
+  display: block;
+  font-weight: normal;
+  font-size: 12px;
+  padding-top: 3px;
+  margin-bottom: 0;
+}
 .mobile-group-site-links {
   margin-top: 30px;
 }
@@ -9865,11 +9899,34 @@ input#group-request-send {
   }
 }
 .group-members.group-list .group-item-wrapper {
-  height: 118px;
+  height: 128px;
 }
 .group-members.group-list .group-item-wrapper p {
   margin: 10px 0 7px;
 }
+.group-members.group-list .group-item-membership-privacy {
+  margin-top: 15px;
+}
+.group-members.group-list .group-item-membership-privacy label {
+  font-size: 12px;
+  font-weight: 400;
+}
+.group-members.group-list .group-item-membership-privacy label:hover {
+  cursor: pointer;
+}
+.group-manage-members-pagination {
+  align-items: center;
+  display: flex;
+  gap: 10px;
+  justify-content: space-between;
+  margin-bottom: 10px;
+}
+@media screen and (max-width: 767px) {
+  .group-manage-members-pagination {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
 .group-manage-members.group-list.group-manage-requests .group-item .group-item-wrapper ul.group-member-actions {
   font-weight: normal;
 }
@@ -9885,7 +9942,7 @@ input#group-request-send {
   height: 127px;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members {
-  height: 318px;
+  height: auto;
 }
 .group-manage-members.group-list .group-item .group-item-wrapper.members .link-btn {
   margin-right: 3px;
@@ -11102,6 +11159,13 @@ input.help-search {
     margin-top: 10px;
   }
 }
+/* Private membership indicator */
+p.private-membership-indicator {
+  margin-top: 15px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #666 !important;
+}
 /**contact form**/
 .wpcf7 .wpcf7-response-output {
   border: none;
diff --git a/css/color-schemes/toolbar-blue.css b/css/color-schemes/toolbar-blue.css
index e486b1d1..d54d5190 100644
--- a/css/color-schemes/toolbar-blue.css
+++ b/css/color-schemes/toolbar-blue.css
@@ -7576,6 +7576,9 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account .ab-sub-wrapper p.actions {
   padding-top: 6px;
 }
+.oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account > .ab-item {
+  white-space: nowrap;
+}
 @media (max-width: 767px) {
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-dashboard-link a,
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-new-content a,
@@ -7637,6 +7640,7 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-login,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register {
   background: #000;
+  white-space: nowrap;
 }
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-top-logout {
diff --git a/css/color-schemes/toolbar-green.css b/css/color-schemes/toolbar-green.css
index eb711548..2e93aabc 100644
--- a/css/color-schemes/toolbar-green.css
+++ b/css/color-schemes/toolbar-green.css
@@ -7576,6 +7576,9 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account .ab-sub-wrapper p.actions {
   padding-top: 6px;
 }
+.oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account > .ab-item {
+  white-space: nowrap;
+}
 @media (max-width: 767px) {
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-dashboard-link a,
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-new-content a,
@@ -7637,6 +7640,7 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-login,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register {
   background: #000;
+  white-space: nowrap;
 }
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-top-logout {
diff --git a/css/color-schemes/toolbar-red.css b/css/color-schemes/toolbar-red.css
index 8182c59f..e2692843 100644
--- a/css/color-schemes/toolbar-red.css
+++ b/css/color-schemes/toolbar-red.css
@@ -7576,6 +7576,9 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account .ab-sub-wrapper p.actions {
   padding-top: 6px;
 }
+.oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-my-account > .ab-item {
+  white-space: nowrap;
+}
 @media (max-width: 767px) {
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-dashboard-link a,
   .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-new-content a,
@@ -7637,6 +7640,7 @@ button.oplb-bs .close {
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-login,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register {
   background: #000;
+  white-space: nowrap;
 }
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-bp-register,
 .oplb-bs #wpadminbar #wp-toolbar #wp-admin-bar-top-logout {
diff --git a/event-organiser/calendar.php b/event-organiser/calendar.php
index c4b0f3f5..6b2b9f52 100644
--- a/event-organiser/calendar.php
+++ b/event-organiser/calendar.php
@@ -33,7 +33,7 @@
 
 if ( bp_is_user() ) {
 	echo '<ul>';
-	echo '<li><a class="bpeo-ical-link" href="' . esc_attr( bp_displayed_user_domain() . bpeo_get_events_slug() ) . '/ical/" title="' . esc_html__( 'Only public events are listed in this iCalendar. Suitable for sharing.', 'bp-event-organiser' ) . '"><span class="icon"></span>' . esc_attr__( 'Download iCalendar file (Public)', 'bp-event-organiser' ) . '</a></li>';
+	echo '<li><a class="bpeo-ical-link" href="' . esc_attr( bp_displayed_user_url( bp_members_get_path_chunks( [ bpeo_get_events_slug(), 'ical' ] ) ) ) . '" title="' . esc_html__( 'Only public events are listed in this iCalendar. Suitable for sharing.', 'bp-event-organiser' ) . '"><span class="icon"></span>' . esc_attr__( 'Download iCalendar file (Public)', 'bp-event-organiser' ) . '</a></li>';
 
 	if ( bp_is_my_profile() ) {
 		echo '<li><a class="bpeo-ical-link" href="' . esc_attr( bpeo_get_the_user_private_ical_url() ) . '" title="' . esc_html__( 'Both public and private events are listed in this iCalendar.  Be mindful of who you share this with.', 'bp-event-organiser' ) . '"><span class="icon"></span>' . esc_html__( 'Download iCalendar file (Private)', 'bp-event-organiser' ) . '</a></li>';
diff --git a/functions.php b/functions.php
index befabd59..7622f403 100644
--- a/functions.php
+++ b/functions.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'OPENLAB_VERSION', '1.5.1-1704914890861' );
+define( 'OPENLAB_VERSION', '1.6.0-1723126444908' );
 
 if ( ! defined( 'CSS_DEBUG' ) ) {
 	define( 'CSS_DEBUG', false );
@@ -17,7 +17,7 @@
 // Force Legacy templates.
 add_action(
 	'after_setup_theme',
-	function() {
+	function () {
 		add_theme_support( 'buddypress-use-legacy' );
 	}
 );
@@ -223,6 +223,14 @@ function openlab_load_scripts() {
 			true
 		);
 
+		wp_register_script(
+			'openlab-avatar-privacy',
+			$stylesheet_dir_uri . '/js/avatar-privacy.js',
+			[ 'jquery' ],
+			$ver,
+			true
+		);
+
 		if ( bp_is_groups_directory() || openlab_is_search_results_page() || bp_is_members_directory() ) {
 			wp_enqueue_script( 'openlab-directory', $stylesheet_dir_uri . '/js/directory.js', [ 'jquery' ], $ver, true );
 			wp_localize_script(
@@ -233,6 +241,16 @@ function openlab_load_scripts() {
 				]
 			);
 		}
+
+		if ( bp_is_group() ) {
+			wp_enqueue_script(
+				'openlab-group-membership',
+				$stylesheet_dir_uri . '/js/membership-privacy.js',
+				[ 'jquery' ],
+				$ver,
+				true
+			);
+		}
 	}
 }
 add_action( 'wp_enqueue_scripts', 'openlab_load_scripts' );
@@ -488,7 +506,7 @@ function openlab_site_footer() {
  */
 add_action(
 	'update_option_theme_mods_' . get_option( 'stylesheet' ),
-	function() {
+	function () {
 		delete_site_transient( 'cboxol_network_footer' );
 	}
 );
diff --git a/js/avatar-privacy.js b/js/avatar-privacy.js
new file mode 100644
index 00000000..3f92c754
--- /dev/null
+++ b/js/avatar-privacy.js
@@ -0,0 +1,38 @@
+(() => {
+	document.addEventListener( 'DOMContentLoaded', function() {
+		const panelAvatarPrivacy = document.getElementById( 'panel-avatar-privacy' )
+		if ( ! panelAvatarPrivacy ) {
+			return;
+		}
+
+		const avatarPrivacyRadios = document.querySelectorAll( '.avatar-visibility-radio' );
+		if ( ! avatarPrivacyRadios ) {
+			return;
+		}
+
+		Array.from( avatarPrivacyRadios ).forEach( ( radio ) => {
+			radio.addEventListener( 'change', () => {
+				panelAvatarPrivacy.classList.add( 'loading' );
+
+				const nonce = document.getElementById( 'openlab-avatar-privacy-nonce' )?.value;
+				const userId = document.getElementById( 'avatar-privacy-user-id' )?.value;
+
+				// send to admin-ajax.php?action=openlab_avatar_privacy
+				const formData = new FormData();
+				formData.append( 'visibility', radio.value );
+				formData.append( 'nonce', nonce );
+				formData.append( 'user_id', userId );
+				formData.append( 'action', 'openlab_avatar_privacy' );
+
+				fetch( window.ajaxurl, {
+					method: 'POST',
+					body: formData,
+				} )
+				.then( response => response.json() )
+				.then( data => {
+					panelAvatarPrivacy.classList.remove( 'loading' );
+				} )
+			} )
+		} )
+	})
+})()
diff --git a/js/avatar-upload.js b/js/avatar-upload.js
index 5ee33e31..00e7f7fe 100644
--- a/js/avatar-upload.js
+++ b/js/avatar-upload.js
@@ -1,27 +1,27 @@
 window.bp = window.bp || {};
 
-(function($){
+(function ($) {
 	$( document ).ready(
-		function(){
+		function () {
 			$( '.avatar-upload-form' ).hide();
 
 			$( '#signup_submit' ).on(
 				'click',
-				function(){
+				function () {
 					window.onbeforeunload = null;
 				}
 			);
 
 			bp.Avatar.Attachment.on(
 				'change',
-				function( data ) {
+				function ( data ) {
 					$( '#avatar-wrapper img' ).attr( 'src', data.attributes.url );
 				}
 			);
 
 			bp.Uploader.filesQueue.on(
 				'reset',
-				function() {
+				function () {
 					$( '.avatar-crop-submit' ).addClass( 'btn' ).addClass( 'btn-primary' );
 				}
 			);
diff --git a/js/bpges.js b/js/bpges.js
index 8b724606..14078985 100644
--- a/js/bpges.js
+++ b/js/bpges.js
@@ -1,12 +1,12 @@
-(function($){
+(function ($) {
 	var $clicked, $statuses;
 
 	$( document ).ready(
-		function() {
+		function () {
 			$statuses = $( '.group-manage-members-bpges-status input[type="radio"]' );
 			$statuses.on(
 				'change',
-				function() {
+				function () {
 					$clicked = $( this );
 
 							go_status( 'User email status updating...', 'error' );
@@ -17,11 +17,11 @@
 						{
 							method: 'GET',
 							url: $( this ).data( 'url' ),
-							success: function() {
+							success: function () {
 								enable_radio_buttons();
 											go_status( 'User email status changed successfully', 'updated' );
 							},
-							error: function(){
+							error: function () {
 								enable_radio_buttons();
 								go_status( 'Error updating the status. Please try again or contact us for help', 'error' );
 							}
@@ -32,14 +32,14 @@
 		}
 	);
 
-	disable_radio_buttons = function() {
+	disable_radio_buttons = function () {
 		$statuses.attr( 'disabled', 'disabled' );
 	};
 
-	enable_radio_buttons = function() {
+	enable_radio_buttons = function () {
 		$statuses.removeAttr( 'disabled' );
 	};
-		go_status        = function(status, type){
+		go_status        = function (status, type) {
 
 			//clean up first
 			$( '#group-create-body .bp-template-notice' ).remove();
diff --git a/js/customizer-preview.js b/js/customizer-preview.js
index b659c0da..644fd072 100644
--- a/js/customizer-preview.js
+++ b/js/customizer-preview.js
@@ -1,6 +1,6 @@
-(function( $ ) {
+(function ( $ ) {
 	$( document ).ready(
-		function() {
+		function () {
 			var fieldMap = {
 				openlab_footer_left_heading: 'footer-left-heading',
 				openlab_footer_left_content: 'footer-left-content',
@@ -12,10 +12,10 @@
 				var elementId = fieldMap[ settingId ];
 				wp.customize(
 					settingId,
-					function( value ) {
+					function ( value ) {
 						var thisElId = elementId;
 						value.bind(
-							function( newval ) {
+							function ( newval ) {
 								document.getElementById( thisElId ).innerHTML = newval;
 							}
 						);
diff --git a/js/customizer.js b/js/customizer.js
index 38c62525..e43a8c37 100644
--- a/js/customizer.js
+++ b/js/customizer.js
@@ -3,12 +3,12 @@
 
 	wp.customize.bind(
 		'ready',
-		function() {
+		function () {
 			wp.customize(
 				'openlab_color_scheme',
-				function( setting ) {
+				function ( setting ) {
 					$( '#customize-control-openlab_color_scheme label' ).each(
-						function( index, el ) {
+						function ( index, el ) {
 							var $el         = $( el );
 							var colorScheme = $el.find( 'input' ).val();
 							$el.addClass( 'color-scheme-' + colorScheme );
@@ -21,7 +21,7 @@
 	);
 
 	$( window ).load(
-		function(){
+		function () {
 			var editorIds = [ 'openlab_footer_left_content', 'openlab_footer_middle_content' ];
 			var setChange, textarea;
 			for ( var i in editorIds ) {
@@ -41,10 +41,10 @@
 
 	$( document ).on(
 		'tinymce-editor-init',
-		function( event, editor ) {
+		function ( event, editor ) {
 			editor.on(
 				'change',
-				function(e){
+				function (e) {
 					tinyMCE.triggerSave();
 					$( '#' + editor.id ).trigger( 'change' );
 				}
diff --git a/js/directory.js b/js/directory.js
index e3ce61e6..88b0360d 100644
--- a/js/directory.js
+++ b/js/directory.js
@@ -1,12 +1,12 @@
-(function($){
+(function ($) {
 		var $groupTypeCheckboxes,
 			allSidebarFilters = [];
 
 	$( document ).ready(
-		function(){
+		function () {
 			if ( 0 !== $( '.openlab-search-results' ).length ) {
 				$( '.sidebar-filter input[type="checkbox"], .custom-select select' ).each(
-					function() {
+					function () {
 						allSidebarFilters.push( this.id );
 					}
 				);
@@ -18,12 +18,12 @@
 		}
 	);
 
-		calculateSelectedGroupTypes = function() {
+		calculateSelectedGroupTypes = function () {
 			var allGroupTypes      = [];
 			var selectedGroupTypes = [];
 
 			$groupTypeCheckboxes.each(
-				function(){
+				function () {
 					var thisGroupType = this;
 
 					allGroupTypes.push( thisGroupType.value );
@@ -43,7 +43,7 @@
 		/**
 		 * Determines whether filters should be disabled based on select group types.
 		 */
-		calculateFilterStates = function() {
+		calculateFilterStates = function () {
 			var selectedGroupTypes = calculateSelectedGroupTypes();
 			var disabledFilters    = {};
 
@@ -68,7 +68,7 @@
 			}
 
 			allSidebarFilters.forEach(
-				function( sidebarFilterId ) {
+				function ( sidebarFilterId ) {
 					var $el      = $( '#' + sidebarFilterId );
 					var $elLabel = $( 'label[for="' + sidebarFilterId + '"]' );
 
diff --git a/js/group-contact.js b/js/group-contact.js
index 65db9251..b78598c1 100644
--- a/js/group-contact.js
+++ b/js/group-contact.js
@@ -1,11 +1,11 @@
 window.wp = window.wp || {};
 
-(function($){
-	var OL_Group_Contacts = function() {
+(function ($) {
+	var OL_Group_Contacts = function () {
 		var $ac, $existing, nonce;
 
 		$( document ).ready(
-			function() {
+			function () {
 				// Toggle hide-if-js and hide-if-no-js.
 				$( '.hide-if-js' ).hide();
 				$( '.hide-if-no-js' ).show();
@@ -18,7 +18,7 @@ window.wp = window.wp || {};
 					{
 						source: ajaxurl + '?action=openlab_group_contact_autocomplete&nonce=' + nonce + '&group_id=' + group_id,
 						minLength: 2,
-						select: function( event, ui ) {
+						select: function ( event, ui ) {
 							// No dupes.
 							if ( 0 == $( '#group-contact-member-' + ui.item.value ).length ) {
 								create_list_item( ui.item.value, ui.item.label );
@@ -34,7 +34,7 @@ window.wp = window.wp || {};
 				$existing = OL_Group_Contact_Existing;
 				$.each(
 					$existing,
-					function( k, v ) {
+					function ( k, v ) {
 						create_list_item( v.value, v.label );
 					}
 				);
@@ -43,7 +43,7 @@ window.wp = window.wp || {};
 				$( '#group-contact-list' ).on(
 					'click',
 					'.group-contact-remove',
-					function( event ) {
+					function ( event ) {
 						event.preventDefault();
 						$( event.target ).closest( '.group-contact-member' ).remove();
 					}
diff --git a/js/group-create.js b/js/group-create.js
index 5411e1ea..0bbe8612 100644
--- a/js/group-create.js
+++ b/js/group-create.js
@@ -18,7 +18,7 @@ function showHide(id) {
 }
 
 jQuery( document ).ready(
-	function($){
+	function ($) {
 		var form,
 		form_type,
 		form_validated = false,
@@ -57,20 +57,20 @@ jQuery( document ).ready(
 			$( radioid ).prop( 'checked','checked' );
 
 			$( '.noo_radio' ).each(
-				function(i,v) {
+				function (i,v) {
 					var thisval = $( v ).val();
 					var thisid  = '#noo_' + thisval + '_options';
 
 					if ( noo == thisval) {
 						$( thisid ).find( 'input' ).each(
-							function(index,element){
+							function (index,element) {
 								$( element ).removeClass( 'disabled-opt' );
 								$( element ).prop( 'disabled', false ).removeClass( 'disabled' );
 							}
 						);
 
 						$( thisid ).find( 'select' ).each(
-							function(index,element){
+							function (index,element) {
 								if ($( element ).attr( 'type' ) !== 'radio') {
 									$( element ).removeClass( 'disabled-opt' );
 									$( element ).prop( 'disabled', false ).removeClass( 'disabled' );
@@ -86,7 +86,7 @@ jQuery( document ).ready(
 
 					} else {
 						$( thisid ).find( 'input' ).each(
-							function(index,element){
+							function (index,element) {
 								if ($( element ).attr( 'type' ) !== 'radio') {
 									$( element ).addClass( 'disabled-opt' );
 									$( element ).prop( 'disabled','disabled' ).addClass( 'disabled' );
@@ -95,7 +95,7 @@ jQuery( document ).ready(
 						);
 
 						$( thisid ).find( 'select' ).each(
-							function(index,element){
+							function (index,element) {
 								if ($( element ).attr( 'type' ) !== 'radio') {
 									$( element ).addClass( 'disabled-opt' );
 									$( element ).prop( 'disabled','disabled' ).addClass( 'disabled' );
@@ -173,7 +173,7 @@ jQuery( document ).ready(
 			var siteIsExternal  = ( $externalInput.length && $externalInput.is( ':checked' ) ) || ( $siteIsExternal.length && $siteIsExternal.val() > 0 );
 
 			var show = $setuptoggle.is( ':checked' ) || $( '#current-group-site' ).is( ':visible' ) || CBOXOL_Group_Create.group_type_requires_site;
-			console.log( show );
+
 			if ( show && siteIsExternal ) {
 				show = false;
 			}
@@ -204,7 +204,7 @@ jQuery( document ).ready(
 					action: 'openlab_detect_feeds',
 					'site_url': eu
 				},
-				function(response) {
+				function (response) {
 					var robj = $.parseJSON( response );
 
 					var efr = $( '#external-feed-results' );
@@ -288,7 +288,7 @@ jQuery( document ).ready(
 						action: 'openlab_group_clone_fetch_details',
 						group_id: group_id
 					},
-					success: function( response ) {
+					success: function ( response ) {
 						var r = JSON.parse( response );
 						var $typeSelector;
 
@@ -298,7 +298,7 @@ jQuery( document ).ready(
 						// Categories
 						$.each(
 							r.categories,
-							function( index, catId ) {
+							function ( index, catId ) {
 								$( 'input#group-category-' + catId ).prop( 'checked', true );
 							}
 						);
@@ -306,7 +306,7 @@ jQuery( document ).ready(
 						// Academic Units
 						$.each(
 							r.academic_unit_types,
-							function( index, unitType ) {
+							function ( index, unitType ) {
 								$typeSelector = $( '.cboxol-academic-unit-selector-for-type-' + unitType );
 
 								if ( r.academic_units.hasOwnProperty( unitType ) ) {
@@ -314,7 +314,7 @@ jQuery( document ).ready(
 
 									$.each(
 										unitsOfType,
-										function( key, unitValue ) {
+										function ( key, unitValue ) {
 											$typeSelector.find( '#academic-unit-' + unitValue ).prop( 'checked', true ).trigger( 'change' );
 										}
 									);
@@ -336,14 +336,14 @@ jQuery( document ).ready(
 		}
 
 		$( '.noo_radio' ).click(
-			function(el){
+			function (el) {
 				var whichid = $( el.target ).prop( 'id' ).split( '_' ).pop();
 				$( '.url-field-error' ).remove();
 				new_old_switch( whichid );
 			}
 		);
 
-		$.urlParam = function(name){
+		$.urlParam = function (name) {
 			var results = new RegExp( '[\\?&]' + name + '=([^&#]*)' ).exec( window.location.href );
 			return results === null ? 0 : results[1];
 		}
@@ -375,7 +375,7 @@ jQuery( document ).ready(
 
 				$create_or_clone.on(
 					'change',
-					function() {
+					function () {
 						new_create_or_clone = 'create' == $( this ).val() ? 'off' : 'on';
 						toggle_clone_options( new_create_or_clone );
 					}
@@ -386,7 +386,7 @@ jQuery( document ).ready(
 		// Switching between groups to clone
 		$( '#group-to-clone' ).on(
 			'change',
-			function() {
+			function () {
 				fetch_clone_source_details( this.value );
 			}
 		);
@@ -394,7 +394,7 @@ jQuery( document ).ready(
 		/* AJAX validation for external RSS feeds */
 		$( '#find-feeds' ).on(
 			'click',
-			function(e) {
+			function (e) {
 				e.preventDefault();
 				do_external_site_query( e );
 			}
@@ -403,7 +403,7 @@ jQuery( document ).ready(
 		/* "Set up a site" toggle */
 		$setuptoggle.on(
 			'click',
-			function(){
+			function () {
 				showHideAll();
 				showHideAssociatedSitePrivacy();
 				showHideMemberRoleSettings();
@@ -451,12 +451,12 @@ jQuery( document ).ready(
 
 		$( '.domain-validate' ).on(
 			'change',
-			function( e ) {
+			function ( e ) {
 				form_validated = false;
 			}
 		).on(
 			'keyup',
-			function( e ) {
+			function ( e ) {
 				$( e.target ).val( e.target.value.toLowerCase() );
 			}
 		);
@@ -465,7 +465,7 @@ jQuery( document ).ready(
 		// @todo this must be made dynamic
 		$gc_submit.on(
 			'mouseover focus',
-			function() {
+			function () {
 				if ( CBOXOL_Group_Create.is_course ) {
 					var school_tech        = document.getElementById( 'school_tech' );
 					var is_school_selected = $( '.school-inputs input:checked' ).length > 0;
@@ -488,7 +488,7 @@ jQuery( document ).ready(
 		 * - Site URL is validated by AJAX.
 		 * - Name and Description use native validation.
 		 */
-		validate_form = function( event ) {
+		validate_form = function ( event ) {
 			event = ( event ? event : window.event );
 
 			if ( form_validated ) {
@@ -504,7 +504,7 @@ jQuery( document ).ready(
 			var $required_fields       = $form.find( ':required' );
 			var hasEmptyRequiredFields = false;
 			$required_fields.each(
-				function( k, v ) {
+				function ( k, v ) {
 					if ( $( v ).val().trim() === '' ) {
 						hasEmptyRequiredFields = true;
 						return false;
@@ -611,7 +611,7 @@ jQuery( document ).ready(
 					action: 'openlab_validate_groupblog_url_handler',
 					'path': domain
 				},
-				function( response ) {
+				function ( response ) {
 					if ( ! response.success ) {
 						$( '.url-field-error' ).remove();
 						$( '#groupblog-url-error' ).remove();
diff --git a/js/group-documents.js b/js/group-documents.js
index b8ce7660..5e32e84a 100644
--- a/js/group-documents.js
+++ b/js/group-documents.js
@@ -1,10 +1,10 @@
-(function($){
+(function ($) {
 
 	$( document ).ready(
-		function() {
+		function () {
 			// bp-group-documents uses JS to hide, but we use CSS, so we need to roll this back.
 			setTimeout(
-				function() {
+				function () {
 					$( '#bp-group-documents-upload-new' ).css( 'display', '' );
 				},
 				250
@@ -13,7 +13,7 @@
 			$( document ).on(
 				'change',
 				'input.bp-group-documents-file-type',
-				function(e) {
+				function (e) {
 					let wrapper = $( '.bp-group-documents-fields' );
 
 					if ( $( this ).val() === 'upload' ) {
@@ -31,7 +31,7 @@
 			$( document ).on(
 				'submit',
 				'form#bp-group-documents-form',
-				function() {
+				function () {
 
 					//check for pre-filled values, and remove before sumitting
 					if ( $( 'input.bp-group-documents-new-category' ).val() == 'New Category...' ) {
@@ -56,7 +56,7 @@
 			$( document ).on(
 				'click',
 				'#bp-group-documents-upload-button',
-				function(e) {
+				function (e) {
 					e.preventDefault();
 					$( '.submenu-item' ).removeClass( 'current-menu-item' );
 					$( '.submenu-item.item-add-new-file' ).addClass( 'current-menu-item' );
@@ -68,7 +68,7 @@
 			$( document ).on(
 				'click',
 				'.submenu-item.item-add-new-file a',
-				function(e) {
+				function (e) {
 					e.preventDefault();
 					if ( ! $( this ).hasClass( 'current-menu-item' ) ) {
 						$( '.submenu-item' ).removeClass( 'current-menu-item' );
@@ -82,7 +82,7 @@
 			$( document ).on(
 				'click',
 				'#btn-group-documents-cancel',
-				function(e) {
+				function (e) {
 					e.preventDefault();
 					$( '#bp-group-documents' ).removeClass( 'is-edit-mode' );
 					$( '.submenu-item' ).removeClass( 'current-menu-item' );
@@ -94,7 +94,7 @@
 			$( document ).on(
 				'click',
 				'#openlab-cancel-doc-reply',
-				function(e) {
+				function (e) {
 					e.preventDefault();
 					$( '#cancel-comment-reply-link' )[0].click();
 				}
diff --git a/js/group-url.js b/js/group-url.js
index cf8fa0cf..d5c789b8 100644
--- a/js/group-url.js
+++ b/js/group-url.js
@@ -1,9 +1,9 @@
-(function($){
+(function ($) {
 	var $errorFormat, $errorTaken, $nameField, $urlField, $urlFieldParent;
 	var isValid, isTaken;
 
 	$( document ).ready(
-		function(){
+		function () {
 			isValid         = isAvailable = false;
 			$ajaxStatus     = $( '#group-url-status' );
 			$errorFormat    = $( '#url-error-format' );
@@ -15,7 +15,7 @@
 			// Suggest based on name.
 			$nameField.on(
 				'blur',
-				function() {
+				function () {
 					// Don't bother with AJAX request, which is likely to be too slow for next field.
 					if ( 0 === $urlField.val().length ) {
 						var suggestedUrl = $nameField.val()
@@ -33,7 +33,7 @@
 			// Format validation on keyup.
 			$urlField.on(
 				'keyup',
-				function() {
+				function () {
 					var url = $urlField.val();
 
 					// Force URL to lowercase.
@@ -59,7 +59,7 @@
 			// Only run the AJAX request on blur.
 			$urlField.on(
 				'blur',
-				function() {
+				function () {
 					// No value? Nothing to check.
 					if ( 0 === $urlField.val().length ) {
 						return;
@@ -81,7 +81,7 @@
 								name: $( 'group-name' ).val(),
 								url: $urlField.val()
 							},
-							success: function( response ) {
+							success: function ( response ) {
 								$urlFieldParent.removeClass( 'ajax-in-progress' );
 								$ajaxStatus.removeClass( 'fa-spinner fa-pulse' );
 								if ( response.success ) {
@@ -98,7 +98,7 @@
 				}
 			);
 
-			var toggleError = function() {
+			var toggleError = function () {
 				if ( isAvailable && isValid ) {
 					$urlFieldParent.removeClass( 'has-error' ).removeClass( 'ajax-error' );
 					$ajaxStatus.addClass( 'fa-check' ).removeClass( 'fa-exclamation-circle' );
diff --git a/js/membership-privacy.js b/js/membership-privacy.js
new file mode 100644
index 00000000..24aadb70
--- /dev/null
+++ b/js/membership-privacy.js
@@ -0,0 +1,40 @@
+/**
+ * This is the JavaScript related to the membership privacy functionality.
+ *
+ * @since 1.6.0
+ */
+jQuery( document ).ready(
+	function ($) {
+		$( document ).on(
+			'change',
+			'input#membership_privacy',
+			function (e) {
+				let groupId   = $( this ).attr( 'data-group_id' );
+				let isPrivate = $( this ).is( ':checked' );
+
+				$.ajax(
+					{
+						url: ajaxurl,
+						method: 'POST',
+						dataType: 'json',
+						data: {
+							'action': 'openlab_update_member_group_privacy',
+							'group_id': groupId,
+							'is_private': isPrivate,
+							'nonce': $( '#openlab_hide_membership_nonce_' + groupId ).val()
+						},
+						beforeSend: function () {
+							// Disable checkbox
+							$( 'input#membership_privacy' ).attr( 'disabled', true );
+						},
+						complete: function () {
+							// Enable checkbox
+							$( 'input#membership_privacy' ).attr( 'disabled', false );
+						}
+					}
+				);
+			}
+		);
+	},
+	(jQuery)
+);
diff --git a/js/register.js b/js/register.js
index 319f953f..e68abe43 100644
--- a/js/register.js
+++ b/js/register.js
@@ -1,10 +1,10 @@
-(function($) {
+(function ($) {
 
 	// Parsley validation rules.
 	window.Parsley.addValidator(
 		'lowercase',
 		{
-			validateString: function( value ) {
+			validateString: function ( value ) {
 				return value === value.toLowerCase();
 			},
 			messages: {
@@ -16,7 +16,7 @@
 	window.Parsley.addValidator(
 		'nospecialchars',
 		{
-			validateString: function( value ) {
+			validateString: function ( value ) {
 				return ! value.match( /[^a-zA-Z0-9]/ );
 			},
 			messages: {
@@ -29,7 +29,7 @@
 	window.Parsley.addValidator(
 		'iff',
 		{
-			validateString: function( value, requirement, instance ) {
+			validateString: function ( value, requirement, instance ) {
 				var $partner = $( requirement );
 				var isValid  = $partner.val() == value;
 
@@ -62,7 +62,7 @@
 	}
 
 	jQuery( document ).ready(
-		function() {
+		function () {
 			var $signup_form = $( '#signup_form' );
 
 			$signup_form.parsley(
@@ -71,7 +71,7 @@
 				}
 			).on(
 				'field:error',
-				function( formInstance ) {
+				function ( formInstance ) {
 					this.$element.parent( '.form-group' )
 					.addClass( 'has-error' )
 					.prepend( '<span class="sr-only">Please enter the following: </span>' )
@@ -79,7 +79,7 @@
 				}
 			).on(
 				'field:success',
-				function( formInstance ) {
+				function ( formInstance ) {
 					this.$element.parent( '.form-group' ).removeClass( 'has-error' );
 				}
 			);
@@ -93,7 +93,7 @@
 			$( 'body' ).on(
 				'keyup',
 				'#signup_password',
-				function( e ) {
+				function ( e ) {
 					var blacklistValues = [];
 					var denylistLength  = inputDenylist.length
 					for ( var i = 0; i < denylistLength; i++ ) {
@@ -156,7 +156,7 @@
 							action: 'openlab_validate_email',
 							'email': email
 						},
-						function( response ) {
+						function ( response ) {
 							if ( response.success ) {
 								$emaillabel.fadeOut(
 									function () {
@@ -202,7 +202,7 @@
 
 			$account_type_signup_code_field.on(
 				'blur',
-				function() {
+				function () {
 					$signup_code_message
 					.html( OLReg.strings.dashChecking )
 					.removeClass( 'signup-code-ok signup-code-bad' )
@@ -216,7 +216,7 @@
 								member_type: $account_type_field.val(),
 								code: $account_type_signup_code_field.val()
 							},
-							success: function( response ) {
+							success: function ( response ) {
 								if ( response.success ) {
 									$signup_code_message.html( OLReg.strings.dashOK )
 									.removeClass( 'signup-code-checking signup-code-bad' )
@@ -271,7 +271,7 @@
 				if (document.getElementById( 'signup_submit' )) {
 					$( '#signup_submit' ).on(
 						'click',
-						function(e){
+						function (e) {
 
 							var thisElem = $( this );
 
@@ -323,7 +323,7 @@
 			function refresh_field_ids() {
 				field_ids = [];
 				$( '.panel-body input' ).each(
-					function() {
+					function () {
 						if ( 'field_' === this.id.substr( 0, 6 ) ) {
 							field_ids.push( this.id.substr( 6 ) );
 						}
diff --git a/js/utility.js b/js/utility.js
index 96998fb8..bc4de434 100644
--- a/js/utility.js
+++ b/js/utility.js
@@ -23,6 +23,9 @@
 			OpenLab.utility.eventValidation();
 			OpenLab.utility.refreshActivity();
 			OpenLab.utility.initMemberRoleDefinitions();
+			OpenLab.utility.adjustGridHeight();
+			OpenLab.utility.initClickableCards();
+			OpenLab.utility.initPortfolioProfileLinkToggle();
 
 						// Home page column adjustments.
 						var groupTypeWidgets = $( '#home-right .activity-list' );
@@ -235,7 +238,7 @@
 
 			return partOfDay + hours + minutes / 60;
 		},
-		buildTime: function( date, time ) {
+		buildTime: function ( date, time ) {
 			var d         = new Date();
 			var dateParts = date.split( '-' );
 			d.setFullYear( dateParts[2] );
@@ -418,8 +421,7 @@
 								action: 'openlab_ajax_return_latest_activity',
 								nonce: localVars.nonce
 							},
-							success: function (data, textStatus, XMLHttpRequest)
-						{
+							success: function (data, textStatus, XMLHttpRequest) {
 								refreshActivity.removeClass( 'fa-spin' );
 								if (data === 'exit') {
 									//for right now, do nothing
@@ -457,22 +459,22 @@
 
 			$( '.academic-unit-type-select' ).on(
 				'select2:select',
-				function() {
+				function () {
 					OpenLab.utility.updateAcademicUnitFilters();
 				}
 			);
 			OpenLab.utility.updateAcademicUnitFilters();
 		},
 
-		updateAcademicUnitFilters: function() {
+		updateAcademicUnitFilters: function () {
 			var selectedSlugs  = [];
 			var $selectedUnits = $( '.academic-unit:selected' );
 			$selectedUnits.each(
-				function( k, v ) {
+				function ( k, v ) {
 					if ( v.value.length > 0 ) {
 						if ( 'all' === v.value ) {
 							$( v ).siblings( '.academic-unit-nonempty' ).each(
-								function( k, v ) {
+								function ( k, v ) {
 									selectedSlugs.push( v.value );
 								}
 							);
@@ -488,7 +490,7 @@
 			$academicUnits.prop( 'disabled', true ).removeClass( 'academic-unit-enabled' );
 
 			$academicUnits.each(
-				function( k, v ) {
+				function ( k, v ) {
 					var $thisFilter = $( v );
 					var thisParent  = $thisFilter.data( 'parent' );
 
@@ -512,7 +514,7 @@
 			var $academicUnitSelectors = $( '.academic-unit-type-select select' );
 			$academicUnitSelectors.prop( 'disabled', false );
 			$academicUnitSelectors.each(
-				function( k, v ) {
+				function ( k, v ) {
 					if ( $( v ).find( '.academic-unit-enabled' ).length === 0 ) {
 						$( v ).prop( 'disabled', true );
 					}
@@ -526,10 +528,10 @@
 			}
 		},
 
-		initMemberRoleDefinitions: function() {
+		initMemberRoleDefinitions: function () {
 			$( '.member-role-definition-label' ).on(
 				'click',
-				function( e ) {
+				function ( e ) {
 					$clicked = $( e.target );
 					$def     = $clicked.closest( '.member-role-definition' );
 
@@ -539,6 +541,133 @@
 			);
 		},
 
+		/**
+		 * Until we can refactor the markup to use CSS grid, we need to adjust the height of
+		 * certain elements that appear in a grid.
+		 *
+		 * @since 1.6.0
+		 */
+		adjustGridHeight: function () {
+			const els = [
+				document.querySelector( '#group-manage-members' ),
+			]
+
+			els.forEach(
+				// phpcs:disable
+				el => {
+					if ( ! el ) {
+						return;
+					}
+
+					const gridItems = el.querySelectorAll( '.group-item-wrapper' );
+
+					// Find the tallest item.
+					let tallest  = 0;
+					gridItems.forEach(
+						item => {
+							const height = item.offsetHeight;
+							if ( height > tallest ) {
+								tallest = height;
+							}
+						}
+					);
+
+					// Set the height of all items to the tallest.
+					gridItems.forEach(
+						item => {
+							item.style.height = tallest + 'px';
+						}
+					);
+				}
+				// phpcs:enable
+			)
+		},
+
+		/**
+		 * Initialize clickable cards.
+		 *
+		 * @since 1.6.0
+		 *
+		 * @return {void}
+		 */
+		initClickableCards: function() {
+			const cards = document.querySelectorAll('.clickable-card');
+
+			Array.prototype.forEach.call(cards, card => {
+				let down, up;
+				const link = card.querySelector('.item-title a');
+
+				card.onmouseenter = (event) => card.classList.add('card-is-hovered')
+				card.onmouseleave = (event) => card.classList.remove('card-is-hovered')
+
+				card.onmousedown = () => down = +new Date();
+				card.onmouseup = (e) => {
+					let rightclick = false;
+
+					// Old Netscape.
+					if (e.which && e.which === 3) {
+						rightclick = true;
+
+					// Microsoft or W3C model.
+					} else if (e.button && e.button === 2) {
+						rightclick = true;
+					}
+
+					if (rightclick) {
+						return;
+					}
+
+					up = +new Date();
+					if ((up - down) < 200) {
+						link.click();
+					}
+				}
+
+				card.style.cursor = 'pointer';
+			});
+		},
+
+		/**
+		 * Initialize the portfolio profile link toggle.
+		 *
+		 * @since 1.6.0
+		 * @return {void}
+		 */
+		initPortfolioProfileLinkToggle: function() {
+			const toggleNodes = document.querySelectorAll('.portfolio-profile-link-toggle-checkbox');
+
+			if (toggleNodes.length > 0) {
+				const toggles = Array.from(toggleNodes);
+				toggles.forEach(toggle => {
+					toggle.addEventListener('change', (e) => {
+						const isChecked = toggle.checked;
+
+						const toggleNonce = document.getElementById( 'openlab_portfolio_link_visibility_nonce_' + toggle.dataset.counter );
+
+						if ( ! toggleNonce ) {
+							return;
+						}
+
+						const nonce = toggleNonce.value;
+
+						const url = ajaxurl + '?action=openlab_portfolio_link_visibility&nonce=' + nonce + '&state=' + ( isChecked ? 'enabled' : 'disabled' );
+
+						toggle.closest( '.portfolio-profile-link-toggle-wrapper' ).classList.add( 'loading' );
+						toggle.disabled = true;
+
+						fetch(url, {
+							method: 'GET',
+						})
+						.then(response => response.json())
+						.then(data => {
+							toggle.closest( '.portfolio-profile-link-toggle-wrapper' ).classList.remove( 'loading' );
+							toggle.disabled = false;
+						})
+					});
+				})
+			}
+		},
+
 		filterAjax: function () {
 
 			//safety first
@@ -576,8 +705,7 @@
 								school: school,
 								nonce: nonce
 							},
-							success: function (data, textStatus, XMLHttpRequest)
-						{
+							success: function (data, textStatus, XMLHttpRequest) {
 								console.log( 'school', school );
 								$( '#dept-select' ).removeAttr( 'disabled' );
 								$( '#dept-select' ).removeClass( 'processing' );
@@ -603,6 +731,9 @@
 	$( document ).ready(
 		function () {
 
+			// Add js class to body.
+			$( 'body' ).addClass( 'js' );
+
 			OpenLab.utility.init();
 
 			// Workshop fields on Contact Us
@@ -755,7 +886,7 @@
 
 			$( '#bp-group-documents-folder-delete' ).on(
 				'click',
-				function( e ){
+				function ( e ) {
 					if ( confirm( localVars.strings.deleteFolder ) ) {
 						return true;
 					}
@@ -967,7 +1098,7 @@
 
 	$( '#openlab-sort-my-groups' ).on(
 		'change',
-		function( event ) {
+		function ( event ) {
 			var url    = new URL( window.location.href );
 			var params = new window.URLSearchParams( window.location.search );
 
diff --git a/less/openlab-toolbar.less b/less/openlab-toolbar.less
index d5464295..fe2af8b4 100644
--- a/less/openlab-toolbar.less
+++ b/less/openlab-toolbar.less
@@ -456,6 +456,10 @@
 						}
 					}
 				}
+
+				& > .ab-item {
+					white-space: nowrap;
+				}
             }
             #wp-admin-bar-dashboard-link,
             #wp-admin-bar-new-content,
@@ -509,6 +513,7 @@
             #wp-admin-bar-bp-login,
             #wp-admin-bar-bp-register{
                 background: #000;
+				white-space: nowrap;
             }
             #wp-admin-bar-bp-register,
             #wp-admin-bar-top-logout{
diff --git a/lib/class-openlab-breadcrumb.php b/lib/class-openlab-breadcrumb.php
index 9ef78ac1..3342ffc6 100644
--- a/lib/class-openlab-breadcrumb.php
+++ b/lib/class-openlab-breadcrumb.php
@@ -419,5 +419,4 @@ public function get_breadcrumb_link( $url, $title, $content, $sep = false ) {
 
 		return $link;
 	}
-
 }
diff --git a/lib/class-openlab-clone-course-site.php b/lib/class-openlab-clone-course-site.php
index adb1f09f..b9cbde2e 100644
--- a/lib/class-openlab-clone-course-site.php
+++ b/lib/class-openlab-clone-course-site.php
@@ -109,7 +109,7 @@ protected function migrate_site_settings() {
 		$mods  = get_option( 'mods_' . $theme );
 		$mods  = map_deep(
 			$mods,
-			function( $v ) use ( $source_site_url, $source_site_upload_dir, $dest_site_url, $dest_site_upload_dir ) {
+			function ( $v ) use ( $source_site_url, $source_site_upload_dir, $dest_site_url, $dest_site_upload_dir ) {
 				return str_replace(
 					array( $source_site_url, $source_site_upload_dir ),
 					array( $dest_site_url, $dest_site_upload_dir ),
@@ -126,7 +126,7 @@ function( $v ) use ( $source_site_url, $source_site_upload_dir, $dest_site_url,
 			if ( ! in_array( $key, $preserve_option, true ) ) {
 				$value = map_deep(
 					$value,
-					function( $v ) use ( $source_site_url, $source_site_upload_dir, $dest_site_url, $dest_site_upload_dir ) {
+					function ( $v ) use ( $source_site_url, $source_site_upload_dir, $dest_site_url, $dest_site_upload_dir ) {
 						return str_replace(
 							array( $source_site_url, $source_site_upload_dir ),
 							array( $dest_site_url, $dest_site_upload_dir ),
diff --git a/lib/course-clone.php b/lib/course-clone.php
index 422d8bfa..4de6cbf9 100644
--- a/lib/course-clone.php
+++ b/lib/course-clone.php
@@ -259,7 +259,7 @@ function openlab_group_clone_details( $group_id ) {
 
 		$retval['site_id']   = cboxol_get_group_site_id( $group_id );
 		$retval['site_url']  = get_blog_option( $retval['site_id'], 'home' );
-		$retval['site_path'] = str_replace( bp_get_root_domain(), '', $retval['site_url'] );
+		$retval['site_path'] = str_replace( bp_get_root_url(), '', $retval['site_url'] );
 
 		$retval['term'] = openlab_get_group_term( $group_id );
 	}
@@ -386,7 +386,7 @@ function openlab_add_clone_button_to_profile() {
  */
 add_filter(
 	'bp_before_groups_get_groups_parse_args',
-	function( $args ) {
+	function ( $args ) {
 		$group_id = openlab_get_current_filter( 'descendant-of' );
 		if ( ! $group_id ) {
 			return $args;
diff --git a/lib/group-funcs.php b/lib/group-funcs.php
index f4c42553..5649913d 100644
--- a/lib/group-funcs.php
+++ b/lib/group-funcs.php
@@ -142,6 +142,8 @@ function openlab_group_site_markup() {
 		}
 	}
 
+	$is_clone_create = $is_clone && bp_is_group_create();
+
 	?>
 
 	<div class="ct-group-meta">
@@ -217,12 +219,7 @@ function openlab_group_site_markup() {
 					}
 					$user_blogs = array_values( $user_blogs );
 
-					if ( $group_type->get_is_portfolio() ) {
-						$portfolio_user_id = openlab_get_user_id_from_portfolio_group_id( $the_group_id );
-						$suggested_path    = openlab_suggest_portfolio_path( $portfolio_user_id );
-					} else {
-						$suggested_path = groups_get_current_group()->slug;
-					}
+					$suggested_path = groups_get_current_group()->slug;
 
 					?>
 					<style type="text/css">
@@ -287,7 +284,7 @@ function openlab_group_site_markup() {
 								</div><!-- /#wds-website-clone -->
 							<?php endif; ?>
 
-							<?php if ( ! $is_clone ) : ?>
+							<?php if ( ! $is_clone_create ) : ?>
 								<div id="wds-website" class="form-field form-required">
 									<div id="noo_new_options">
 										<div id="noo_new_options-div" class="row">
@@ -318,7 +315,7 @@ function openlab_group_site_markup() {
 								</div><!-- #wds-website -->
 							<?php endif; ?>
 
-							<?php if ( ! $is_clone ) : ?>
+							<?php if ( ! $is_clone_create ) : ?>
 								<?php /* Existing blogs - only display if some are available */ ?>
 								<?php
 								// Exclude blogs already used as groupblogs
@@ -580,6 +577,19 @@ function openlab_group_site_privacy_settings_markup() {
 		</div>
 
 		<?php wp_nonce_field( 'openlab_site_status', 'openlab-site-status-nonce', false ); ?>
+
+		<?php if ( bp_is_group_create() && cboxol_is_portfolio() ) : ?>
+			<div class="panel panel-default">
+				<div class="panel-heading semibold"><?php esc_html_e( 'Portfolio Link on my Profile', 'commons-in-a-box' ); ?></div>
+				<div class="panel-body">
+					<p><?php esc_html_e( 'You can choose to show a link to your Portfolio on your Profile page by checking the box below.', 'commons-in-a-box' ); ?></p>
+
+					<input name="portfolio-profile-link" id="portfolio-profile-link-toggle" type="checkbox" name="portfolio-profile-link-toggle" value="1" /> <label for="portfolio-profile-link-toggle"><?php esc_html_e( 'Show link to my Portfolio on my public Profile', 'commons-in-a-box' ); ?></label>
+				</div>
+
+				<?php wp_nonce_field( 'openlab_portfolio_profile_link', 'openlab-portfolio-profile-link-nonce', false ); ?>
+			</div>
+		<?php endif; ?>
 	<?php
 }
 
@@ -612,7 +622,7 @@ function openlab_group_url_markup() {
 
 			<div class="group-url-fields">
 				<span class="group-url-domain">
-					<?php bp_root_domain(); ?>/<?php echo esc_html( bp_get_groups_root_slug() ); ?>/
+					<?php echo esc_html( trailingslashit( bp_get_groups_directory_url() ) ); ?>
 				</span>
 
 				<div class="group-url-path">
@@ -952,27 +962,33 @@ function openlab_save_group_site() {
  * Catches and processes group site privacy settings.
  */
 function openlab_save_group_site_settings() {
-	if ( ! isset( $_POST['openlab-site-status-nonce'] ) ) {
-		return;
-	}
+	$group = groups_get_current_group();
 
-	check_admin_referer( 'openlab_site_status', 'openlab-site-status-nonce' );
+	if ( isset( $_POST['openlab-site-status-nonce'] ) ) {
+		check_admin_referer( 'openlab_site_status', 'openlab-site-status-nonce' );
 
-	$group = groups_get_current_group();
+		// blog_public
+		if ( isset( $_POST['blog_public'] ) ) {
+			$blog_public = (float) $_POST['blog_public'];
 
-	if ( ! isset( $_POST['blog_public'] ) ) {
-		return;
+			$site_id = cboxol_get_group_site_id( $group->id );
+			if ( $site_id ) {
+				update_blog_option( $site_id, 'blog_public', $blog_public );
+				groups_update_groupmeta( $group->id, 'blog_public', $blog_public );
+			}
+		}
 	}
 
-	$blog_public = (float) $_POST['blog_public'];
+	// Portfolio profile link
+	if ( isset( $_POST['openlab-portfolio-profile-link-nonce'] ) ) {
+		check_admin_referer( 'openlab_portfolio_profile_link', 'openlab-portfolio-profile-link-nonce' );
 
-	$site_id = cboxol_get_group_site_id( $group->id );
-	if ( ! $site_id ) {
-		return;
-	}
+		$portfolio_user_id = openlab_get_user_id_from_portfolio_group_id( $group->id );
+
+		$show_portfolio_link = ! empty( $_POST['portfolio-profile-link'] );
 
-	update_blog_option( $site_id, 'blog_public', $blog_public );
-	groups_update_groupmeta( $group->id, 'blog_public', $blog_public );
+		openlab_save_show_portfolio_link_on_user_profile( $portfolio_user_id, $show_portfolio_link );
+	}
 }
 
 /**
@@ -1231,7 +1247,7 @@ function openlab_forum_pagination() {
  * After portfolio delete, redirect to user profile page
  */
 function openlab_delete_group() {
-	bp_core_redirect( bp_loggedin_user_domain() );
+	bp_core_redirect( bp_loggedin_user_url() );
 }
 
 // a variation on bp_groups_pagination_count() to match design
@@ -1550,7 +1566,7 @@ function openlab_default_subscription_settings_form() {
 }
 add_action(
 	'bp_actions',
-	function() {
+	function () {
 		remove_action( 'bp_after_group_settings_admin', 'ass_default_subscription_settings_form' );
 		add_action( 'bp_after_group_settings_admin', 'openlab_default_subscription_settings_form' );
 	}
@@ -1776,13 +1792,23 @@ function openlab_show_site_posts_and_comments() {
 
 	switch ( $site_type ) {
 		case 'local':
+			if ( current_user_can( 'view_private_members_of_group', $group_id ) ) {
+				$group_private_members = [];
+				$post__not_in          = [];
+			} else {
+				$group_private_members = openlab_get_private_members_of_group( $group_id );
+				$post__not_in          = openlab_get_invisible_post_ids( $site_id );
+			}
+
 			switch_to_blog( $site_id );
 
 			// Set up posts
 			$wp_posts = get_posts(
-				array(
+				[
 					'posts_per_page' => 3,
-				)
+					'author__not_in' => $group_private_members,
+					'post__not_in'   => $post__not_in,
+				]
 			);
 
 			foreach ( $wp_posts as $wp_post ) {
@@ -1801,9 +1827,10 @@ function openlab_show_site_posts_and_comments() {
 
 			// Set up comments
 			$comment_args = [
-				'status'     => 'approve',
-				'number'     => 3,
-				'meta_query' => [
+				'status'         => 'approve',
+				'number'         => 3,
+				'author__not_in' => $group_private_members,
+				'meta_query'     => [
 					'relation' => 'AND',
 					[
 						'relation' => 'OR',
@@ -1830,6 +1857,11 @@ function openlab_show_site_posts_and_comments() {
 				],
 			];
 
+			$private_posts_for_current_user = openlab_get_invisible_post_ids( $site_id );
+			if ( $private_posts_for_current_user ) {
+				$comment_args['post__not_in'] = $private_posts_for_current_user;
+			}
+
 			// This isn't official argument just a custom flag.
 			// Used by `openlab_private_comments_fallback()`.
 			$comment_args['main_site'] = true;
@@ -1931,7 +1963,7 @@ function openlab_show_site_posts_and_comments() {
  */
 function openlab_output_group_contact_line( $group_id ) {
 	$names = array_map(
-		function( $user_id ) {
+		function ( $user_id ) {
 			return bp_core_get_user_displayname( $user_id );
 		},
 		cboxol_get_all_group_contact_ids( $group_id )
@@ -2137,7 +2169,7 @@ function openlab_get_faculty_list( $group_id = null ) {
 	foreach ( $faculty_ids as $id ) {
 		$faculty_link = sprintf(
 			'<a href="%s">%s</a>',
-			esc_url( bp_core_get_user_domain( $id ) ),
+			esc_url( bp_members_get_user_url( $id ) ),
 			esc_html( bp_core_get_user_displayname( $id ) )
 		);
 		array_push( $faculty, $faculty_link );
@@ -2748,6 +2780,29 @@ function openlab_get_active_terms() {
 	return $options;
 }
 
+/**
+ * Saves 'Portfolio profile link' setting on group edit.
+ *
+ * @since 1.6.0
+ *
+ * @param int $group_id ID of the group.
+ * @return void
+ */
+function openlab_group_save_portfolio_profile_link_setting_on_group_edit( $group_id ) {
+	if ( ! isset( $_POST['portfolio-profile-link-nonce'] ) ) {
+		return;
+	}
+
+	check_admin_referer( 'portfolio_profile_link', 'portfolio-profile-link-nonce' );
+
+	$enabled = ! empty( $_POST['portfolio-profile-link'] );
+
+	$portfolio_user_id = openlab_get_user_id_from_portfolio_group_id( $group_id );
+
+	openlab_save_show_portfolio_link_on_user_profile( $portfolio_user_id, $enabled );
+}
+add_action( 'groups_group_details_edited', 'openlab_group_save_portfolio_profile_link_setting_on_group_edit' );
+
 /**
  * Modify group-related template messages to remove the word 'group'.
  *
@@ -2944,7 +2999,7 @@ function openlab_group_is_open( $group_id ) {
  */
 add_filter(
 	'bp_before_groups_get_groups_parse_args',
-	function( $args ) {
+	function ( $args ) {
 		$is_open = openlab_get_current_filter( 'is_open' );
 		if ( $is_open ) {
 			$args['status'] = 'public';
@@ -2983,7 +3038,7 @@ function openlab_notify_group_members_of_this_action() {
  */
 add_filter(
 	'openlab_after_group_clone',
-	function( $group_id, $clone_source_group_id ) {
+	function ( $group_id, $clone_source_group_id ) {
 		if ( openlab_is_forum_enabled_for_group( $clone_source_group_id ) ) {
 			groups_delete_groupmeta( $group_id, 'openlab_disable_forum' );
 		} else {
@@ -3008,3 +3063,22 @@ function( $group_id, $clone_source_group_id ) {
 	20,
 	2
 );
+
+/**
+ * Custom 'joined since' text for group members.
+ *
+ * @since 1.6.0
+ *
+ * @return string
+ */
+function openlab_group_member_joined_since() {
+	global $members_template;
+
+	echo esc_html(
+		sprintf(
+			// translators: %s is the date the member joined the group.
+			__( 'joined %s', 'commons-in-a-box' ),
+			gmdate( 'F j, Y', strtotime( $members_template->member->date_modified ) )
+		)
+	);
+}
diff --git a/lib/media-funcs.php b/lib/media-funcs.php
index c64853eb..413b4cb2 100644
--- a/lib/media-funcs.php
+++ b/lib/media-funcs.php
@@ -46,13 +46,13 @@ function openlab_get_home_slider() {
  */
 add_filter(
 	'bp_core_avatar_full_width',
-	function() {
+	function () {
 		return 225;
 	}
 );
 add_filter(
 	'bp_core_avatar_full_height',
-	function() {
+	function () {
 		return 225;
 	}
 );
@@ -139,6 +139,36 @@ function openlab_whats_happening_activity_items() {
 
 		$a      = bp_activity_get( $activity_args );
 		$cached = $a['activities'];
+
+		// Post-query filter to ensure that no "invisible" post items are included.
+		$cached = array_filter(
+			$cached,
+			function ( $activity ) {
+				if ( 'groups' !== $activity->component ) {
+					return true;
+				}
+
+				if ( 'new_blog_post' !== $activity->type && 'new_blog_comment' !== $activity->type ) {
+					return true;
+				}
+
+				$site_id = openlab_get_site_id_by_group_id( $activity->item_id );
+
+				$invisible_post_ids = openlab_get_invisible_post_ids( $site_id );
+
+				if ( 'new_blog_post' === $activity->type ) {
+					$post_id = $activity->secondary_item_id;
+				} else {
+					switch_to_blog( $site_id );
+					$comment = get_comment( $activity->secondary_item_id );
+					$post_id = (int) $comment->comment_post_ID;
+					restore_current_blog();
+				}
+
+				return ! in_array( $post_id, $invisible_post_ids, true );
+			}
+		);
+
 		wp_cache_set( 'whats_happening_items', $cached, 'openlab' );
 	}
 
@@ -162,7 +192,11 @@ function openlab_invalidate_whats_happening_cache( $args ) {
  */
 function openlab_embeds_make_responsive( $retval ) {
 	// If not an iframe, object or embed, bail.
-	if ( empty( $retval ) || false === strpos( $retval, '<iframe ' ) && false === strpos( $retval, '<object ' ) && false === strpos( $retval, '<embed ' ) ) {
+	if ( empty( $retval ) ) {
+		return $retval;
+	}
+
+	if ( false === strpos( $retval, '<iframe ' ) && false === strpos( $retval, '<object ' ) && false === strpos( $retval, '<embed ' ) ) {
 		return $retval;
 	}
 
diff --git a/lib/member-funcs.php b/lib/member-funcs.php
index c2e5778a..99154ffe 100644
--- a/lib/member-funcs.php
+++ b/lib/member-funcs.php
@@ -119,7 +119,7 @@ function openlab_list_members() {
 			$user_avatar = bp_core_fetch_avatar(
 				array(
 					'item_id' => bp_get_member_user_id(),
-					'object'  => 'member',
+					'object'  => 'user',
 					'type'    => 'full',
 					'html'    => false,
 				)
@@ -387,13 +387,23 @@ function openlab_profile_group_type_activity_block( \CBOX\OL\GroupType $type ) {
 		'per_page'    => 20,
 	);
 
+	$exclude_groups = [];
+	$private_groups = openlab_get_user_private_memberships( bp_displayed_user_id() );
+
+	// Exclude private groups if not current user's profile or don't have moderate access.
+	if ( ! bp_is_my_profile() && ! current_user_can( 'bp_moderate' ) ) {
+		$exclude_groups += $private_groups;
+	}
+
+	$group_args['exclude'] = $exclude_groups;
+
 	$title = $type->get_label( 'plural' );
 
 	if ( bp_has_groups( $group_args ) ) {
 		?>
 		<div id="<?php echo esc_attr( $type->get_slug() ); ?>-activity-stream" class="<?php echo esc_attr( $type->get_slug() ); ?>-list activity-list item-list col-sm-8 col-xs-12">
 			<?php
-			$href = add_query_arg( 'group_type', $type->get_slug(), bp_displayed_user_domain() . 'groups/' );
+			$href = add_query_arg( 'group_type', $type->get_slug(), bp_displayed_user_url( bp_members_get_path_chunks( [ bp_get_groups_slug() ] ) ) );
 			$x    = 0;
 			?>
 			<?php /* @todo font awesome is loaded from openlab-toolbar.php */ ?>
@@ -821,3 +831,69 @@ function openlab_mirror_default_avatar( $value ) {
 	return $value;
 }
 add_filter( 'pre_set_theme_mod_openlab_default_avatar', 'openlab_mirror_default_avatar' );
+
+/**
+ * AJAX callback for toggling group membership privacy.
+ *
+ * @since 1.6.0
+ *
+ * @return void
+ */
+function openlab_ajax_toggle_group_membership_privacy() {
+	$retval = [
+		'success' => false,
+		'message' => '',
+	];
+
+	// Use the group ID from the POST data.
+	if ( ! isset( $_POST['group_id'] ) ) {
+		$retval['message'] = __( 'Group ID is missing.', 'commons-in-a-box' );
+		wp_send_json( $retval );
+	}
+
+	$user_id  = bp_loggedin_user_id();
+	$group_id = (int) $_POST['group_id'];
+
+	if ( ! wp_verify_nonce( $_POST['nonce'], 'openlab_hide_membership_' . $group_id ) ) {
+		wp_send_json( $retval );
+	}
+
+	$is_private = isset( $_POST['is_private'] ) ? 'true' === $_POST['is_private'] : false;
+
+	$updated = openlab_update_group_membership_privacy( $user_id, $group_id, $is_private );
+
+	if ( $updated ) {
+		$retval['success'] = true;
+		$retval['message'] = $is_private ? __( 'User membership set to private', 'commons-in-a-box' ) : __( 'User membership set to public', 'commons-in-a-box' );
+	} else {
+		$retval['message'] = __( 'There was an error updating membership privacy.', 'commons-in-a-box' );
+	}
+
+	wp_send_json( $retval );
+}
+add_action( 'wp_ajax_openlab_update_member_group_privacy', 'openlab_ajax_toggle_group_membership_privacy' );
+
+/**
+ * AJAX callback for 'openlab_portfolio_link_visibility'.
+ *
+ * @since 1.6.0
+ *
+ * @return void
+ */
+function openlab_portfolio_link_visibility_ajax_cb() {
+	$verified = wp_verify_nonce( $_GET['nonce'], 'openlab_portfolio_link_visibility' );
+
+	if ( ! $verified ) {
+		wp_send_json_error( 'Invalid nonce' );
+	}
+
+	if ( ! is_user_logged_in() ) {
+		wp_send_json_error( 'Not logged in' );
+	}
+
+	$enabled = 'enabled' === $_GET['state'];
+	openlab_save_show_portfolio_link_on_user_profile( get_current_user_id(), $enabled );
+
+	wp_send_json_success();
+}
+add_action( 'wp_ajax_openlab_portfolio_link_visibility', 'openlab_portfolio_link_visibility_ajax_cb' );
diff --git a/lib/menus.php b/lib/menus.php
index fab634fc..4d844fa0 100644
--- a/lib/menus.php
+++ b/lib/menus.php
@@ -40,7 +40,7 @@ function openlab_wp_menu_customizations( $items, $args ) {
 		// first iterate through the current menu items and figure out where this new mobile menu item will go
 		foreach ( $items as $key => $item ) {
 
-			if ( false === strpos( $item->url, bp_get_root_domain() ) ) {
+			if ( false === strpos( $item->url, bp_get_root_url() ) ) {
 				$items[ $key ]->classes[] = 'external-link';
 			}
 
@@ -239,10 +239,12 @@ function openlab_help_categories_menu( $items, $args ) {
 		}
 
 		$help_args = array(
+			'taxonomy'   => 'help_category',
 			'hide_empty' => false,
 			'orderby'    => 'term_order',
 		);
-		$help_cats = get_terms( 'help_category', $help_args );
+
+		$help_cats = get_terms( $help_args );
 
 		// for post level identifying of current menu item
 		$post_cats_array = array();
@@ -296,11 +298,14 @@ function openlab_help_categories_menu( $items, $args ) {
 					$help_cat_list .= '<ul>';
 
 					$child_args = array(
+						'taxonomy'   => 'help_category',
 						'hide_empty' => false,
 						'orderby'    => 'term_order',
 						'parent'     => $help_cat->term_id,
 					);
-					$child_cats = get_terms( 'help_category', $child_args );
+
+					$child_cats = get_terms( $child_args );
+
 					foreach ( $child_cats as $child_cat ) {
 
 						$child_classes = 'help-cat menu-item';
@@ -431,10 +436,13 @@ function openlab_group_files_submenu() {
 	$current_item = $base_url;
 
 	$menu_list = [
-		$base_url                          => __( 'All Files', 'commons-in-a-box' ),
-		$base_url . '?action=add_new_file' => __( 'Add New File', 'commons-in-a-box' ),
+		$base_url => __( 'All Files', 'commons-in-a-box' ),
 	];
 
+	if ( current_user_can( 'bp_moderate' ) || groups_is_user_member( bp_loggedin_user_id(), groups_get_current_group()->id ) ) {
+		$menu_list[ $base_url . '?action=add_new_file' ] = __( 'Add New File', 'commons-in-a-box' );
+	}
+
 	return openlab_submenu_gen( $menu_list, false, $current_item );
 }
 
@@ -468,17 +476,21 @@ function openlab_get_submenu_extras() {
 function openlab_profile_settings_submenu() {
 	global $bp;
 
-	$dud = bp_displayed_user_domain();
-	if ( ! $dud ) {
-		$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
+	$user_id = bp_displayed_user_id();
+	if ( ! $user_id ) {
+		$user_id = bp_loggedin_user_id();
 	}
 
-	$settings_slug = $dud . bp_get_settings_slug();
+	$profile_edit_url  = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_profile_slug(), 'edit' ] ) );
+	$change_avatar_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_profile_slug(), 'change-avatar' ] ) );
+	$settings_url      = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_settings_slug() ] ) );
+	$notifications_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_settings_slug(), 'notifications' ] ) );
+
 	$menu_list     = array(
-		$dud . 'profile/edit'           => __( 'Edit Profile', 'commons-in-a-box' ),
-		$dud . 'profile/change-avatar'  => __( 'Change Avatar', 'commons-in-a-box' ),
-		$settings_slug                  => __( 'Account Settings', 'commons-in-a-box' ),
-		$dud . 'settings/notifications' => __( 'Email Notifications', 'commons-in-a-box' ),
+		$profile_edit_url  => __( 'Edit Profile', 'commons-in-a-box' ),
+		$change_avatar_url => __( 'Change Avatar', 'commons-in-a-box' ),
+		$settings_url      => __( 'Account Settings', 'commons-in-a-box' ),
+		$notifications_url => __( 'Email Notifications', 'commons-in-a-box' ),
 	);
 
 	/** This filter is documented in /wp-content/plugins/buddypress/bp-settings/classes/class-bp-settings-component.php */
@@ -486,13 +498,17 @@ function openlab_profile_settings_submenu() {
 
 	// Export Data - only available for BuddyPress 4.0.0.
 	if ( true === $show_data_page && function_exists( 'bp_signup_requires_privacy_policy_acceptance' ) ) {
-		$menu_list[ $dud . 'settings/data' ] = __( 'Export Data', 'commons-in-a-box' );
+		$export_data_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_settings_slug(), 'data' ] ) );
+
+		$menu_list[ $export_data_url ] = __( 'Export Data', 'commons-in-a-box' );
 	}
 
 	if ( ! is_super_admin( bp_displayed_user_id() ) && ( ( ! bp_disable_account_deletion() && bp_is_my_profile() ) || bp_current_user_can( 'delete_users' ) ) ) {
+		$delete_account_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_settings_slug(), 'delete-account' ] ) );
 
-		$menu_list[ $dud . 'settings/delete-account' ] = __( 'Delete Account', 'commons-in-a-box' );
+		$menu_list[ $delete_account_url ] = __( 'Delete Account', 'commons-in-a-box' );
 	}
+
 	return openlab_submenu_gen( $menu_list, true );
 }
 
@@ -507,14 +523,13 @@ function openlab_my_groups_submenu( \CBOX\OL\GroupType $group_type ) {
 	$menu_out  = array();
 	$menu_list = array();
 
-	$create_link = bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create/step/group-details/?group_type=' . $group_type->get_slug() . '&new=true';
-	$no_link     = 'no-link';
-
-	$span_start = '<span class="bold">';
-	$span_end   = '</span>';
-
-	// get account type to see if they're faculty
-	$faculty = xprofile_get_field_data( 'Account Type', get_current_user_id() );
+	$create_link = add_query_arg(
+		[
+			'group_type' => $group_type->get_slug(),
+			'new'        => 'true',
+		],
+		bp_groups_get_create_url( [ 'group-details' ] )
+	);
 
 	$submenu_text = $group_type->get_label( 'my_groups' );
 
@@ -578,16 +593,16 @@ function openlab_my_friends_submenu( $count = true ) {
 	global $bp;
 	$menu_out = array();
 
-	$dud = bp_displayed_user_domain();
-	if ( ! $dud ) {
-		$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
+	$user_id = bp_displayed_user_id();
+	if ( ! $user_id ) {
+		$user_id = bp_loggedin_user_id();
 	}
 
 	$request_ids   = friends_get_friendship_request_user_ids( bp_loggedin_user_id() );
 	$request_count = intval( count( (array) $request_ids ) );
 
-	$my_friends      = $dud . 'friends/';
-	$friend_requests = $dud . 'friends/requests/';
+	$my_friends      = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_friends_slug() ] ) );
+	$friend_requests = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_friends_slug(), 'requests' ] ) );
 
 	$action    = $bp->current_action;
 	$item      = $bp->current_item;
@@ -623,31 +638,41 @@ function openlab_my_friends_submenu( $count = true ) {
 
 // sub-menus for my-messages pages
 function openlab_my_messages_submenu() {
-	$dud = bp_displayed_user_domain();
-	if ( ! $dud ) {
-		$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
+	$user_id = bp_displayed_user_id();
+	if ( ! $user_id ) {
+		$user_id = bp_loggedin_user_id();
 	}
 
+	$inbox_url   = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_messages_slug(), 'inbox' ] ) );
+	$sent_url    = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_messages_slug(), 'sentbox' ] ) );
+	$compose_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_messages_slug(), 'compose' ] ) );
+
 	$menu_list = array(
-		$dud . 'messages/inbox/'   => __( 'Inbox', 'commons-in-a-box' ),
-		$dud . 'messages/sentbox/' => __( 'Sent', 'commons-in-a-box' ),
-		$dud . 'messages/compose'  => __( 'Compose', 'commons-in-a-box' ),
+		$inbox_url   => __( 'Inbox', 'commons-in-a-box' ),
+		$sent_url    => __( 'Sent', 'commons-in-a-box' ),
+		$compose_url => __( 'Compose', 'commons-in-a-box' ),
 	);
+
 	return openlab_submenu_gen( $menu_list );
 }
 
 // sub-menus for my-invites pages
 function openlab_my_invitations_submenu() {
-	$dud = bp_displayed_user_domain();
-	if ( ! $dud ) {
-		$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
+	$user_id = bp_displayed_user_id();
+	if ( ! $user_id ) {
+		$user_id = bp_loggedin_user_id();
 	}
 
+	$group_invites_url   = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_groups_slug(), 'invites' ] ) );
+	$invite_anyone_url   = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ 'invite-anyone' ] ) );
+	$ia_sent_invites_url = bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ 'invite-anyone', 'sent-invites' ] ) );
+
 	$menu_list = array(
-		$dud . 'groups/invites/'             => __( 'Invitations Received', 'commons-in-a-box' ),
-		$dud . 'invite-anyone/'              => __( 'Invite New Members', 'commons-in-a-box' ),
-		$dud . 'invite-anyone/sent-invites/' => __( 'Sent Invitations', 'commons-in-a-box' ),
+		$group_invites_url   => __( 'Invitations Received', 'commons-in-a-box' ),
+		$invite_anyone_url   => __( 'Invite New Members', 'commons-in-a-box' ),
+		$ia_sent_invites_url => __( 'Sent Invitations', 'commons-in-a-box' ),
 	);
+
 	return openlab_submenu_gen( $menu_list );
 }
 
@@ -827,6 +852,17 @@ function openlab_filter_subnav_admin( $subnav_item ) {
 }
 add_filter( 'bp_get_options_nav_admin', 'openlab_filter_subnav_admin' );
 
+/**
+ * Modifies the 'Members' subnav item.
+ *
+ * - Changes the name to 'Membership'.
+ * - Adds a count of total members.
+ * - Adds a 'current-menu-item' class to the 'Membership' subnav item when on the 'Membership' page.
+ * - Swaps URLs based on user role.
+ *
+ * @param string $subnav_item The subnav item.
+ * @return string
+ */
 function openlab_filter_subnav_members( $subnav_item ) {
 	global $bp;
 	global $wp_query;
@@ -854,14 +890,21 @@ function openlab_filter_subnav_members( $subnav_item ) {
 		$new_item = str_replace( 'current selected', 'current-menu-item', $new_item );
 	}
 
-	// get total member count
-	$total_mem = bp_core_number_format( groups_get_groupmeta( bp_get_current_group_id(), 'total_member_count' ) );
+	// Get a member count for formatting.
+	$total_mem = groups_get_total_member_count( bp_get_current_group_id() );
+	if ( ! current_user_can( 'view_private_members_of_group' ) ) {
+		$private_users = openlab_get_private_members_of_group( bp_get_current_group_id(), false );
+		if ( $private_users ) {
+			$total_mem -= count( $private_users );
+		}
+	}
 
-	// added classes to span
+	// Added classes to member count span.
+	$member_count_formatted = bp_core_number_format( $total_mem );
 	if ( $total_mem > 0 ) {
-		$new_item = str_replace( '<span>' . $total_mem . '</span>', '<span class="mol-count pull-right count-' . $total_mem . ' gray">' . $total_mem . '</span>', $new_item );
+		$new_item = preg_replace( '|<span>[^<]+</span>|', '<span class="mol-count pull-right count-' . $total_mem . ' gray">' . $member_count_formatted . '</span>', $new_item );
 	} else {
-		$new_item = str_replace( '<span>' . $total_mem . '</span>', '', $new_item );
+		$new_item = preg_replace( '|<span>[^<]+</span>|', '', $new_item );
 	}
 
 	return $new_item;
@@ -1064,180 +1107,57 @@ function openlab_group_submenu_nav() {
 add_action( 'bp_screens', 'openlab_group_submenu_nav', 1 );
 
 /**
- * Markup for group admin tabs
+ * Markup for group admin tabs.
+ *
+ * @since 1.6.0 Markup was moved into theme template file.
+ *
+ * @param BP_Groups_Group $group Optional. Group object. Deprecated.
+ * @return void
  */
 function openlab_group_admin_tabs( $group = false ) {
-	global $bp, $groups_template;
-
-	if ( ! $group ) {
-		$group = ( $groups_template->group ) ? $groups_template->group : $bp->groups->current_group;
+	if ( false !== $group ) {
+		_deprecated_argument( __FUNCTION__, '1.6.0', 'The $group parameter is no longer used.' );
 	}
 
-	$current_tab = bp_action_variable( 0 );
-
-	$group_type = cboxol_get_group_group_type( $group->id );
-
-	// Portfolio tabs look different from other groups
-	?>
-	<?php if ( cboxol_is_portfolio() ) : ?>
-		<?php if ( bp_is_item_admin() || bp_is_item_mod() ) { ?>
-			<li class="<?php ( 'edit-details' === $current_tab || empty( $current_tab ) ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/edit-details"><?php echo esc_html( $group_type->get_label( 'group_details' ) ); ?></a></li>
-		<?php } ?>
-
-		<li class="<?php echo 'site-details' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/site-details"><?php echo esc_html_x( 'Site', 'Group admin nav item', 'commons-in-a-box' ); ?></a></li>
-
-		<li class="<?php echo 'group-settings' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/group-settings"><?php esc_html_e( 'Settings', 'commons-in-a-box' ); ?></a></li>
-
-		<li class="delete-button <?php echo 'delete-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-minus-circle"></span><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/delete-group"><?php esc_html_e( 'Delete Portfolio', 'commons-in-a-box' ); ?></a></li>
-
-	<?php else : ?>
-
-		<?php if ( bp_is_item_admin() || bp_is_item_mod() ) { ?>
-			<li class="<?php ( 'edit-details' === $current_tab || empty( $current_tab ) ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/edit-details"><?php echo esc_html( $group_type->get_label( 'group_details' ) ); ?></a></li>
-		<?php } ?>
-
-		<?php
-		if ( ! bp_is_item_admin() ) {
-			return false;
-		}
-		?>
-
-		<li class="<?php echo 'site-details' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/site-details"><?php echo esc_html_x( 'Site', 'Group admin nav item', 'commons-in-a-box' ); ?></a></li>
-
-		<li class="<?php echo 'group-settings' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/group-settings"><?php esc_attr_e( 'Settings', 'commons-in-a-box' ); ?></a></li>
-
-		<?php if ( $group_type->get_can_be_cloned() ) : ?>
-			<?php
-			$clone_link = add_query_arg(
-				array(
-					'group_type' => $group_type->get_slug(),
-					'clone'      => bp_get_current_group_id(),
-				),
-				bp_get_groups_directory_permalink() . 'create/step/group-details/'
-			);
-			?>
-
-			<li class="clone-button <?php 'clone-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-plus-circle"></span><a href="<?php echo esc_url( $clone_link ); ?>"><?php esc_html_e( 'Clone', 'commons-in-a-box' ); ?></a></li>
-		<?php endif ?>
-
-		<li class="delete-button last-item <?php echo 'delete-group' === $current_tab ? 'current-menu-item' : ''; ?>"><span class="fa fa-minus-circle"></span><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/delete-group"><?php esc_html_e( 'Delete', 'commons-in-a-box' ); ?></a></li>
-
-		<?php if ( $group_type->get_is_portfolio() ) : ?>
-			<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-			<li class="portfolio-displayname pull-right"><span class="highlight"><?php echo bp_core_get_userlink( openlab_get_user_id_from_portfolio_group_id( bp_get_group_id() ) ); ?></span></li>
-		<?php else : ?>
-			<?php // translators: last active timestamp ?>
-			<li class="info-line pull-right"><span class="timestamp info-line-timestamp visible-lg"><span class="fa fa-undo"></span> <?php echo esc_html( sprintf( __( 'active %s', 'commons-in-a-box' ), bp_get_group_last_active() ) ); ?></span></li>
-		<?php endif; ?>
-
-	<?php endif; ?>
-	<?php
+	bp_get_template_part( 'groups/single/nav/admin' );
 }
 
 /**
- * Markup for Member Tabs
+ * Markup for Member Tabs.
+ *
+ * @since 1.6.0 Markup was moved into theme template file.
+ *
+ * @param BP_Groups_Group $group Optional. Group object. Deprecated.
+ * @return void
  */
 function openlab_group_membership_tabs( $group = false ) {
-	global $bp, $groups_template;
-
-	if ( ! $group ) {
-		$group = ( $groups_template->group ) ? $groups_template->group : $bp->groups->current_group;
+	if ( false !== $group ) {
+		_deprecated_argument( __FUNCTION__, '1.6.0', 'The $group parameter is no longer used.' );
 	}
 
-	$current_tab = bp_action_variable( 0 );
-
-	$group_type = groups_get_groupmeta( $bp->groups->current_group->id, 'wds_group_type' );
-	?>
-	<?php if ( bp_is_item_admin() ) : ?>
-		<li class="<?php echo 'manage-members' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/manage-members"><?php esc_html_e( 'Membership', 'commons-in-a-box' ); ?></a></li>
-
-		<?php if ( 'private' === $group->status ) : ?>
-			<li class="<?php echo 'membership-requests' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/membership-requests"><?php esc_html_e( 'Member Requests', 'commons-in-a-box' ); ?></a></li>
-		<?php endif; ?>
-	<?php else : ?>
-		<li class="<?php echo bp_is_current_action( 'members' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/members"><?php esc_html_e( 'Membership', 'commons-in-a-box' ); ?></a></li>
-	<?php endif; ?>
-
-	<?php if ( bp_group_is_member() && invite_anyone_access_test() && openlab_is_admin_truly_member() ) : ?>
-		<li class="<?php echo bp_is_current_action( 'invite-anyone' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/invite-anyone"><?php esc_html_e( 'Invite New Members', 'commons-in-a-box' ); ?></a></li>
-	<?php endif; ?>
-
-	<?php if ( bp_is_item_admin() ) : ?>
-		<li class="<?php echo 'notifications' === $current_tab ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/admin/notifications"><?php esc_html_e( 'Email Members', 'commons-in-a-box' ); ?></a></li>
-	<?php endif; ?>
-
-	<?php if ( bp_group_is_member() && openlab_is_admin_truly_member() ) : ?>
-		<li class="<?php echo bp_is_current_action( 'notifications' ) ? 'current-menu-item' : ''; ?>"><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/notifications"><?php esc_html_e( 'Your Email Options', 'commons-in-a-box' ); ?></a></li>
-	<?php endif; ?>
-
-	<?php
+	bp_get_template_part( 'groups/single/nav/membership' );
 }
 
 /**
  * Tabs for BuddyPress Docs navigation.
+ *
+ * @since 1.6.0 Markup was moved into theme template file.
+ *
+ * @return void
  */
 function openlab_docs_tabs() {
-	global $bp, $groups_template;
-
-	$group = null;
-	if ( bp_is_group() ) {
-		$group = groups_get_current_group();
-	} elseif ( ! empty( $groups_template->group ) ) {
-		$group = $groups_template->group;
-	}
-
-	$group_permalink = bp_get_group_permalink( $group );
-
-	?>
-
-	<li <?php echo ( 'list' === bp_docs_current_view() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_url( $group_permalink . bp_docs_get_docs_slug() ); ?>/"><?php esc_html_e( 'View Docs', 'commons-in-a-box' ); ?></a></li>
-	<?php if ( current_user_can( 'bp_docs_create' ) && current_user_can( 'bp_docs_associate_with_group', bp_get_current_group_id() ) ) : ?>
-		<li <?php echo ( 'create' === bp_docs_current_view() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_url( $group_permalink . bp_docs_get_docs_slug() ); ?>/create/"><?php esc_html_e( 'New Doc', 'commons-in-a-box' ); ?></a></li>
-	<?php endif; ?>
-	<?php if ( ( 'edit' === bp_docs_current_view() || 'single' === bp_docs_current_view() ) && bp_docs_is_existing_doc() ) : ?>
-		<?php $doc_obj = bp_docs_get_current_doc(); ?>
-		<li class="current-menu-item"><?php echo esc_html( $doc_obj->post_title ); ?></li>
-	<?php endif; ?>
-	<?php
+	bp_get_template_part( 'groups/single/nav/docs' );
 }
 
+/**
+ * Tabs for Forum navigation.
+ *
+ * @since 1.6.0 Markup was moved into theme template file.
+ *
+ * @return void
+ */
 function openlab_forum_tabs() {
-	global $bp, $groups_template, $wp_query;
-	$group = ( $groups_template->group ) ? $groups_template->group : $bp->groups->current_group;
-	// Load up bbPress once
-	$bbp = bbpress();
-
-	/** Query Resets ***************************************************** */
-	// Forum data
-	$forum_ids = bbp_get_group_forum_ids( bp_get_current_group_id() );
-	$forum_id  = array_shift( $forum_ids );
-	$offset    = 0;
-
-	$bbp->current_forum_id = $forum_id;
-
-	bbp_set_query_name( 'bbp_single_forum' );
-
-	// Get the topic
-	bbp_has_topics(
-		array(
-			'name'           => bp_action_variable( $offset + 1 ),
-			'posts_per_page' => 1,
-			'show_stickies'  => false,
-		)
-	);
-
-	// Setup the topic
-	while ( bbp_topics() ) {
-		bbp_the_topic();
-	}
-	?>
-
-	<li <?php echo ( ! bp_action_variable() ? 'class="current-menu-item"' : '' ); ?> ><a href="<?php echo esc_attr( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group->slug ); ?>/forum/"><?php esc_html_e( 'Discussion', 'commons-in-a-box' ); ?></a></li><!--
-	<?php if ( bp_is_action_variable( 'topic' ) ) : ?>
-		--><li class="current-menu-item hyphenate"><span><?php bbp_topic_title(); ?></span></li><!--
-			<?php endif; ?>
-	-->
-	<?php
+	bp_get_template_part( 'groups/single/nav/forum' );
 }
 
 function openlab_is_create_group( $group_type ) {
diff --git a/lib/plugin-hooks.php b/lib/plugin-hooks.php
index 80cd9734..8bc84776 100644
--- a/lib/plugin-hooks.php
+++ b/lib/plugin-hooks.php
@@ -108,7 +108,7 @@ function openlab_manage_members_email_status( $user_id = '', $group = '' ) {
 // remove status from group profile pages
 add_action(
 	'bp_actions',
-	function() {
+	function () {
 		remove_action( 'bp_group_header_meta', 'ass_group_subscribe_button' );
 	}
 );
@@ -127,7 +127,7 @@ function openlab_forum_tabs_output() {
 	?>
 	<div class="forum-nav">
 		<ul class="nav nav-inline">
-			<?php openlab_forum_tabs(); ?>
+			<?php bp_get_template_part( 'groups/single/nav/forum' ); ?>
 		</ul>
 
 		<?php bbp_get_template_part( 'form', 'search' ); ?>
@@ -747,7 +747,7 @@ function openlab_log_out_social_accounts() {
  */
 add_action(
 	'bp_init',
-	function() {
+	function () {
 		if ( ! class_exists( '\HardG\BpBraille\Plugin' ) ) {
 			return;
 		}
diff --git a/lib/plugin-mods/badges.php b/lib/plugin-mods/badges.php
index 789a47d5..945f3bdf 100644
--- a/lib/plugin-mods/badges.php
+++ b/lib/plugin-mods/badges.php
@@ -154,7 +154,7 @@ function openlab_filter_group_badges( $badges, OpenLab\Badges\Group $group ) {
 
 	usort(
 		$badges,
-		function( $a, $b ) {
+		function ( $a, $b ) {
 			return $a->get_position() > $b->get_position();
 		}
 	);
diff --git a/lib/plugin-mods/calendar-control.php b/lib/plugin-mods/calendar-control.php
index 59c666e8..669b7a08 100644
--- a/lib/plugin-mods/calendar-control.php
+++ b/lib/plugin-mods/calendar-control.php
@@ -34,7 +34,7 @@ function openlab_is_calendar_enabled_for_group( $group_id = null ) {
  */
 add_action(
 	'bp_screens',
-	function() {
+	function () {
 		if ( ! bp_is_group() ) {
 			return;
 		}
@@ -306,7 +306,7 @@ function openlab_bpeo_list_author() {
 	// translators: author name
 	$base = __( '<strong>Author:</strong> %s', 'bp-event-organiser' );
 
-	echo sprintf(
+	printf(
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		'<li>' . wp_filter_kses( $base ) . '</li>',
 		esc_html( bp_core_get_user_displayname( $author_id ) )
diff --git a/lib/plugin-mods/docs-funcs.php b/lib/plugin-mods/docs-funcs.php
index 547876a6..8aa1fc1f 100644
--- a/lib/plugin-mods/docs-funcs.php
+++ b/lib/plugin-mods/docs-funcs.php
@@ -41,7 +41,7 @@ function openlab_bp_docs_template( $template ) {
 
 add_action(
 	'bp_docs_setup_theme_compat',
-	function( $theme_compat ) {
+	function ( $theme_compat ) {
 		remove_action( 'bp_replace_the_content', array( $theme_compat, 'single_content' ) );
 		remove_action( 'bp_replace_the_content', array( $theme_compat, 'create_content' ) );
 	}
@@ -251,7 +251,7 @@ function openlab_docs_activity_notification_control( $send_it, $activity, $user_
  */
 add_filter(
 	'comment_form_submit_button',
-	function( $button ) {
+	function ( $button ) {
 		if ( ! bp_docs_is_existing_doc() ) {
 			return $button;
 		}
diff --git a/lib/plugin-mods/email-funcs.php b/lib/plugin-mods/email-funcs.php
index b28ad79e..e87e5883 100644
--- a/lib/plugin-mods/email-funcs.php
+++ b/lib/plugin-mods/email-funcs.php
@@ -109,7 +109,7 @@ function openlab_ass_add_notice_to_notifications_page() {
 }
 add_action(
 	'bp_screens',
-	function() {
+	function () {
 		remove_action( 'bp_notification_settings', 'ass_add_notice_to_notifications_page', 9000 );
 		add_action( 'bp_notification_settings', 'openlab_ass_add_notice_to_notifications_page', 9000 );
 	}
diff --git a/lib/plugin-mods/files-funcs.php b/lib/plugin-mods/files-funcs.php
index 8ea9d7fa..56969618 100644
--- a/lib/plugin-mods/files-funcs.php
+++ b/lib/plugin-mods/files-funcs.php
@@ -103,7 +103,7 @@ function openlab_disable_bp_group_documents_group_creation_step( $value ) {
  */
 add_filter(
 	'bp_core_render_message_content',
-	function( $message ) {
+	function ( $message ) {
 		$old = __( 'Document successfully uploaded', 'commons-in-a-box' );
 		$new = __( 'File successfully uploaded', 'commons-in-a-box' );
 		return str_replace( $old, $new, $message );
@@ -189,7 +189,7 @@ function openlab_delete_bpgd_category_cookie_on_load() {
  */
 add_action(
 	'bp_group_documents_template_do_post_action',
-	function() {
+	function () {
 		$request_type = ! empty( $_POST['bp_group_documents_file_type'] ) ? wp_unslash( $_POST['bp_group_documents_file_type'] ) : 'upload';
 
 		// If request is not of type 'link', let buddypress-group-documents handle it.
@@ -249,10 +249,16 @@ function() {
  */
 add_action(
 	'bp_group_documents_data_after_save',
-	function( $document ) {
+	function ( $document ) {
 		// Get the operation type, used to build the nonce.
 		$operation_type = ! empty( $_POST['bp_group_documents_operation'] ) && 'edit' === $_POST['bp_group_documents_operation'] ? 'edit' : 'add';
 
+		// Absence of a nonce indicates that this is a clone operation, and there's no need
+		// to check for a link.
+		if ( ! isset( $_POST['bp_group_document_save'] ) ) {
+			return;
+		}
+
 		check_admin_referer( 'bp_group_document_save_' . $operation_type, 'bp_group_document_save' );
 
 		$request_type = ! empty( $_POST['bp_group_documents_file_type'] ) ? wp_unslash( $_POST['bp_group_documents_file_type'] ) : 'upload';
@@ -325,7 +331,7 @@ function openlab_update_external_link_category( $document ) {
  */
 add_action(
 	'bp_actions',
-	function() {
+	function () {
 		if ( ! bp_is_group() || ! bp_is_current_action( BP_GROUP_DOCUMENTS_SLUG ) ) {
 			return;
 		}
@@ -370,7 +376,7 @@ function openlab_get_document_type( $file_name ) {
  */
 add_filter(
 	'bp_group_documents_file_url',
-	function( $document_url, $group_id, $file ) {
+	function ( $document_url, $group_id, $file ) {
 		if ( 'upload' === openlab_get_document_type( $file ) ) {
 			return $document_url;
 		}
diff --git a/lib/sidebar-funcs.php b/lib/sidebar-funcs.php
index c794bb48..db400e0c 100644
--- a/lib/sidebar-funcs.php
+++ b/lib/sidebar-funcs.php
@@ -142,10 +142,9 @@ function openlab_group_sidebar( $mobile = false ) {
  * @param type $mobile
  */
 function openlab_member_sidebar_menu( $mobile = false ) {
-
-	$dud = bp_displayed_user_domain();
-	if ( ! $dud ) {
-		$dud = bp_loggedin_user_domain(); // will always be the logged in user on my-*
+	$user_id = bp_displayed_user_id();
+	if ( ! $user_id ) {
+		$user_id = bp_loggedin_user_id();
 	}
 
 	if ( $mobile ) {
@@ -177,10 +176,10 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 			<ul class="sidebar-nav clearfix">
 
 				<?php $selected_page = bp_is_user_activity() ? 'selected-page' : ''; ?>
-				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-profile my-profile"><a href="<?php echo esc_attr( $dud ); ?>"><?php esc_html_e( 'My Profile', 'commons-in-box' ); ?></a></li>
+				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-profile my-profile"><a href="<?php echo esc_attr( bp_members_get_user_url( $user_id ) ); ?>"><?php esc_html_e( 'My Profile', 'commons-in-box' ); ?></a></li>
 
 				<?php $selected_page = bp_is_user_settings() ? 'selected-page' : ''; ?>
-				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-settings my-settings"><a href="<?php echo esc_attr( $dud . bp_get_settings_slug() ); ?>/"><?php esc_html_e( 'My Settings', 'commons-in-a-box' ); ?></a></li>
+				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-settings my-settings"><a href="<?php echo esc_attr( bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_settings_slug() ] ) ) ); ?>/"><?php esc_html_e( 'My Settings', 'commons-in-a-box' ); ?></a></li>
 
 				<?php if ( $portfolio_group_type ) : ?>
 					<?php if ( openlab_user_has_portfolio( bp_displayed_user_id() ) && ( ! cboxol_group_is_hidden( openlab_get_user_portfolio_id() ) || openlab_is_my_profile() || groups_is_user_member( bp_loggedin_user_id(), openlab_get_user_portfolio_id() ) ) ) : ?>
@@ -218,7 +217,7 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 
 					<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-friends my-friends">
 						<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-						<a href="<?php echo esc_attr( $dud . bp_get_friends_slug() ); ?>/"><?php esc_html_e( 'My Friends', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $request_count ); ?></a>
+						<a href="<?php echo esc_attr( bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_friends_slug() ] ) ) ); ?>"><?php esc_html_e( 'My Friends', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $request_count ); ?></a>
 					</li>
 				<?php endif; ?>
 
@@ -231,7 +230,7 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 
 					<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-messages my-messages">
 						<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-						<a href="<?php echo esc_attr( $dud . bp_get_messages_slug() ); ?>/inbox/"><?php esc_html_e( 'My Messages', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $message_count ); ?></a>
+						<a href="<?php echo esc_attr( bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_messages_slug() ] ) ) ); ?>"><?php esc_html_e( 'My Messages', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $message_count ); ?></a>
 					</li>
 				<?php endif; ?>
 
@@ -246,7 +245,7 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 
 					<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-invites my-invites">
 						<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-						<a href="<?php echo esc_attr( $dud . bp_get_groups_slug() ); ?>/invites/"><?php esc_html_e( 'My Invitations', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $invite_count ); ?></a>
+						<a href="<?php echo esc_attr( bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_groups_slug(), 'invites' ] ) ) ); ?>"><?php esc_html_e( 'My Invitations', 'commons-in-a-box' ); ?> <?php echo openlab_get_menu_count_mup( $invite_count ); ?></a>
 					</li>
 				<?php endif ?>
 			</ul>
@@ -260,7 +259,7 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 			<ul class="sidebar-nav clearfix">
 
 				<?php $selected_page = bp_is_user_activity() ? 'selected-page' : ''; ?>
-				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-profile"><a href="<?php echo esc_attr( $dud ); ?>/"><?php esc_html_e( 'Profile', 'commons-in-a-box' ); ?></a></li>
+				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-profile"><a href="<?php echo esc_attr( bp_members_get_user_url( $user_id ) ); ?>"><?php esc_html_e( 'Profile', 'commons-in-a-box' ); ?></a></li>
 
 				<?php if ( $portfolio_group_type ) : ?>
 					<?php if ( openlab_user_has_portfolio( bp_displayed_user_id() ) && ( ! cboxol_group_is_hidden( openlab_get_user_portfolio_id() ) || openlab_is_my_profile() || groups_is_user_member( bp_loggedin_user_id(), openlab_get_user_portfolio_id() ) ) ) : ?>
@@ -276,7 +275,7 @@ function openlab_member_sidebar_menu( $mobile = false ) {
 				<?php endforeach; ?>
 
 				<?php $selected_page = bp_is_user_friends() ? 'selected-page' : ''; ?>
-				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-friends"><a href="<?php echo esc_attr( $dud . bp_get_friends_slug() ); ?>/"><?php esc_html_e( 'Friends', 'commons-in-a-box' ); ?></a></li>
+				<li class="sq-bullet <?php echo esc_attr( $selected_page ); ?> mol-friends"><a href="<?php echo esc_attr( bp_members_get_user_url( $user_id, bp_members_get_path_chunks( [ bp_get_friends_slug() ] ) ) ); ?>"><?php esc_html_e( 'Friends', 'commons-in-a-box' ); ?></a></li>
 
 			</ul>
 
@@ -290,6 +289,9 @@ function openlab_member_sidebar_menu( $mobile = false ) {
  * Member pages sidebar blocks (portfolio link) - modularized for easier parsing of mobile menus
  */
 function openlab_members_sidebar_blocks( $mobile_hide = false ) {
+	static $counter = 0;
+
+	++$counter;
 
 	$portfolio_group_type = cboxol_get_portfolio_group_type();
 
@@ -315,7 +317,15 @@ function openlab_members_sidebar_blocks( $mobile_hide = false ) {
 
 	?>
 
-	<?php if ( openlab_user_has_portfolio( bp_displayed_user_id() ) && ( ! cboxol_group_is_hidden( openlab_get_user_portfolio_id() ) || openlab_is_my_profile() || groups_is_user_member( bp_loggedin_user_id(), openlab_get_user_portfolio_id() ) ) ) : ?>
+	<?php
+	if (
+		( ( openlab_user_has_portfolio( bp_displayed_user_id() ) && ! cboxol_group_is_hidden( openlab_get_user_portfolio_id() ) && openlab_show_portfolio_link_on_user_profile() )
+		||
+		( openlab_is_my_profile() && openlab_user_has_portfolio( bp_displayed_user_id() ) )
+		||
+		groups_is_user_member( bp_loggedin_user_id(), openlab_get_user_portfolio_id() ) )
+	) :
+		?>
 
 		<?php if ( ! $mobile_hide ) : ?>
 			<?php if ( is_user_logged_in() && openlab_is_my_profile() ) : ?>
@@ -351,6 +361,14 @@ function openlab_members_sidebar_blocks( $mobile_hide = false ) {
 				</li>
 
 			</ul>
+
+			<?php if ( openlab_is_my_profile() && openlab_user_has_portfolio( bp_displayed_user_id() ) && ! bp_is_group_create() ) : ?>
+				<li class="portfolio-profile-link-toggle-wrapper">
+					<input value="1" data-counter="<?php echo esc_attr( $counter ); ?>" type="checkbox" id="portfolio-profile-link-toggle-<?php echo esc_attr( $counter ); ?>" class="portfolio-profile-link-toggle-checkbox" <?php checked( openlab_show_portfolio_link_on_user_profile() ); ?> /> <label for="portfolio-profile-link-toggle-<?php echo esc_attr( $counter ); ?>"><?php esc_html_e( 'Show link to my Portfolio on my public Profile', 'commons-in-a-box' ); ?></label>
+
+					<?php wp_nonce_field( 'openlab_portfolio_link_visibility', 'openlab_portfolio_link_visibility_nonce_' . $counter, false ); ?>
+				</li>
+			<?php endif; ?>
 		</div>
 
 	<?php elseif ( openlab_is_my_profile() && ! bp_is_group_create() ) : ?>
diff --git a/lib/theme-hooks.php b/lib/theme-hooks.php
index 0c0440dc..fa17d4a3 100644
--- a/lib/theme-hooks.php
+++ b/lib/theme-hooks.php
@@ -123,7 +123,7 @@ function openlab_custom_menu_items( $items, $menu ) {
 				$class = 'class="current-menu-item"';
 			}
 			$opl_link  = '<li ' . $class . '>';
-			$opl_link .= '<a href="' . esc_attr( bp_loggedin_user_domain() ) . '">' . esc_html__( 'My Profile', 'commons-in-a-box' ) . '</a>';
+			$opl_link .= '<a href="' . esc_attr( bp_loggedin_user_url() ) . '">' . esc_html__( 'My Profile', 'commons-in-a-box' ) . '</a>';
 			$opl_link .= '</li>';
 		}
 
diff --git a/lib/widgets/group-type.php b/lib/widgets/group-type.php
index 6cf6f3a6..41030e55 100644
--- a/lib/widgets/group-type.php
+++ b/lib/widgets/group-type.php
@@ -70,13 +70,13 @@ public function widget( $args, $instance ) {
 
 						?>
 
-						<div class="box-1 row-<?php echo esc_attr( $i ); ?> activity-item type-<?php echo esc_attr( $type->get_slug() ); ?>">
+						<div class="clickable-card box-1 row-<?php echo esc_attr( $i ); ?> activity-item type-<?php echo esc_attr( $type->get_slug() ); ?>">
 							<div class="item-avatar">
-								<a href="<?php bp_group_permalink(); ?>"><img class="img-responsive" src="<?php echo esc_attr( $group_avatar ); ?>" alt="<?php echo esc_attr( $group->name ); ?>"/></a>
+								<img class="img-responsive" src="<?php echo esc_attr( $group_avatar ); ?>" alt="<?php echo esc_attr( $group->name ); ?>"/>
 							</div>
 
 							<div class="item-content-wrapper">
-								<h3 class="group-title overflow-hidden">
+								<h3 class="item-title group-title overflow-hidden">
 									<a class="no-deco truncate-on-the-fly hyphenate" href="<?php echo esc_attr( bp_get_group_permalink() ); ?>" data-basevalue="40" data-minvalue="15" data-basewidth="145"><?php echo esc_html( bp_get_group_name() ); ?></a>
 									<span class="original-copy hidden"><?php echo esc_html( bp_get_group_name() ); ?></span>
 								</h3>
@@ -96,7 +96,7 @@ public function widget( $args, $instance ) {
 									?>
 								</p>
 								<p class="see-more">
-									<a class="semibold" href="<?php echo esc_attr( bp_get_group_permalink() ); ?>"><?php esc_html_e( 'See More', 'commons-in-a-box' ); ?><span class="sr-only"> <?php echo esc_html( bp_get_group_name() ); ?></span></a>
+									<span class="semibold"><?php esc_html_e( 'See More', 'commons-in-a-box' ); ?><span class="sr-only"> <?php echo esc_html( bp_get_group_name() ); ?></span></span>
 								</p>
 							</div><!-- .item-content-wrapper -->
 						</div>
diff --git a/lib/widgets/new-members.php b/lib/widgets/new-members.php
index a09b5e7d..89cc4f5c 100644
--- a/lib/widgets/new-members.php
+++ b/lib/widgets/new-members.php
@@ -72,7 +72,7 @@ public function widget( $args, $instance ) {
 				$user_avatar = bp_core_fetch_avatar(
 					array(
 						'item_id' => $user_id,
-						'object'  => 'member',
+						'object'  => 'user',
 						'type'    => 'full',
 						'html'    => false,
 					)
diff --git a/lib/widgets/whos-online.php b/lib/widgets/whos-online.php
index 1025e7f3..50b8e5cb 100644
--- a/lib/widgets/whos-online.php
+++ b/lib/widgets/whos-online.php
@@ -81,7 +81,7 @@ public function widget( $args, $instance ) {
 					$user_avatar = bp_core_fetch_avatar(
 						array(
 							'item_id' => $member->ID,
-							'object'  => 'member',
+							'object'  => 'user',
 							'type'    => 'full',
 							'html'    => false,
 						)
diff --git a/package.json b/package.json
index 3e05dcd1..d3c548f5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openlab_theme",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "main": "Gruntfile.js",
   "private": true,
   "scripts": {
diff --git a/parts/home/login.php b/parts/home/login.php
index 7d24838e..4b9239d9 100644
--- a/parts/home/login.php
+++ b/parts/home/login.php
@@ -47,19 +47,19 @@
 
 	<div id="sidebar-me" class="clearfix">
 		<div id="user-info">
-			<a class="avatar" href="<?php echo esc_attr( bp_loggedin_user_domain() ); ?>">
+			<a class="avatar" href="<?php echo esc_attr( bp_loggedin_user_url() ); ?>">
 				<?php /* translators: user display name */ ?>
 				<img class="img-responsive" src="<?php echo esc_attr( $user_avatar ); ?>" alt="<?php echo esc_attr( sprintf( __( 'Avatar for %s', 'commons-in-a-box' ), bp_core_get_user_displayname( bp_loggedin_user_id() ) ) ); ?>" />
 			</a>
 
 			<div class="welcome-link-my-profile">
-				<a href="<?php echo esc_url( bp_loggedin_user_domain() ); ?>"><?php esc_html_e( 'My Profile', 'commons-in-a-box' ); ?></a>
+				<a href="<?php echo esc_url( bp_loggedin_user_url() ); ?>"><?php esc_html_e( 'My Profile', 'commons-in-a-box' ); ?></a>
 			</div>
 
 			<ul class="content-list">
 				<?php /* translators: logged-in user display name */ ?>
-				<li class="no-margin no-margin-bottom"><a class="button logout font-size font-12 roll-over-loss" href="<?php echo esc_attr( wp_logout_url( bp_get_root_domain() ) ); ?>"><?php printf( esc_html__( 'Not %s?', 'commons-in-a-box' ), esc_html( bp_core_get_username( bp_loggedin_user_id() ) ) ); ?></a></li>
-				<li class="no-margin no-margin-bottom"><a class="button logout font-size font-12 roll-over-loss" href="<?php echo esc_attr( wp_logout_url( bp_get_root_domain() ) ); ?>"><?php esc_html_e( 'Log Out', 'commons-in-a-box' ); ?></a></li>
+				<li class="no-margin no-margin-bottom"><a class="button logout font-size font-12 roll-over-loss" href="<?php echo esc_attr( wp_logout_url( bp_get_root_url() ) ); ?>"><?php printf( esc_html__( 'Not %s?', 'commons-in-a-box' ), esc_html( bp_core_get_username( bp_loggedin_user_id() ) ) ); ?></a></li>
+				<li class="no-margin no-margin-bottom"><a class="button logout font-size font-12 roll-over-loss" href="<?php echo esc_attr( wp_logout_url( bp_get_root_url() ) ); ?>"><?php esc_html_e( 'Log Out', 'commons-in-a-box' ); ?></a></li>
 			</ul>
 			</span><!--user-info-->
 		</div>
diff --git a/parts/sidebar/filter-badges.php b/parts/sidebar/filter-badges.php
index 8a5ec30e..1e465818 100644
--- a/parts/sidebar/filter-badges.php
+++ b/parts/sidebar/filter-badges.php
@@ -18,7 +18,7 @@
 // Exclude 'Open' and 'Cloneable', which have their own UI.
 $badges = array_filter(
 	$badges,
-	function( $badge ) {
+	function ( $badge ) {
 		$is_open_badge      = get_term_meta( $badge->get_id(), 'cboxol_is_open_badge' );
 		$is_cloneable_badge = get_term_meta( $badge->get_id(), 'cboxol_is_cloneable_badge' );
 
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 4757412d..7993c60e 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -8,6 +8,9 @@
 	<!-- Exclude any Node Modules directory. -->
 	<exclude-pattern>/node_modules/*</exclude-pattern>
 
+	<!-- Exclude JS files -->
+	<exclude-pattern>*.js</exclude-pattern>
+
 	<!-- Exclude minified and built files. -->
 	<exclude-pattern>*.min.js</exclude-pattern>
 	<exclude-pattern>*.min.css</exclude-pattern>
@@ -54,26 +57,7 @@
 
 	<rule ref="WordPress.WP.Capabilities">
 		<properties>
-			<property name="custom_capabilities[]" value="assign_topic_tags,bp_docs_associate_with_group,bp_docs_create,bp_docs_edit,bp_docs_manage,bp_moderate,edit_topic,grant_badges,moderate" />
-		</properties>
-	</rule>
-
-	<rule ref="WordPress.WP.DeprecatedClasses">
-		<properties>
-			<property name="minimum_supported_version" value="5.1"/>
-		</properties>
-	</rule>
-
-	<rule ref="WordPress.WP.DeprecatedFunctions">
-		<properties>
-			<property name="minimum_supported_version" value="5.1"/>
+			<property name="custom_capabilities[]" value="assign_topic_tags,bp_docs_associate_with_group,bp_docs_create,bp_docs_edit,bp_docs_manage,bp_moderate,edit_topic,grant_badges,moderate,view_private_members_of_group" />
 		</properties>
 	</rule>
-
-	<rule ref="WordPress.WP.DeprecatedParameters">
-		<properties>
-			<property name="minimum_supported_version" value="5.1"/>
-		</properties>
-	</rule>
-
 </ruleset>
diff --git a/sidebar-help.php b/sidebar-help.php
index 802ef9af..71b62893 100644
--- a/sidebar-help.php
+++ b/sidebar-help.php
@@ -105,13 +105,14 @@
 <div id="help-tags">
 	<?php
 	$args = array(
+		'taxonomy'     => 'help_tags',
 		'orderby'      => 'name',
 		'order'        => 'ASC',
 		'hierarchical' => false,
 	);
 
 
-	$terms = get_terms( array( 'help_tags' ), $args );
+	$terms = get_terms( $args );
 
 	$count = count( $terms );
 	if ( $count > 0 ) {
diff --git a/style.css b/style.css
index 7d653ce1..59d39278 100644
--- a/style.css
+++ b/style.css
@@ -4,8 +4,8 @@ Theme URL: http://openlab.early-adopter.com
 Description: OpenLab Bootstrap based theme
 Author: CityTech OpenLab Dev Team
 Author URI:http://openlab.early-adopter.com
-Version: 1.5.1
-Text Domain: openlab
+Version: 1.6.0
+Text Domain: commons-in-a-box
 */
 /**import bootstrap**/
 /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
diff --git a/style.less b/style.less
index 24e8b3c3..76dd2764 100644
--- a/style.less
+++ b/style.less
@@ -4,7 +4,7 @@ Theme URL: https://commonsinabox.org
 Description: Commons In A Box theme, based on the OpenLab at City Tech.
 Author: The Commons In A Box OpenLab team
 Author URI: https://commonsinabox.org
-Version: 1.5.1
+Version: 1.6.0
 Text Domain: commons-in-a-box
 */
 
@@ -213,6 +213,7 @@ blockquote {
             }
             .fa{
                 font-size: 16px;
+				line-height: 1;
             }
             &:hover{
                 background-color: inherit;
@@ -740,6 +741,14 @@ body{
 		.group-creator-form-entry {
 		}
 	}
+
+	.portfolio-profile-link-wrapper {
+		margin-top: 32px;
+		label {
+			font-weight: 600;
+		}
+	}
+
 	.group-creators-section {
 		margin-bottom: 20px;
 		margin-top: 20px;
@@ -1291,6 +1300,27 @@ body{
         }
     }
 }
+.panel-avatar-privacy {
+	&.loading {
+		.radio {
+			opacity: .5;
+			pointer-events: none;
+		}
+	}
+
+	.panel-body {
+		legend {
+			margin-bottom: 1em;
+		}
+
+		.radio {
+			label {
+				font-weight: normal;
+				margin-right: 16px;
+			}
+		}
+	}
+}
 /**shortcodes**/
 .callout-list{
     .row{
@@ -1376,6 +1406,7 @@ body form{
 	.site-path {
 		display: table;
 		padding-left: 25px;
+		white-space: nowrap;
 		width: 90%;
 		span {
 			display: table-cell;
@@ -1968,15 +1999,7 @@ body form{
                     }
                 }
                 .item-avatar{
-                    height: 0;
                     position: relative;
-                    padding-top: 100%;
-                    a{
-                        position: absolute;
-                        top: 0;
-                        left: 0;
-                        width: 100%;
-                    }
                     @media (max-width: @screen-xs-max){
                         height: 100%;
                         width: 100%;
@@ -2014,6 +2037,20 @@ body form{
     }
 }
 
+.clickable-card {
+	&.card-is-hovered {
+		border-color: @40gray !important;
+	}
+
+	.see-more {
+		text-decoration: underline;
+
+		&:hover {
+			text-decoration: none;
+		}
+	}
+}
+
 /**sidebar**/
 .mobile-dropdown{
     @media(max-width: @screen-xs-max){
@@ -2113,6 +2150,23 @@ body form{
 		text-decoration: none;
 	}
 }
+
+.portfolio-profile-link-toggle-wrapper {
+	align-items: flex-start;
+	display: flex;
+	gap: 8px;
+	margin-left: 5%;
+	padding-bottom: 10px;
+
+	label {
+		display: block;
+		font-weight: normal;
+		font-size: 12px;
+		padding-top: 3px;
+		margin-bottom: 0;
+	}
+}
+
 .mobile-group-site-links {
 	margin-top: 30px;
 	.portfolio-site-link {
@@ -2773,13 +2827,41 @@ input#group-request-send {
 .group-members{
     &.group-list{
         .group-item-wrapper{
-            height: 118px;
+            height: 128px;
             p{
                 margin: 10px 0 7px;
             }
         }
+        .group-item-membership-privacy {
+            margin-top: 15px;
+
+            label {
+                font-size: 12px;
+                font-weight: 400;
+
+                &:hover {
+                    cursor: pointer;
+                }
+            }
+        }
     }
 }
+
+.group-manage-members-pagination {
+	align-items: center;
+	display: flex;
+	gap: 10px;
+	justify-content: space-between;
+	margin-bottom: 10px;
+}
+
+@media screen and (max-width: @screen-xs-max) {
+	.group-manage-members-pagination {
+		align-items: flex-start;
+		flex-direction: column;
+	}
+}
+
 .group-manage-members{
     &.group-list{
         &.group-manage-requests {
@@ -2797,7 +2879,7 @@ input#group-request-send {
                     height: 127px;
                 }
                 &.members{
-                    height: 318px;
+                    height: auto;
                     .link-btn{
                         margin-right: 3px;
                     }
@@ -4050,6 +4132,13 @@ input.help-search {
         margin-top: 10px;
     }
 }
+/* Private membership indicator */
+p.private-membership-indicator {
+    margin-top: 15px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #666 !important;
+}
 /**contact form**/
 .wpcf7{
     .wpcf7-response-output{