Index: src/bp-templates/bp-legacy/buddypress/blogs/index.php
===================================================================
--- src/bp-templates/bp-legacy/buddypress/blogs/index.php	(revision 9854)
+++ src/bp-templates/bp-legacy/buddypress/blogs/index.php	(working copy)
@@ -8,7 +8,6 @@
 do_action( 'bp_before_directory_blogs' ); ?>
 
 <div id="buddypress">
-	<form action="" method="post" id="blogs-directory-form" class="dir-form">
 
 		<?php
 
@@ -25,88 +24,90 @@
 
 		</div><!-- #blog-dir-search -->
 
-		<div class="item-list-tabs" role="navigation">
-			<ul>
-				<li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>/<?php bp_blogs_root_slug(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>
+		<form action="" method="post" id="blogs-directory-form" class="dir-form">
 
-				<?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
+			<div class="item-list-tabs" role="navigation">
+				<ul>
+					<li class="selected" id="blogs-all"><a href="<?php bp_root_domain(); ?>/<?php bp_blogs_root_slug(); ?>"><?php printf( __( 'All Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count() ); ?></a></li>
 
-					<li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug(); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
+					<?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
 
-				<?php endif; ?>
+						<li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . bp_get_blogs_slug(); ?>"><?php printf( __( 'My Sites <span>%s</span>', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
 
-				<?php
+					<?php endif; ?>
 
-				/**
-				 * Fires inside the unordered list displaying blog types.
-				 *
-				 * @since BuddyPress (1.2.0)
-				 */
-				do_action( 'bp_blogs_directory_blog_types' ); ?>
+					<?php
 
-			</ul>
-		</div><!-- .item-list-tabs -->
+					/**
+					 * Fires inside the unordered list displaying blog types.
+					 *
+					 * @since BuddyPress (1.2.0)
+					 */
+					do_action( 'bp_blogs_directory_blog_types' ); ?>
 
-		<div class="item-list-tabs" id="subnav" role="navigation">
-			<ul>
+				</ul>
+			</div><!-- .item-list-tabs -->
 
-				<?php
+			<div class="item-list-tabs" id="subnav" role="navigation">
+				<ul>
 
-				/**
-				 * Fires inside the unordered list displaying blog sub-types.
-				 *
-				 * @since BuddyPress (1.5.0)
-				 */
-				do_action( 'bp_blogs_directory_blog_sub_types' ); ?>
+					<?php
 
-				<li id="blogs-order-select" class="last filter">
+					/**
+					 * Fires inside the unordered list displaying blog sub-types.
+					 *
+					 * @since BuddyPress (1.5.0)
+					 */
+					do_action( 'bp_blogs_directory_blog_sub_types' ); ?>
 
-					<label for="blogs-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
-					<select id="blogs-order-by">
-						<option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
-						<option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option>
-						<option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+					<li id="blogs-order-select" class="last filter">
 
-						<?php
+						<label for="blogs-order-by"><?php _e( 'Order By:', 'buddypress' ); ?></label>
+						<select id="blogs-order-by">
+							<option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
+							<option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option>
+							<option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
 
-						/**
-						 * Fires inside the select input listing blogs orderby options.
-						 *
-						 * @since BuddyPress (1.2.0)
-						 */
-						do_action( 'bp_blogs_directory_order_options' ); ?>
+							<?php
 
-					</select>
-				</li>
-			</ul>
-		</div>
+							/**
+							 * Fires inside the select input listing blogs orderby options.
+							 *
+							 * @since BuddyPress (1.2.0)
+							 */
+							do_action( 'bp_blogs_directory_order_options' ); ?>
 
-		<div id="blogs-dir-list" class="blogs dir-list">
+						</select>
+					</li>
+				</ul>
+			</div>
 
-			<?php bp_get_template_part( 'blogs/blogs-loop' ); ?>
+			<div id="blogs-dir-list" class="blogs dir-list">
 
-		</div><!-- #blogs-dir-list -->
+				<?php bp_get_template_part( 'blogs/blogs-loop' ); ?>
 
-		<?php
+			</div><!-- #blogs-dir-list -->
 
-		/**
-		 * Fires inside and displays the blogs content.
-		 *
-		 * @since BuddyPress (1.1.0)
-		 */
-		do_action( 'bp_directory_blogs_content' ); ?>
+			<?php
 
-		<?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ); ?>
+			/**
+			 * Fires inside and displays the blogs content.
+			 *
+			 * @since BuddyPress (1.1.0)
+			 */
+			do_action( 'bp_directory_blogs_content' ); ?>
 
-		<?php
+			<?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ); ?>
 
-		/**
-		 * Fires after the display of the blogs listing content.
-		 *
-		 * @since BuddyPress (1.1.0)
-		 */
-		do_action( 'bp_after_directory_blogs_content' ); ?>
+			<?php
 
+			/**
+			 * Fires after the display of the blogs listing content.
+			 *
+			 * @since BuddyPress (1.1.0)
+			 */
+			do_action( 'bp_after_directory_blogs_content' ); ?>
+
 	</form><!-- #blogs-directory-form -->
 
 	<?php