Index: bp-friends.php
===================================================================
--- bp-friends.php	(revision 639)
+++ bp-friends.php	(working copy)
@@ -94,7 +94,7 @@
 	$friends_link = $bp['loggedin_domain'] . $bp['friends']['slug'] . '/';
 	
 	/* Add the subnav items to the friends nav item */
-	bp_core_add_subnav_item( $bp['friends']['slug'], 'my-friends', __('My Friends', 'buddypress'), $friends_link, 'friends_screen_my_friends' );
+	bp_core_add_subnav_item( $bp['friends']['slug'], 'friends-my-friends', __('My Friends', 'buddypress'), $friends_link, 'friends_screen_my_friends' );
 	bp_core_add_subnav_item( $bp['friends']['slug'], 'requests', __('Requests', 'buddypress'), $friends_link, 'friends_screen_requests', false, bp_is_home() );
 	//bp_core_add_subnav_item( $bp['friends']['slug'], 'invite-friend', __('Invite Friends', 'buddypress'), $friends_link, 'friends_screen_invite_friends' );
 	
@@ -567,4 +567,4 @@
 add_action( 'delete_user', 'bp_core_remove_data', 1 );
 
 
-?>
\ No newline at end of file
+?>
Index: bp-activity.php
===================================================================
--- bp-activity.php	(revision 639)
+++ bp-activity.php	(working copy)
@@ -169,7 +169,7 @@
 	
 	/* Add the subnav items to the activity nav item */
 	bp_core_add_subnav_item( $bp['activity']['slug'], 'just-me', __('Just Me', 'buddypress'), $activity_link, 'bp_activity_screen_my_activity' );
-	bp_core_add_subnav_item( $bp['activity']['slug'], 'my-friends', __('My Friends', 'buddypress'), $activity_link, 'bp_activity_screen_friends_activity', false, bp_is_home() );
+	bp_core_add_subnav_item( $bp['activity']['slug'], 'activity-my-friends', __('My Friends', 'buddypress'), $activity_link, 'bp_activity_screen_friends_activity', false, bp_is_home() );
 	
 	if ( $bp['current_component'] == $bp['activity']['slug'] ) {
 		if ( bp_is_home() ) {
@@ -281,4 +281,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
Index: bp-core/css/admin-bar.css
===================================================================
--- bp-core/css/admin-bar.css	(revision 639)
+++ bp-core/css/admin-bar.css	(working copy)
@@ -210,7 +210,7 @@
 	height: 55px !important;
 }
 
-#wp-admin-bar ul li#notifications_menu a span {
+#wp-admin-bar ul li#bp-admin-notifications_menu a span {
 	background: #fff !important;
 	padding: 0 6px !important;
 	color: #555 !important;
@@ -220,4 +220,4 @@
 	-khtml-border-radius: 2px !important;
 	-webkit-border-radius: 2px !important;
 	margin-left: 2px !important;
-} 
\ No newline at end of file
+} 
Index: bp-core/bp-core-adminbar.php
===================================================================
--- bp-core/bp-core-adminbar.php	(revision 639)
+++ bp-core/bp-core-adminbar.php	(working copy)
@@ -55,14 +55,14 @@
 			$alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
 			
 			echo '<li' . $alt . '>';
-			echo '<a id="' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
+			echo '<a id="' . 'bp-admin-'.$nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
 
 			if ( is_array( $bp['bp_options_nav'][$nav_item['css_id']] ) ) {
 				echo '<ul>';
 				$sub_counter = 0;
 				foreach( $bp['bp_options_nav'][$nav_item['css_id']] as $subnav_item ) {
 					$alt = ( $sub_counter % 2 == 0 ) ? ' class="alt"' : '';
-					echo '<li' . $alt . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';				
+					echo '<li' . $alt . '><a id="' . 'bp-admin-'. $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';				
 					$sub_counter++;
 				}
 				echo '</ul>';
@@ -75,7 +75,7 @@
 	
 		$alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
 	
-		echo '<li' . $alt . '><a id="logout" href="' . site_url() . '/wp-login.php?action=logout">' . __('Log Out', 'buddypress') . '</a></li>';
+		echo '<li' . $alt . '><a id="bp-admin-logout" href="' . site_url() . '/wp-login.php?action=logout">' . __('Log Out', 'buddypress') . '</a></li>';
 		echo '</ul>';
 		echo '</li>';
 	}
@@ -158,7 +158,7 @@
 	if ( is_user_logged_in() ) {
 		global $bp;
 		
-		echo '<li id="notifications_menu"><a href="' . $bp['loggedin_domain'] . '">';
+		echo '<li id="bp-admin-notifications_menu"><a href="' . $bp['loggedin_domain'] . '">';
 		_e( 'Notifications', 'buddypress' );
 	
 		if ( $notifications = bp_core_get_notifications_for_user( $bp['loggedin_userid']) ) { ?>
@@ -232,14 +232,13 @@
 
 			<?php if ( function_exists('bp_blogs_install') ) : ?>
 			<li><a href="<?php echo $bp['root_domain'] . '/' . $bp['blogs']['slug'] . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
-			
 			<?php endif; ?>
 		</ul>
 	</li>
 	<?php
 	
-	echo '</ul>';
-	echo '</div>';
+	// echo '</ul>';
+	// echo '</div>';
 
 	$doing_admin_bar = false;
 }
@@ -254,4 +253,4 @@
 
 add_action( 'wp_footer', 'bp_core_admin_bar' );
 
-?>
\ No newline at end of file
+?>
Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php	(revision 639)
+++ bp-core/bp-core-templatetags.php	(working copy)
@@ -49,7 +49,7 @@
 		}
 		
 		/* echo out the final list item */
-		echo '<li' . $selected . '><a id="' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>';
+		echo '<li' . $selected . '><a id="' . 'user-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a></li>';
 	}
 	
 	/* Always add a log out list item to the end of the navigation */