diff --git src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
index bcff8f918..53792c10d 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp-mixins.scss
@@ -360,7 +360,7 @@
 				margin: 0 $marg-sml 0 0;
 
 				a,
-				span {
+				span:not(.count) {
 					background: none;
 					border: none;
 					display: block;
diff --git src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
index 567b19e60..6cef4c5f6 100644
--- src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
+++ src/bp-templates/bp-nouveau/common-styles/_bp_navigation.scss
@@ -476,55 +476,56 @@
 
 .buddypress-wrap {
 
-	.item-body {
+	@include medium-up {
 
-		@include medium-up {
+		// Profile group labels links
+		// Button navigation as tabbed effect for wide screen
 
-			// Profile group labels links
-			// Button navigation as tabbed effect for wide screen
+		@include tabbed-links();
 
-			@include tabbed-links();
+		.bp-navs.tabbed-links {
+			background: none;
+			margin-top: 2px;
+
+			&.main-navs {
 
-			.bp-navs.tabbed-links {
-				background: none;
-				margin-top: 2px;
+			}
 
-				// For tabbed nav we remove any default button nav styles.
-				ul {
+			// For tabbed nav we remove any default button nav styles.
+			ul {
 
-					li {
+				li {
 
-						a {
-							border-right: 0;
-							font-size: inherit;
-						}
+					a {
+						border-right: 0;
+						font-size: inherit;
 					}
+				}
 
-					li.last {
-						float: right;
-						margin: 0;
+				li.last {
+					float: right;
+					margin: 0;
 
-						a {
-							margin-top: -0.5em;
-						}
+					a {
+						margin-top: -0.5em;
 					}
+				}
 
-					li,
-					li.current {
+				li,
+				li.current {
 
-						a,
-						a:focus,
-						a:hover {
-							background: none;
-							border: 0;
-						}
+					a,
+					a:focus,
+					a:hover {
+						background: none;
+						border: 0;
+					}
 
-						a:active {
-							outline: none;
-						}
+					a:active {
+						outline: none;
 					}
 				}
-			} // close .bp-navs.tabbed-links
-		} // @media
-	}
+			}
+		} // close .bp-navs.tabbed-links
+	} // @media
 }
diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css
index 436cba027..937c37a67 100644
--- src/bp-templates/bp-nouveau/css/buddypress.css
+++ src/bp-templates/bp-nouveau/css/buddypress.css
@@ -552,45 +552,45 @@ body.buddypress article.page > .entry-header .entry-title {
 }
 
 @media screen and (min-width: 46.8em) {
-	.buddypress-wrap .item-body .tabbed-links ul,
-	.buddypress-wrap .item-body .tabbed-links ol {
+	.buddypress-wrap .tabbed-links ul,
+	.buddypress-wrap .tabbed-links ol {
 		border-bottom: 1px solid #ccc;
 		float: none;
 		margin: 20px 0 10px;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul:before, .buddypress-wrap .item-body .tabbed-links ul:after,
-	.buddypress-wrap .item-body .tabbed-links ol:before,
-	.buddypress-wrap .item-body .tabbed-links ol:after {
+	.buddypress-wrap .tabbed-links ul:before, .buddypress-wrap .tabbed-links ul:after,
+	.buddypress-wrap .tabbed-links ol:before,
+	.buddypress-wrap .tabbed-links ol:after {
 		content: " ";
 		display: block;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul:after,
-	.buddypress-wrap .item-body .tabbed-links ol:after {
+	.buddypress-wrap .tabbed-links ul:after,
+	.buddypress-wrap .tabbed-links ol:after {
 		clear: both;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul li,
-	.buddypress-wrap .item-body .tabbed-links ol li {
+	.buddypress-wrap .tabbed-links ul li,
+	.buddypress-wrap .tabbed-links ol li {
 		float: left;
 		list-style: none;
 		margin: 0 10px 0 0;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul li a,
-	.buddypress-wrap .item-body .tabbed-links ul li span,
-	.buddypress-wrap .item-body .tabbed-links ol li a,
-	.buddypress-wrap .item-body .tabbed-links ol li span {
+	.buddypress-wrap .tabbed-links ul li a,
+	.buddypress-wrap .tabbed-links ul li span:not(.count),
+	.buddypress-wrap .tabbed-links ol li a,
+	.buddypress-wrap .tabbed-links ol li span:not(.count) {
 		background: none;
 		border: none;
 		display: block;
 		padding: 4px 10px;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul li a:focus,
-	.buddypress-wrap .item-body .tabbed-links ul li a:hover,
-	.buddypress-wrap .item-body .tabbed-links ol li a:focus,
-	.buddypress-wrap .item-body .tabbed-links ol li a:hover {
+	.buddypress-wrap .tabbed-links ul li a:focus,
+	.buddypress-wrap .tabbed-links ul li a:hover,
+	.buddypress-wrap .tabbed-links ol li a:focus,
+	.buddypress-wrap .tabbed-links ol li a:hover {
 		background: none;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul li.current,
-	.buddypress-wrap .item-body .tabbed-links ol li.current {
+	.buddypress-wrap .tabbed-links ul li.current,
+	.buddypress-wrap .tabbed-links ol li.current {
 		border-color: #ccc #ccc #fff;
 		border-style: solid;
 		border-top-left-radius: 4px;
@@ -599,39 +599,39 @@ body.buddypress article.page > .entry-header .entry-title {
 		margin-bottom: -1px;
 		padding: 0 0.5em 1px;
 	}
-	.buddypress-wrap .item-body .tabbed-links ul li.current a,
-	.buddypress-wrap .item-body .tabbed-links ol li.current a {
+	.buddypress-wrap .tabbed-links ul li.current a,
+	.buddypress-wrap .tabbed-links ol li.current a {
 		color: #333;
 	}
-	.buddypress-wrap .item-body .bp-subnavs.tabbed-links > ul {
+	.buddypress-wrap .bp-subnavs.tabbed-links > ul {
 		margin-top: 0;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links {
+	.buddypress-wrap .bp-navs.tabbed-links {
 		background: none;
 		margin-top: 2px;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li a {
+	.buddypress-wrap .bp-navs.tabbed-links ul li a {
 		border-right: 0;
 		font-size: inherit;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.last {
+	.buddypress-wrap .bp-navs.tabbed-links ul li.last {
 		float: right;
 		margin: 0;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.last a {
+	.buddypress-wrap .bp-navs.tabbed-links ul li.last a {
 		margin-top: -0.5em;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li a,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li a:focus,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li a:hover,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.current a,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.current a:focus,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.current a:hover {
+	.buddypress-wrap .bp-navs.tabbed-links ul li a,
+	.buddypress-wrap .bp-navs.tabbed-links ul li a:focus,
+	.buddypress-wrap .bp-navs.tabbed-links ul li a:hover,
+	.buddypress-wrap .bp-navs.tabbed-links ul li.current a,
+	.buddypress-wrap .bp-navs.tabbed-links ul li.current a:focus,
+	.buddypress-wrap .bp-navs.tabbed-links ul li.current a:hover {
 		background: none;
 		border: 0;
 	}
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li a:active,
-	.buddypress-wrap .item-body .bp-navs.tabbed-links ul li.current a:active {
+	.buddypress-wrap .bp-navs.tabbed-links ul li a:active,
+	.buddypress-wrap .bp-navs.tabbed-links ul li.current a:active {
 		outline: none;
 	}
 }
diff --git src/bp-templates/bp-nouveau/includes/template-tags.php src/bp-templates/bp-nouveau/includes/template-tags.php
index 03583f5a3..c80b780b9 100644
--- src/bp-templates/bp-nouveau/includes/template-tags.php
+++ src/bp-templates/bp-nouveau/includes/template-tags.php
@@ -1514,16 +1514,18 @@ function bp_nouveau_single_item_nav_classes() {
 		// @todo wasn't able to get $customizer_option to pass a string to get_settings
 		// this is a temp workaround but differs from earlier dir approach- bad!
 		if ( bp_is_group() ) {
-			$nav_tabs = bp_nouveau_get_temporary_setting( 'group_nav_tabs', bp_nouveau_get_appearance_settings( 'group_nav_tabs' ) );
+			$nav_tabs = (int) bp_nouveau_get_temporary_setting( 'group_nav_tabs', bp_nouveau_get_appearance_settings( 'group_nav_tabs' ) );
 
 		} elseif ( bp_is_user() ) {
-			$nav_tabs = bp_nouveau_get_temporary_setting( 'user_nav_tabs', bp_nouveau_get_appearance_settings( 'user_nav_tabs' ) );
+			$nav_tabs = (int) bp_nouveau_get_temporary_setting( 'user_nav_tabs', bp_nouveau_get_appearance_settings( 'user_nav_tabs' ) );
 		}
 
 		if ( bp_is_group() && 1 === $nav_tabs) {
 			$classes[] = 'group-nav-tabs';
+			$classes[] = 'tabbed-links';
 		} elseif ( bp_is_user() && 1 === $nav_tabs ) {
 			$classes[] = 'user-nav-tabs';
+			$classes[] = 'tabbed-links';
 		}
 
 		if ( bp_is_user() ) {
@@ -1598,7 +1600,7 @@ function bp_nouveau_single_item_subnav_classes() {
 		}
 
 		$customizer_option = ( bp_is_user() )? 'user_subnav_tabs' : 'group_subnav_tabs';
-		$nav_tabs = bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
+		$nav_tabs = (int) bp_nouveau_get_temporary_setting( $customizer_option, bp_nouveau_get_appearance_settings( $customizer_option ) );
 
 		if ( bp_is_user() && 1 === $nav_tabs ) {
 			$classes[] = 'tabbed-links';
@@ -1643,7 +1645,7 @@ function bp_nouveau_groups_create_steps_classes() {
 	 */
 	function bp_nouveau_get_group_create_steps_classes() {
 		$classes  = array( 'bp-navs', 'group-create-links', 'no-ajax' );
-		$nav_tabs = bp_nouveau_get_temporary_setting( 'groups_create_tabs', bp_nouveau_get_appearance_settings( 'groups_create_tabs' ) );
+		$nav_tabs = (int) bp_nouveau_get_temporary_setting( 'groups_create_tabs', bp_nouveau_get_appearance_settings( 'groups_create_tabs' ) );
 
 		if ( 1 === $nav_tabs ) {
 			$classes[] = 'tabbed-links';