diff --git a/single.php b/single.php
index bd982141df..6ecb2efb0e 100644
--- a/single.php
+++ b/single.php
@@ -22,6 +22,7 @@
 				array(
 					'prev_text' => '<span class="nav-subtitle">' . esc_html__( 'Previous:', '_s' ) . '</span> <span class="nav-title">%title</span>',
 					'next_text' => '<span class="nav-subtitle">' . esc_html__( 'Next:', '_s' ) . '</span> <span class="nav-title">%title</span>',
+					'in_same_term' => true,
 				)
 			);
 
diff --git a/template-parts/content-page.php b/template-parts/content-page.php
index 3d34fc3467..8d7ac8ed70 100644
--- a/template-parts/content-page.php
+++ b/template-parts/content-page.php
@@ -12,9 +12,10 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
 		<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+		<?php _s_post_thumbnail(); ?>
 	</header><!-- .entry-header -->
 
-	<?php _s_post_thumbnail(); ?>
+	
 
 	<div class="entry-content">
 		<?php
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index b25dadf243..f5435073c2 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -21,10 +21,10 @@
 			?>
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
+		
+		<?php _s_post_thumbnail(); ?>
 	</header><!-- .entry-header -->
 
-	<?php _s_post_thumbnail(); ?>
-
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
 	</div><!-- .entry-summary -->
diff --git a/template-parts/content.php b/template-parts/content.php
index 4f7ee77dd3..15d83d29d6 100644
--- a/template-parts/content.php
+++ b/template-parts/content.php
@@ -27,26 +27,30 @@
 				?>
 			</div><!-- .entry-meta -->
 		<?php endif; ?>
+		
+		<?php _s_post_thumbnail(); ?>
 	</header><!-- .entry-header -->
 
-	<?php _s_post_thumbnail(); ?>
-
 	<div class="entry-content">
 		<?php
-		the_content(
-			sprintf(
-				wp_kses(
-					/* translators: %s: Name of current post. Only visible to screen readers */
-					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', '_s' ),
-					array(
-						'span' => array(
-							'class' => array(),
-						),
-					)
-				),
-				wp_kses_post( get_the_title() )
-			)
-		);
+		if ( !is_singular() && has_excerpt() ) :
+			the_excerpt();
+		else :
+			the_content(
+				sprintf(
+					wp_kses(
+						/* translators: %s: Name of current post. Only visible to screen readers */
+						__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', '_s' ),
+						array(
+							'span' => array(
+								'class' => array(),
+							),
+						)
+					),
+					wp_kses_post( get_the_title() )
+				)
+			);
+		endif;
 
 		wp_link_pages(
 			array(