diff --git a/source/wp-content/themes/wporg-developer/header.php b/source/wp-content/themes/wporg-developer/header.php
index 2dfec1192..da59fd934 100644
--- a/source/wp-content/themes/wporg-developer/header.php
+++ b/source/wp-content/themes/wporg-developer/header.php
@@ -9,13 +9,16 @@
 
 echo do_blocks( '<!-- wp:wporg/global-header /-->' );
 
+$show_search = DevHub\should_show_search_bar();
+
 ?>
 
 <header id="masthead" class="site-header<?php if ( is_front_page() ) { echo ' home'; } ?>" role="banner">
 	<?php if ( function_exists( 'wporg_is_handbook' ) && wporg_is_handbook() && ! is_search() ) : ?>
 		<a href="#" id="secondary-toggle" onclick="return false;"><strong><?php _e( 'Menu', 'wporg' ); ?></strong></a>
 	<?php endif; ?>
-	<div class="site-branding">
+	<div class="site-branding <?php echo $show_search ?  'has-search-form': '' ?> ">
+
 		<h1 class="site-title">
 			<a href="<?php echo esc_url( DevHub\get_site_section_url() ); ?>" rel="home"><?php echo DevHub\get_site_section_title(); ?></a>
 		</h1>
@@ -24,16 +27,22 @@
 		<p class="site-description"><?php _e( 'The freedom to build.', 'wporg' ); ?></p>
 		<?php endif; ?>
 
-		<nav id="site-navigation" class="main-navigation" role="navigation">
-			<button class="menu-toggle dashicons dashicons-arrow-down-alt2" aria-controls="primary-menu" aria-expanded="false" aria-label="<?php esc_attr_e( 'Primary Menu', 'wporg' ); ?>"></button>
-			<?php
-			$active_menu = is_post_type_archive( 'command' ) || is_singular( 'command' ) ? 'devhub-cli-menu' : 'devhub-menu';
-			wp_nav_menu( array(
-				'theme_location'  => $active_menu,
-				'container_class' => 'menu-container',
-				'container_id'    => 'primary-menu',
-			) ); ?>
-		</nav>
+		<?php if ( $show_search ) : ?>
+			<div class="site-breadcrumb">
+				<?php get_search_form( array( 'showFilters' => false ) ); ?>
+			</div>
+		<?php else: ?>
+			<nav id="site-navigation" class="main-navigation" role="navigation">
+				<button class="menu-toggle dashicons dashicons-arrow-down-alt2" aria-controls="primary-menu" aria-expanded="false" aria-label="<?php esc_attr_e( 'Primary Menu', 'wporg' ); ?>"></button>
+				<?php
+				$active_menu = is_post_type_archive( 'command' ) || is_singular( 'command' ) ? 'devhub-cli-menu' : 'devhub-menu';
+				wp_nav_menu( array(
+					'theme_location'  => $active_menu,
+					'container_class' => 'menu-container',
+					'container_id'    => 'primary-menu',
+				) ); ?>
+			</nav>
+		<?php endif; ?>
 	</div>
 </header><!-- #masthead -->
 
@@ -41,16 +50,4 @@
 	<a href="#main" class="screen-reader-text"><?php _e( 'Skip to content', 'wporg' ); ?></a>
 
 	<?php do_action( 'before' ); ?>
-	<?php
-	if ( DevHub\should_show_search_bar() ) : ?>
-		<div id="inner-search">
-			<?php get_search_form(); ?>
-			<div id="inner-search-icon-container">
-				<div id="inner-search-icon">
-					<div class="dashicons dashicons-search"><span class="screen-reader-text"><?php _e( 'Search', 'wporg' ); ?></span></div>
-				</div>
-			</div>
-		</div>
-
-	<?php endif; ?>
 	<div id="content" class="site-content">
diff --git a/source/wp-content/themes/wporg-developer/inc/breadcrumb-trail.php b/source/wp-content/themes/wporg-developer/inc/breadcrumb-trail.php
index 3229fb2bb..1713a936c 100644
--- a/source/wp-content/themes/wporg-developer/inc/breadcrumb-trail.php
+++ b/source/wp-content/themes/wporg-developer/inc/breadcrumb-trail.php
@@ -89,7 +89,7 @@ public function __construct( $args = array() ) {
 			'network'         => false,
 			//'show_edit_link'  => false,
 			'show_title'      => true,
-			'show_browse'     => true,
+			'show_browse'     => false,
 			'echo'            => true,
 
 			/* Post taxonomy (examples follow). */
diff --git a/source/wp-content/themes/wporg-developer/scss/main.scss b/source/wp-content/themes/wporg-developer/scss/main.scss
index 47eb4b905..12c9b78d2 100644
--- a/source/wp-content/themes/wporg-developer/scss/main.scss
+++ b/source/wp-content/themes/wporg-developer/scss/main.scss
@@ -1802,6 +1802,12 @@
 	max-width: 960px;
 	padding: 0 10px;
 	position: relative;
+
+	&.has-search-form {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;	
+	}
 }
 
 .site-title {
diff --git a/source/wp-content/themes/wporg-developer/searchform.php b/source/wp-content/themes/wporg-developer/searchform.php
index 5bd595eb2..4619519f0 100644
--- a/source/wp-content/themes/wporg-developer/searchform.php
+++ b/source/wp-content/themes/wporg-developer/searchform.php
@@ -4,8 +4,15 @@
  *
  * @package wporg-developer
  */
+
+$showFilters = true;
+
+if(array_key_exists('showFilters', $args)){
+	$showFilters = $args['showFilters']; 
+ }
+
 ?>
-<div class="search-section section clear <?php if ( ! ( is_page( 'reference' ) || is_search() || is_404() ) ) { echo 'hide-if-js'; } ?>">
+<div class="search-section section clear">
 
 	<?php
 		$is_handbook = $GLOBALS['wp_query']->is_handbook;
@@ -22,7 +29,7 @@
 		<label for="search-field" class="screen-reader-text"><?php _ex( 'Search for:', 'label', 'wporg' ); ?></label>
 		<input type="text" id="search-field" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'wporg' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
 		<button class="button button-primary button-search"><i class="dashicons dashicons-search"></i><span class="screen-reader-text"><?php _e( 'Search plugins', 'wporg' ); ?></span></button>
-	<?php if ( $filters ) : ?>
+	<?php if ( $filters && $showFilters ) : ?>
 
 		<div class="search-post-type">
 			<span><?php _e( 'Filter by type:', 'wporg' ); ?></span>
diff --git a/source/wp-content/themes/wporg-developer/stylesheets/main.css b/source/wp-content/themes/wporg-developer/stylesheets/main.css
index 36724deea..beb007e0c 100644
--- a/source/wp-content/themes/wporg-developer/stylesheets/main.css
+++ b/source/wp-content/themes/wporg-developer/stylesheets/main.css
@@ -2469,6 +2469,12 @@ img {
   position: relative;
 }
 
+.site-branding.has-search-form {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 .site-title {
   line-height: 1;
   margin: 0;