diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index 31fd4843ca..28d048f44b 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -10,6 +10,10 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
+		<div class="entry-media">
+			<?php the_image(); ?>
+		</div>
+
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
@@ -20,7 +24,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index 97265b9455..bee5da1567 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -10,6 +10,10 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
+		<div class="entry-media">
+			<?php the_video(); ?>
+		</div>
+
 		<?php if ( is_single() ) : ?>
 		<h1 class="entry-title"><?php the_title(); ?></h1>
 		<?php else : ?>
@@ -20,7 +24,7 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
-		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
+		<?php the_extra_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/style.css b/wp-content/themes/twentythirteen/style.css
index a16d56a832..48a1a2f5b7 100644
--- a/wp-content/themes/twentythirteen/style.css
+++ b/wp-content/themes/twentythirteen/style.css
@@ -1659,6 +1659,15 @@ footer.entry-meta {
 	font-weight: bold;
 }
 
+.format-image .entry-header {
+	max-width: 724px;
+}
+
+.format-image .entry-header img {
+	height: auto;
+	max-width: 724px;
+}
+
 .format-image .entry-content .size-full {
 	margin: 0 -60px;
 	max-width: 724px;
@@ -1873,6 +1882,10 @@ footer.entry-meta {
 	font-weight: 400;
 }
 
+.format-video .entry-header {
+	max-width: 724px;
+}
+
 .format-video .entry-meta {
 	color: #220e10;
 }