diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/media-template.php
--- a/wp/wp-includes/media-template.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/media-template.php	Tue Dec 15 13:49:49 2020 +0100
@@ -152,49 +152,49 @@
  * Prints the templates used in the media manager.
  *
  * @since 3.5.0
- *
- * @global bool $is_IE
  */
 function wp_print_media_templates() {
-	global $is_IE;
 	$class = 'media-modal wp-core-ui';
-	if ( $is_IE && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== false ) {
-		$class .= ' ie7';
-	}
 
 	$alt_text_description = sprintf(
-		/* translators: 1: link to tutorial, 2: additional link attributes, 3: accessibility text */
+		/* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
 		__( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
 		esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
 		'target="_blank" rel="noopener noreferrer"',
 		sprintf(
 			'<span class="screen-reader-text"> %s</span>',
-			/* translators: accessibility text */
+			/* translators: Accessibility text. */
 			__( '(opens in a new tab)' )
 		)
 	);
 	?>
-	<!--[if lte IE 8]>
-	<style>
-		.attachment:focus {
-			outline: #1e8cbe solid;
-		}
-		.selected.attachment {
-			outline: #1e8cbe solid;
-		}
-	</style>
-	<![endif]-->
+
+	<?php // Template for the media frame: used both in the media grid and in the media modal. ?>
 	<script type="text/html" id="tmpl-media-frame">
 		<div class="media-frame-title" id="media-frame-title"></div>
+		<h2 class="media-frame-menu-heading"><?php _ex( 'Actions', 'media modal menu actions' ); ?></h2>
+		<button type="button" class="button button-link media-frame-menu-toggle" aria-expanded="false">
+			<?php _ex( 'Menu', 'media modal menu' ); ?>
+			<span class="dashicons dashicons-arrow-down" aria-hidden="true"></span>
+		</button>
 		<div class="media-frame-menu"></div>
-		<div class="media-frame-router"></div>
-		<div class="media-frame-content"></div>
+		<div class="media-frame-tab-panel">
+			<div class="media-frame-router"></div>
+			<div class="media-frame-content"></div>
+		</div>
+		<h2 class="media-frame-actions-heading screen-reader-text">
+		<?php
+			/* translators: Accessibility text. */
+			_e( 'Selected media actions' );
+		?>
+		</h2>
 		<div class="media-frame-toolbar"></div>
 		<div class="media-frame-uploader"></div>
 	</script>
 
+	<?php // Template for the media modal. ?>
 	<script type="text/html" id="tmpl-media-modal">
-		<div tabindex="0" class="<?php echo $class; ?>" role="dialog" aria-modal="true" aria-labelledby="media-frame-title">
+		<div tabindex="0" class="<?php echo $class; ?>" role="dialog" aria-labelledby="media-frame-title">
 			<# if ( data.hasCloseButton ) { #>
 				<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></span></button>
 			<# } #>
@@ -203,18 +203,21 @@
 		<div class="media-modal-backdrop"></div>
 	</script>
 
+	<?php // Template for the window uploader, used for example in the media grid. ?>
 	<script type="text/html" id="tmpl-uploader-window">
 		<div class="uploader-window-content">
-			<h1><?php _e( 'Drop files to upload' ); ?></h1>
+			<div class="uploader-editor-title"><?php _e( 'Drop files to upload' ); ?></div>
 		</div>
 	</script>
 
+	<?php // Template for the editor uploader. ?>
 	<script type="text/html" id="tmpl-uploader-editor">
 		<div class="uploader-editor-content">
 			<div class="uploader-editor-title"><?php _e( 'Drop files to upload' ); ?></div>
 		</div>
 	</script>
 
+	<?php // Template for the inline uploader, used for example in the Media Library admin page - Add New. ?>
 	<script type="text/html" id="tmpl-uploader-inline">
 		<# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
 		<# if ( data.canClose ) { #>
@@ -225,17 +228,29 @@
 			<h2 class="upload-message">{{ data.message }}</h2>
 		<# } #>
 		<?php if ( ! _device_can_upload() ) : ?>
-			<h2 class="upload-instructions"><?php printf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ); ?></h2>
+			<div class="upload-ui">
+				<h2 class="upload-instructions"><?php _e( 'Your browser cannot upload files' ); ?></h2>
+				<p>
+				<?php
+					printf(
+						/* translators: %s: https://apps.wordpress.org/ */
+						__( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ),
+						'https://apps.wordpress.org/'
+					);
+				?>
+				</p>
+			</div>
 		<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
-			<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
-			<?php
-			/** This action is documented in wp-admin/includes/media.php */
-			do_action( 'upload_ui_over_quota' );
-			?>
-
+			<div class="upload-ui">
+				<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
+				<?php
+				/** This action is documented in wp-admin/includes/media.php */
+				do_action( 'upload_ui_over_quota' );
+				?>
+			</div>
 		<?php else : ?>
 			<div class="upload-ui">
-				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h2>
+				<h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files to upload' ); ?></h2>
 				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
 				<button type="button" class="browser button button-hero"><?php _e( 'Select Files' ); ?></button>
 			</div>
@@ -245,17 +260,17 @@
 			<div class="post-upload-ui">
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'pre-upload-ui' );
+				do_action( 'pre-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'pre-plupload-upload-ui' );
+				do_action( 'pre-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 
 				if ( 10 === remove_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' ) ) {
 					/** This action is documented in wp-admin/includes/media.php */
-					do_action( 'post-plupload-upload-ui' );
+					do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 					add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
 				} else {
 					/** This action is documented in wp-admin/includes/media.php */
-					do_action( 'post-plupload-upload-ui' );
+					do_action( 'post-plupload-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 				}
 
 				$max_upload_size = wp_max_upload_size();
@@ -266,14 +281,18 @@
 
 				<p class="max-upload-size">
 				<?php
-					printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
+					printf(
+						/* translators: %s: Maximum allowed file size. */
+						__( 'Maximum upload file size: %s.' ),
+						esc_html( size_format( $max_upload_size ) )
+					);
 				?>
 				</p>
 
 				<# if ( data.suggestedWidth && data.suggestedHeight ) { #>
 					<p class="suggested-dimensions">
 						<?php
-							/* translators: 1: suggested width number, 2: suggested height number. */
+							/* translators: 1: Suggested width number, 2: Suggested height number. */
 							printf( __( 'Suggested image dimensions: %1$s by %2$s pixels.' ), '{{data.suggestedWidth}}', '{{data.suggestedHeight}}' );
 						?>
 					</p>
@@ -281,22 +300,24 @@
 
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'post-upload-ui' );
+				do_action( 'post-upload-ui' ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
 				?>
 			</div>
 		<?php endif; ?>
 		</div>
 	</script>
 
+	<?php // Template for the view switchers, used for example in the Media Grid. ?>
 	<script type="text/html" id="tmpl-media-library-view-switcher">
 		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-list">
-			<span class="screen-reader-text"><?php _e( 'List View' ); ?></span>
+			<span class="screen-reader-text"><?php _e( 'List view' ); ?></span>
 		</a>
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-grid current">
-			<span class="screen-reader-text"><?php _e( 'Grid View' ); ?></span>
+		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-grid current" aria-current="page">
+			<span class="screen-reader-text"><?php _e( 'Grid view' ); ?></span>
 		</a>
 	</script>
 
+	<?php // Template for the uploading status UI. ?>
 	<script type="text/html" id="tmpl-uploader-status">
 		<h2><?php _e( 'Uploading' ); ?></h2>
 		<button type="button" class="button-link upload-dismiss-errors"><span class="screen-reader-text"><?php _e( 'Dismiss Errors' ); ?></span></button>
@@ -312,23 +333,27 @@
 		<div class="upload-errors"></div>
 	</script>
 
+	<?php // Template for the uploading status errors. ?>
 	<script type="text/html" id="tmpl-uploader-status-error">
 		<span class="upload-error-filename">{{{ data.filename }}}</span>
 		<span class="upload-error-message">{{ data.message }}</span>
 	</script>
 
+	<?php // Template for the Attachment Details layout in the media browser. ?>
 	<script type="text/html" id="tmpl-edit-attachment-frame">
 		<div class="edit-media-header">
-			<button class="left dashicons <# if ( ! data.hasPrevious ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button>
-			<button class="right dashicons <# if ( ! data.hasNext ) { #> disabled <# } #>"><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button>
+			<button class="left dashicons"<# if ( ! data.hasPrevious ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit previous media item' ); ?></span></button>
+			<button class="right dashicons"<# if ( ! data.hasNext ) { #> disabled<# } #>><span class="screen-reader-text"><?php _e( 'Edit next media item' ); ?></span></button>
 			<button type="button" class="media-modal-close"><span class="media-modal-icon"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></span></button>
 		</div>
 		<div class="media-frame-title"></div>
 		<div class="media-frame-content"></div>
 	</script>
 
+	<?php // Template for the Attachment Details two columns layout. ?>
 	<script type="text/html" id="tmpl-attachment-details-two-column">
 		<div class="attachment-media-view {{ data.orientation }}">
+			<h2 class="screen-reader-text"><?php _e( 'Attachment Preview' ); ?></h2>
 			<div class="thumbnail thumbnail-{{ data.type }}">
 				<# if ( data.uploading ) { #>
 					<div class="media-progress-bar"><div></div></div>
@@ -368,17 +393,18 @@
 					<# if ( 'image' === data.type && ! data.uploading && data.sizes && data.can.save ) { #>
 					<button type="button" class="button edit-attachment"><?php _e( 'Edit Image' ); ?></button>
 					<# } else if ( 'pdf' === data.subtype && data.sizes ) { #>
-					<?php _e( 'Document Preview' ); ?>
+					<p><?php _e( 'Document Preview' ); ?></p>
 					<# } #>
 				</div>
 			</div>
 		</div>
 		<div class="attachment-info">
-			<span class="settings-save-status">
+			<span class="settings-save-status" role="status">
 				<span class="spinner"></span>
 				<span class="saved"><?php esc_html_e( 'Saved.' ); ?></span>
 			</span>
 			<div class="details">
+				<h2 class="screen-reader-text"><?php _e( 'Details' ); ?></h2>
 				<div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
 				<div class="filename"><strong><?php _e( 'File type:' ); ?></strong> {{ data.mime }}</div>
 				<div class="uploaded"><strong><?php _e( 'Uploaded on:' ); ?></strong> {{ data.dateFormatted }}</div>
@@ -388,11 +414,16 @@
 					<# if ( data.width && data.height ) { #>
 						<div class="dimensions"><strong><?php _e( 'Dimensions:' ); ?></strong>
 							<?php
-							/* translators: 1: a number of pixels wide, 2: a number of pixels tall. */
+							/* translators: 1: A number of pixels wide, 2: A number of pixels tall. */
 							printf( __( '%1$s by %2$s pixels' ), '{{ data.width }}', '{{ data.height }}' );
 							?>
 						</div>
 					<# } #>
+
+					<# if ( data.originalImageURL && data.originalImageName ) { #>
+						<?php _e( 'Original image:' ); ?>
+						<a href="{{ data.originalImageURL }}">{{data.originalImageName}}</a>
+					<# } #>
 				<# } #>
 
 				<# if ( data.fileLength && data.fileLengthHumanReadable ) { #>
@@ -421,17 +452,17 @@
 			<div class="settings">
 				<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
 				<# if ( 'image' === data.type ) { #>
-					<label class="setting" data-setting="alt">
-						<span class="name"><?php _e( 'Alternative Text' ); ?></span>
-						<input type="text" value="{{ data.alt }}" aria-describedby="alt-text-description" {{ maybeReadOnly }} />
-					</label>
+					<span class="setting has-description" data-setting="alt">
+						<label for="attachment-details-two-column-alt-text" class="name"><?php _e( 'Alternative Text' ); ?></label>
+						<input type="text" id="attachment-details-two-column-alt-text" value="{{ data.alt }}" aria-describedby="alt-text-description" {{ maybeReadOnly }} />
+					</span>
 					<p class="description" id="alt-text-description"><?php echo $alt_text_description; ?></p>
 				<# } #>
 				<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
-				<label class="setting" data-setting="title">
-					<span class="name"><?php _e( 'Title' ); ?></span>
-					<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
-				</label>
+				<span class="setting" data-setting="title">
+					<label for="attachment-details-two-column-title" class="name"><?php _e( 'Title' ); ?></label>
+					<input type="text" id="attachment-details-two-column-title" value="{{ data.title }}" {{ maybeReadOnly }} />
+				</span>
 				<?php endif; ?>
 				<# if ( 'audio' === data.type ) { #>
 				<?php
@@ -440,38 +471,42 @@
 					'album'  => __( 'Album' ),
 				) as $key => $label ) :
 					?>
-				<label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
-					<span class="name"><?php echo $label; ?></span>
-					<input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
-				</label>
+				<span class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
+					<label for="attachment-details-two-column-<?php echo esc_attr( $key ); ?>" class="name"><?php echo $label; ?></label>
+					<input type="text" id="attachment-details-two-column-<?php echo esc_attr( $key ); ?>" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
+				</span>
 				<?php endforeach; ?>
 				<# } #>
-				<label class="setting" data-setting="caption">
-					<span class="name"><?php _e( 'Caption' ); ?></span>
-					<textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
-				</label>
-				<label class="setting" data-setting="description">
-					<span class="name"><?php _e( 'Description' ); ?></span>
-					<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
-				</label>
-				<div class="setting">
+				<span class="setting" data-setting="caption">
+					<label for="attachment-details-two-column-caption" class="name"><?php _e( 'Caption' ); ?></label>
+					<textarea id="attachment-details-two-column-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
+				</span>
+				<span class="setting" data-setting="description">
+					<label for="attachment-details-two-column-description" class="name"><?php _e( 'Description' ); ?></label>
+					<textarea id="attachment-details-two-column-description" {{ maybeReadOnly }}>{{ data.description }}</textarea>
+				</span>
+				<span class="setting">
 					<span class="name"><?php _e( 'Uploaded By' ); ?></span>
 					<span class="value">{{ data.authorName }}</span>
-				</div>
+				</span>
 				<# if ( data.uploadedToTitle ) { #>
-					<div class="setting">
+					<span class="setting">
 						<span class="name"><?php _e( 'Uploaded To' ); ?></span>
 						<# if ( data.uploadedToLink ) { #>
 							<span class="value"><a href="{{ data.uploadedToLink }}">{{ data.uploadedToTitle }}</a></span>
 						<# } else { #>
 							<span class="value">{{ data.uploadedToTitle }}</span>
 						<# } #>
-					</div>
+					</span>
 				<# } #>
-				<label class="setting" data-setting="url">
-					<span class="name"><?php _e( 'Copy Link' ); ?></span>
-					<input type="text" value="{{ data.url }}" readonly />
-				</label>
+				<span class="setting" data-setting="url">
+					<label for="attachment-details-two-column-copy-link" class="name"><?php _e( 'File URL:' ); ?></label>
+					<input type="text" class="attachment-details-copy-link" id="attachment-details-two-column-copy-link" value="{{ data.url }}" readonly />
+					<span class="copy-to-clipboard-container">
+						<button type="button" class="button button-small copy-attachment-url" data-clipboard-target="#attachment-details-two-column-copy-link"><?php _e( 'Copy URL' ); ?></button>
+						<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
+					</span>
+				</span>
 				<div class="attachment-compat"></div>
 			</div>
 
@@ -488,14 +523,14 @@
 							<button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
 						<# } #>
 					<?php else : ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>
 					<?php endif; ?>
 				<# } #>
 			</div>
-
 		</div>
 	</script>
 
+	<?php // Template for the Attachment "thumbnails" in the Media Grid. ?>
 	<script type="text/html" id="tmpl-attachment">
 		<div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
 			<div class="thumbnail">
@@ -532,24 +567,29 @@
 		if ( data.describe ) {
 			if ( 'image' === data.type ) { #>
 				<input type="text" value="{{ data.caption }}" class="describe" data-setting="caption"
-					placeholder="<?php esc_attr_e( 'Caption this image&hellip;' ); ?>" {{ maybeReadOnly }} />
+					aria-label="<?php esc_attr_e( 'Caption' ); ?>"
+					placeholder="<?php esc_attr_e( 'Caption&hellip;' ); ?>" {{ maybeReadOnly }} />
 			<# } else { #>
 				<input type="text" value="{{ data.title }}" class="describe" data-setting="title"
 					<# if ( 'video' === data.type ) { #>
-						placeholder="<?php esc_attr_e( 'Describe this video&hellip;' ); ?>"
+						aria-label="<?php esc_attr_e( 'Video title' ); ?>"
+						placeholder="<?php esc_attr_e( 'Video title&hellip;' ); ?>"
 					<# } else if ( 'audio' === data.type ) { #>
-						placeholder="<?php esc_attr_e( 'Describe this audio file&hellip;' ); ?>"
+						aria-label="<?php esc_attr_e( 'Audio title' ); ?>"
+						placeholder="<?php esc_attr_e( 'Audio title&hellip;' ); ?>"
 					<# } else { #>
-						placeholder="<?php esc_attr_e( 'Describe this media file&hellip;' ); ?>"
+						aria-label="<?php esc_attr_e( 'Media title' ); ?>"
+						placeholder="<?php esc_attr_e( 'Media title&hellip;' ); ?>"
 					<# } #> {{ maybeReadOnly }} />
 			<# }
 		} #>
 	</script>
 
+	<?php // Template for the Attachment details, used for example in the sidebar. ?>
 	<script type="text/html" id="tmpl-attachment-details">
 		<h2>
 			<?php _e( 'Attachment Details' ); ?>
-			<span class="settings-save-status">
+			<span class="settings-save-status" role="status">
 				<span class="spinner"></span>
 				<span class="saved"><?php esc_html_e( 'Saved.' ); ?></span>
 			</span>
@@ -573,12 +613,17 @@
 					<# if ( data.width && data.height ) { #>
 						<div class="dimensions">
 							<?php
-							/* translators: 1: a number of pixels wide, 2: a number of pixels tall. */
+							/* translators: 1: A number of pixels wide, 2: A number of pixels tall. */
 							printf( __( '%1$s by %2$s pixels' ), '{{ data.width }}', '{{ data.height }}' );
 							?>
 						</div>
 					<# } #>
 
+					<# if ( data.originalImageURL && data.originalImageName ) { #>
+						<?php _e( 'Original image:' ); ?>
+						<a href="{{ data.originalImageURL }}">{{data.originalImageName}}</a>
+					<# } #>
+
 					<# if ( data.can.save && data.sizes ) { #>
 						<a class="edit-attachment" href="{{ data.editLink }}&amp;image-editor" target="_blank"><?php _e( 'Edit Image' ); ?></a>
 					<# } #>
@@ -599,7 +644,7 @@
 						<button type="button" class="button-link trash-attachment"><?php _e( 'Move to Trash' ); ?></button>
 					<# } #>
 					<?php else : ?>
-						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
+						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete permanently' ); ?></button>
 					<?php endif; ?>
 				<# } #>
 
@@ -610,20 +655,19 @@
 				</div>
 			</div>
 		</div>
-
 		<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
 		<# if ( 'image' === data.type ) { #>
-			<label class="setting" data-setting="alt">
-				<span class="name"><?php _e( 'Alt Text' ); ?></span>
-				<input type="text" value="{{ data.alt }}" aria-describedby="alt-text-description" {{ maybeReadOnly }} />
-			</label>
+			<span class="setting has-description" data-setting="alt">
+				<label for="attachment-details-alt-text" class="name"><?php _e( 'Alt Text' ); ?></label>
+				<input type="text" id="attachment-details-alt-text" value="{{ data.alt }}" aria-describedby="alt-text-description" {{ maybeReadOnly }} />
+			</span>
 			<p class="description" id="alt-text-description"><?php echo $alt_text_description; ?></p>
 		<# } #>
 		<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
-		<label class="setting" data-setting="title">
-			<span class="name"><?php _e( 'Title' ); ?></span>
-			<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
-		</label>
+		<span class="setting" data-setting="title">
+			<label for="attachment-details-title" class="name"><?php _e( 'Title' ); ?></label>
+			<input type="text" id="attachment-details-title" value="{{ data.title }}" {{ maybeReadOnly }} />
+		</span>
 		<?php endif; ?>
 		<# if ( 'audio' === data.type ) { #>
 		<?php
@@ -632,26 +676,31 @@
 			'album'  => __( 'Album' ),
 		) as $key => $label ) :
 			?>
-		<label class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
-			<span class="name"><?php echo $label; ?></span>
-			<input type="text" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
-		</label>
+		<span class="setting" data-setting="<?php echo esc_attr( $key ); ?>">
+			<label for="attachment-details-<?php echo esc_attr( $key ); ?>" class="name"><?php echo $label; ?></label>
+			<input type="text" id="attachment-details-<?php echo esc_attr( $key ); ?>" value="{{ data.<?php echo $key; ?> || data.meta.<?php echo $key; ?> || '' }}" />
+		</span>
 		<?php endforeach; ?>
 		<# } #>
-		<label class="setting" data-setting="caption">
-			<span class="name"><?php _e( 'Caption' ); ?></span>
-			<textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
-		</label>
-		<label class="setting" data-setting="description">
-			<span class="name"><?php _e( 'Description' ); ?></span>
-			<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
-		</label>
-		<label class="setting" data-setting="url">
-			<span class="name"><?php _e( 'Copy Link' ); ?></span>
-			<input type="text" value="{{ data.url }}" readonly />
-		</label>
+		<span class="setting" data-setting="caption">
+			<label for="attachment-details-caption" class="name"><?php _e( 'Caption' ); ?></label>
+			<textarea id="attachment-details-caption" {{ maybeReadOnly }}>{{ data.caption }}</textarea>
+		</span>
+		<span class="setting" data-setting="description">
+			<label for="attachment-details-description" class="name"><?php _e( 'Description' ); ?></label>
+			<textarea id="attachment-details-description" {{ maybeReadOnly }}>{{ data.description }}</textarea>
+		</span>
+		<span class="setting" data-setting="url">
+			<label for="attachment-details-copy-link" class="name"><?php _e( 'File URL:' ); ?></label>
+			<input type="text" class="attachment-details-copy-link" id="attachment-details-copy-link" value="{{ data.url }}" readonly />
+			<div class="copy-to-clipboard-container">
+				<button type="button" class="button button-small copy-attachment-url" data-clipboard-target="#attachment-details-copy-link"><?php _e( 'Copy URL' ); ?></button>
+				<span class="success hidden" aria-hidden="true"><?php _e( 'Copied!' ); ?></span>
+			</div>
+		</span>
 	</script>
 
+	<?php // Template for the Selection status bar. ?>
 	<script type="text/html" id="tmpl-media-selection">
 		<div class="selection-info">
 			<span class="count"></span>
@@ -665,13 +714,14 @@
 		<div class="selection-view"></div>
 	</script>
 
+	<?php // Template for the Attachment display settings, used for example in the sidebar. ?>
 	<script type="text/html" id="tmpl-attachment-display-settings">
 		<h2><?php _e( 'Attachment Display Settings' ); ?></h2>
 
 		<# if ( 'image' === data.type ) { #>
-			<label class="setting align">
-				<span><?php _e( 'Alignment' ); ?></span>
-				<select class="alignment"
+			<span class="setting align">
+				<label for="attachment-display-settings-alignment" class="name"><?php _e( 'Alignment' ); ?></label>
+				<select id="attachment-display-settings-alignment" class="alignment"
 					data-setting="align"
 					<# if ( data.userSettings ) { #>
 						data-user-setting="align"
@@ -690,61 +740,63 @@
 						<?php esc_html_e( 'None' ); ?>
 					</option>
 				</select>
-			</label>
+			</span>
 		<# } #>
 
-		<div class="setting">
-			<label>
+		<span class="setting">
+			<label for="attachment-display-settings-link-to" class="name">
 				<# if ( data.model.canEmbed ) { #>
-					<span><?php _e( 'Embed or Link' ); ?></span>
-				<# } else { #>
-					<span><?php _e( 'Link To' ); ?></span>
-				<# } #>
-
-				<select class="link-to"
-					data-setting="link"
-					<# if ( data.userSettings && ! data.model.canEmbed ) { #>
-						data-user-setting="urlbutton"
-					<# } #>>
-
-				<# if ( data.model.canEmbed ) { #>
-					<option value="embed" selected>
-						<?php esc_html_e( 'Embed Media Player' ); ?>
-					</option>
-					<option value="file">
+					<?php _e( 'Embed or Link' ); ?>
 				<# } else { #>
-					<option value="none" selected>
-						<?php esc_html_e( 'None' ); ?>
-					</option>
-					<option value="file">
+					<?php _e( 'Link To' ); ?>
 				<# } #>
-					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Media File' ); ?>
-					<# } else { #>
-						<?php esc_html_e( 'Media File' ); ?>
-					<# } #>
-					</option>
-					<option value="post">
-					<# if ( data.model.canEmbed ) { #>
-						<?php esc_html_e( 'Link to Attachment Page' ); ?>
-					<# } else { #>
-						<?php esc_html_e( 'Attachment Page' ); ?>
-					<# } #>
-					</option>
-				<# if ( 'image' === data.type ) { #>
-					<option value="custom">
-						<?php esc_html_e( 'Custom URL' ); ?>
-					</option>
+			</label>
+			<select id="attachment-display-settings-link-to" class="link-to"
+				data-setting="link"
+				<# if ( data.userSettings && ! data.model.canEmbed ) { #>
+					data-user-setting="urlbutton"
+				<# } #>>
+
+			<# if ( data.model.canEmbed ) { #>
+				<option value="embed" selected>
+					<?php esc_html_e( 'Embed Media Player' ); ?>
+				</option>
+				<option value="file">
+			<# } else { #>
+				<option value="none" selected>
+					<?php esc_html_e( 'None' ); ?>
+				</option>
+				<option value="file">
+			<# } #>
+				<# if ( data.model.canEmbed ) { #>
+					<?php esc_html_e( 'Link to Media File' ); ?>
+				<# } else { #>
+					<?php esc_html_e( 'Media File' ); ?>
 				<# } #>
-				</select>
-			</label>
-			<input type="text" class="link-to-custom" data-setting="linkUrl" />
-		</div>
+				</option>
+				<option value="post">
+				<# if ( data.model.canEmbed ) { #>
+					<?php esc_html_e( 'Link to Attachment Page' ); ?>
+				<# } else { #>
+					<?php esc_html_e( 'Attachment Page' ); ?>
+				<# } #>
+				</option>
+			<# if ( 'image' === data.type ) { #>
+				<option value="custom">
+					<?php esc_html_e( 'Custom URL' ); ?>
+				</option>
+			<# } #>
+			</select>
+		</span>
+		<span class="setting">
+			<label for="attachment-display-settings-link-to-custom" class="name"><?php _e( 'URL' ); ?></label>
+			<input type="text" id="attachment-display-settings-link-to-custom" class="link-to-custom" data-setting="linkUrl" />
+		</span>
 
 		<# if ( 'undefined' !== typeof data.sizes ) { #>
-			<label class="setting">
-				<span><?php _e( 'Size' ); ?></span>
-				<select class="size" name="size"
+			<span class="setting">
+				<label for="attachment-display-settings-size" class="name"><?php _e( 'Size' ); ?></label>
+				<select id="attachment-display-settings-size" class="size" name="size"
 					data-setting="size"
 					<# if ( data.userSettings ) { #>
 						data-user-setting="imgsize"
@@ -772,38 +824,39 @@
 						<# } #>
 					<?php endforeach; ?>
 				</select>
-			</label>
+			</span>
 		<# } #>
 	</script>
 
+	<?php // Template for the Gallery settings, used for example in the sidebar. ?>
 	<script type="text/html" id="tmpl-gallery-settings">
 		<h2><?php _e( 'Gallery Settings' ); ?></h2>
 
-		<label class="setting">
-			<span><?php _e( 'Link To' ); ?></span>
-			<select class="link-to"
+		<span class="setting">
+			<label for="gallery-settings-link-to" class="name"><?php _e( 'Link To' ); ?></label>
+			<select id="gallery-settings-link-to" class="link-to"
 				data-setting="link"
 				<# if ( data.userSettings ) { #>
 					data-user-setting="urlbutton"
 				<# } #>>
 
-				<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
+				<option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' === wp.media.galleryDefaults.link ) {
 					#>selected="selected"<# }
 				#>>
 					<?php esc_html_e( 'Attachment Page' ); ?>
 				</option>
-				<option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
+				<option value="file" <# if ( 'file' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
 					<?php esc_html_e( 'Media File' ); ?>
 				</option>
-				<option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
+				<option value="none" <# if ( 'none' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
 					<?php esc_html_e( 'None' ); ?>
 				</option>
 			</select>
-		</label>
+		</span>
 
-		<label class="setting">
-			<span><?php _e( 'Columns' ); ?></span>
-			<select class="columns" name="columns"
+		<span class="setting">
+			<label for="gallery-settings-columns" class="name select-label-inline"><?php _e( 'Columns' ); ?></label>
+			<select id="gallery-settings-columns" class="columns" name="columns"
 				data-setting="columns">
 				<?php for ( $i = 1; $i <= 9; $i++ ) : ?>
 					<option value="<?php echo esc_attr( $i ); ?>" <#
@@ -813,16 +866,16 @@
 					</option>
 				<?php endfor; ?>
 			</select>
-		</label>
+		</span>
 
-		<label class="setting">
-			<span><?php _e( 'Random Order' ); ?></span>
-			<input type="checkbox" data-setting="_orderbyRandom" />
-		</label>
+		<span class="setting">
+			<input type="checkbox" id="gallery-settings-random-order" data-setting="_orderbyRandom" />
+			<label for="gallery-settings-random-order" class="checkbox-label-inline"><?php _e( 'Random Order' ); ?></label>
+		</span>
 
-		<label class="setting size">
-			<span><?php _e( 'Size' ); ?></span>
-			<select class="size" name="size"
+		<span class="setting size">
+			<label for="gallery-settings-size" class="name"><?php _e( 'Size' ); ?></label>
+			<select id="gallery-settings-size" class="size" name="size"
 				data-setting="size"
 				<# if ( data.userSettings ) { #>
 					data-user-setting="imgsize"
@@ -847,165 +900,174 @@
 					</option>
 				<?php endforeach; ?>
 			</select>
-		</label>
+		</span>
 	</script>
 
+	<?php // Template for the Playlists settings, used for example in the sidebar. ?>
 	<script type="text/html" id="tmpl-playlist-settings">
 		<h2><?php _e( 'Playlist Settings' ); ?></h2>
 
 		<# var emptyModel = _.isEmpty( data.model ),
 			isVideo = 'video' === data.controller.get('library').props.get('type'); #>
 
-		<label class="setting">
-			<input type="checkbox" data-setting="tracklist" <# if ( emptyModel ) { #>
+		<span class="setting">
+			<input type="checkbox" id="playlist-settings-show-list" data-setting="tracklist" <# if ( emptyModel ) { #>
 				checked="checked"
 			<# } #> />
-			<# if ( isVideo ) { #>
-			<span><?php _e( 'Show Video List' ); ?></span>
-			<# } else { #>
-			<span><?php _e( 'Show Tracklist' ); ?></span>
-			<# } #>
-		</label>
+			<label for="playlist-settings-show-list" class="checkbox-label-inline">
+				<# if ( isVideo ) { #>
+				<?php _e( 'Show Video List' ); ?>
+				<# } else { #>
+				<?php _e( 'Show Tracklist' ); ?>
+				<# } #>
+			</label>
+		</span>
 
 		<# if ( ! isVideo ) { #>
-		<label class="setting">
-			<input type="checkbox" data-setting="artists" <# if ( emptyModel ) { #>
+		<span class="setting">
+			<input type="checkbox" id="playlist-settings-show-artist" data-setting="artists" <# if ( emptyModel ) { #>
 				checked="checked"
 			<# } #> />
-			<span><?php _e( 'Show Artist Name in Tracklist' ); ?></span>
-		</label>
+			<label for="playlist-settings-show-artist" class="checkbox-label-inline">
+				<?php _e( 'Show Artist Name in Tracklist' ); ?>
+			</label>
+		</span>
 		<# } #>
 
-		<label class="setting">
-			<input type="checkbox" data-setting="images" <# if ( emptyModel ) { #>
+		<span class="setting">
+			<input type="checkbox" id="playlist-settings-show-images" data-setting="images" <# if ( emptyModel ) { #>
 				checked="checked"
 			<# } #> />
-			<span><?php _e( 'Show Images' ); ?></span>
-		</label>
+			<label for="playlist-settings-show-images" class="checkbox-label-inline">
+				<?php _e( 'Show Images' ); ?>
+			</label>
+		</span>
 	</script>
 
+	<?php // Template for the "Insert from URL" layout. ?>
 	<script type="text/html" id="tmpl-embed-link-settings">
-		<label class="setting link-text">
-			<span><?php _e( 'Link Text' ); ?></span>
-			<input type="text" class="alignment" data-setting="linkText" />
-		</label>
+		<span class="setting link-text">
+			<label for="embed-link-settings-link-text" class="name"><?php _e( 'Link Text' ); ?></label>
+			<input type="text" id="embed-link-settings-link-text" class="alignment" data-setting="linkText" />
+		</span>
 		<div class="embed-container" style="display: none;">
 			<div class="embed-preview"></div>
 		</div>
 	</script>
 
+	<?php // Template for the "Insert from URL" image preview and details. ?>
 	<script type="text/html" id="tmpl-embed-image-settings">
-		<div class="thumbnail">
-			<img src="{{ data.model.url }}" draggable="false" alt="" />
+		<div class="wp-clearfix">
+			<div class="thumbnail">
+				<img src="{{ data.model.url }}" draggable="false" alt="" />
+			</div>
 		</div>
 
-		<label class="setting alt-text has-description">
-			<span><?php _e( 'Alternative Text' ); ?></span>
-			<input type="text" data-setting="alt" aria-describedby="alt-text-description" />
-		</label>
+		<span class="setting alt-text has-description">
+			<label for="embed-image-settings-alt-text" class="name"><?php _e( 'Alternative Text' ); ?></label>
+			<input type="text" id="embed-image-settings-alt-text" data-setting="alt" aria-describedby="alt-text-description" />
+		</span>
 		<p class="description" id="alt-text-description"><?php echo $alt_text_description; ?></p>
 
 		<?php
 		/** This filter is documented in wp-admin/includes/media.php */
 		if ( ! apply_filters( 'disable_captions', '' ) ) :
 			?>
-			<label class="setting caption">
-				<span><?php _e( 'Caption' ); ?></span>
-				<textarea data-setting="caption" />
-			</label>
+			<span class="setting caption">
+				<label for="embed-image-settings-caption" class="name"><?php _e( 'Caption' ); ?></label>
+				<textarea id="embed-image-settings-caption" data-setting="caption" />
+			</span>
 		<?php endif; ?>
 
-		<div class="setting align">
-			<span><?php _e( 'Align' ); ?></span>
-			<div class="button-group button-large" data-setting="align">
-				<button class="button" value="left">
-					<?php esc_html_e( 'Left' ); ?>
-				</button>
-				<button class="button" value="center">
-					<?php esc_html_e( 'Center' ); ?>
-				</button>
-				<button class="button" value="right">
-					<?php esc_html_e( 'Right' ); ?>
-				</button>
-				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
-				</button>
-			</div>
-		</div>
+		<fieldset class="setting-group">
+			<legend class="name"><?php _e( 'Align' ); ?></legend>
+			<span class="setting align">
+				<span class="button-group button-large" data-setting="align">
+					<button class="button" value="left">
+						<?php esc_html_e( 'Left' ); ?>
+					</button>
+					<button class="button" value="center">
+						<?php esc_html_e( 'Center' ); ?>
+					</button>
+					<button class="button" value="right">
+						<?php esc_html_e( 'Right' ); ?>
+					</button>
+					<button class="button active" value="none">
+						<?php esc_html_e( 'None' ); ?>
+					</button>
+				</span>
+			</span>
+		</fieldset>
 
-		<div class="setting link-to">
-			<span><?php _e( 'Link To' ); ?></span>
-			<div class="button-group button-large" data-setting="link">
-				<button class="button" value="file">
-					<?php esc_html_e( 'Image URL' ); ?>
-				</button>
-				<button class="button" value="custom">
-					<?php esc_html_e( 'Custom URL' ); ?>
-				</button>
-				<button class="button active" value="none">
-					<?php esc_html_e( 'None' ); ?>
-				</button>
-			</div>
-			<input type="text" class="link-to-custom" data-setting="linkUrl" />
-		</div>
+		<fieldset class="setting-group">
+			<legend class="name"><?php _e( 'Link To' ); ?></legend>
+			<span class="setting link-to">
+				<span class="button-group button-large" data-setting="link">
+					<button class="button" value="file">
+						<?php esc_html_e( 'Image URL' ); ?>
+					</button>
+					<button class="button" value="custom">
+						<?php esc_html_e( 'Custom URL' ); ?>
+					</button>
+					<button class="button active" value="none">
+						<?php esc_html_e( 'None' ); ?>
+					</button>
+				</span>
+			</span>
+			<span class="setting">
+				<label for="embed-image-settings-link-to-custom" class="name"><?php _e( 'URL' ); ?></label>
+				<input type="text" id="embed-image-settings-link-to-custom" class="link-to-custom" data-setting="linkUrl" />
+			</span>
+		</fieldset>
 	</script>
 
+	<?php // Template for the Image details, used for example in the editor. ?>
 	<script type="text/html" id="tmpl-image-details">
 		<div class="media-embed">
 			<div class="embed-media-settings">
-				<div class="column-image">
-					<div class="image">
-						<img src="{{ data.model.url }}" draggable="false" alt="" />
-
-						<# if ( data.attachment && window.imageEdit ) { #>
-							<div class="actions">
-								<input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Original' ); ?>" />
-								<input type="button" class="replace-attachment button" value="<?php esc_attr_e( 'Replace' ); ?>" />
-							</div>
-						<# } #>
-					</div>
-				</div>
 				<div class="column-settings">
-					<label class="setting alt-text has-description">
-						<span><?php _e( 'Alternative Text' ); ?></span>
-						<input type="text" data-setting="alt" value="{{ data.model.alt }}" aria-describedby="alt-text-description" />
-					</label>
+					<span class="setting alt-text has-description">
+						<label for="image-details-alt-text" class="name"><?php _e( 'Alternative Text' ); ?></label>
+						<input type="text" id="image-details-alt-text" data-setting="alt" value="{{ data.model.alt }}" aria-describedby="alt-text-description" />
+					</span>
 					<p class="description" id="alt-text-description"><?php echo $alt_text_description; ?></p>
 
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
 					if ( ! apply_filters( 'disable_captions', '' ) ) :
 						?>
-						<label class="setting caption">
-							<span><?php _e( 'Caption' ); ?></span>
-							<textarea data-setting="caption">{{ data.model.caption }}</textarea>
-						</label>
+						<span class="setting caption">
+							<label for="image-details-caption" class="name"><?php _e( 'Caption' ); ?></label>
+							<textarea id="image-details-caption" data-setting="caption">{{ data.model.caption }}</textarea>
+						</span>
 					<?php endif; ?>
 
 					<h2><?php _e( 'Display Settings' ); ?></h2>
-					<div class="setting align">
-						<span><?php _e( 'Align' ); ?></span>
-						<div class="button-group button-large" data-setting="align">
-							<button class="button" value="left">
-								<?php esc_html_e( 'Left' ); ?>
-							</button>
-							<button class="button" value="center">
-								<?php esc_html_e( 'Center' ); ?>
-							</button>
-							<button class="button" value="right">
-								<?php esc_html_e( 'Right' ); ?>
-							</button>
-							<button class="button active" value="none">
-								<?php esc_html_e( 'None' ); ?>
-							</button>
-						</div>
-					</div>
+					<fieldset class="setting-group">
+						<legend class="legend-inline"><?php _e( 'Align' ); ?></legend>
+						<span class="setting align">
+							<span class="button-group button-large" data-setting="align">
+								<button class="button" value="left">
+									<?php esc_html_e( 'Left' ); ?>
+								</button>
+								<button class="button" value="center">
+									<?php esc_html_e( 'Center' ); ?>
+								</button>
+								<button class="button" value="right">
+									<?php esc_html_e( 'Right' ); ?>
+								</button>
+								<button class="button active" value="none">
+									<?php esc_html_e( 'None' ); ?>
+								</button>
+							</span>
+						</span>
+					</fieldset>
 
 					<# if ( data.attachment ) { #>
 						<# if ( 'undefined' !== typeof data.attachment.sizes ) { #>
-							<label class="setting size">
-								<span><?php _e( 'Size' ); ?></span>
-								<select class="size" name="size"
+							<span class="setting size">
+								<label for="image-details-size" class="name"><?php _e( 'Size' ); ?></label>
+								<select id="image-details-size" class="size" name="size"
 									data-setting="size"
 									<# if ( data.userSettings ) { #>
 										data-user-setting="imgsize"
@@ -1036,16 +1098,25 @@
 										<?php _e( 'Custom Size' ); ?>
 									</option>
 								</select>
-							</label>
+							</span>
 						<# } #>
-							<div class="custom-size<# if ( data.model.size !== 'custom' ) { #> hidden<# } #>">
-								<label><span><?php _e( 'Width' ); ?> <small>(px)</small></span> <input data-setting="customWidth" type="number" step="1" value="{{ data.model.customWidth }}" /></label><span class="sep">&times;</span><label><span><?php _e( 'Height' ); ?> <small>(px)</small></span><input data-setting="customHeight" type="number" step="1" value="{{ data.model.customHeight }}" /></label>
+							<div class="custom-size wp-clearfix<# if ( data.model.size !== 'custom' ) { #> hidden<# } #>">
+								<span class="custom-size-setting">
+									<label for="image-details-size-width"><?php _e( 'Width' ); ?></label>
+									<input type="number" id="image-details-size-width" aria-describedby="image-size-desc" data-setting="customWidth" step="1" value="{{ data.model.customWidth }}" />
+								</span>
+								<span class="sep" aria-hidden="true">&times;</span>
+								<span class="custom-size-setting">
+									<label for="image-details-size-height"><?php _e( 'Height' ); ?></label>
+									<input type="number" id="image-details-size-height" aria-describedby="image-size-desc" data-setting="customHeight" step="1" value="{{ data.model.customHeight }}" />
+								</span>
+								<p id="image-size-desc" class="description"><?php _e( 'Image size in pixels' ); ?></p>
 							</div>
 					<# } #>
 
-					<div class="setting link-to">
-						<span><?php _e( 'Link To' ); ?></span>
-						<select data-setting="link">
+					<span class="setting link-to">
+						<label for="image-details-link-to" class="name"><?php _e( 'Link To' ); ?></label>
+						<select id="image-details-link-to" data-setting="link">
 						<# if ( data.attachment ) { #>
 							<option value="file">
 								<?php esc_html_e( 'Media File' ); ?>
@@ -1065,46 +1136,64 @@
 								<?php esc_html_e( 'None' ); ?>
 							</option>
 						</select>
-						<input type="text" class="link-to-custom" data-setting="linkUrl" />
-					</div>
+					</span>
+					<span class="setting">
+						<label for="image-details-link-to-custom" class="name"><?php _e( 'URL' ); ?></label>
+						<input type="text" id="image-details-link-to-custom" class="link-to-custom" data-setting="linkUrl" />
+					</span>
+
 					<div class="advanced-section">
 						<h2><button type="button" class="button-link advanced-toggle"><?php _e( 'Advanced Options' ); ?></button></h2>
 						<div class="advanced-settings hidden">
 							<div class="advanced-image">
-								<label class="setting title-text">
-									<span><?php _e( 'Image Title Attribute' ); ?></span>
-									<input type="text" data-setting="title" value="{{ data.model.title }}" />
-								</label>
-								<label class="setting extra-classes">
-									<span><?php _e( 'Image CSS Class' ); ?></span>
-									<input type="text" data-setting="extraClasses" value="{{ data.model.extraClasses }}" />
-								</label>
+								<span class="setting title-text">
+									<label for="image-details-title-attribute" class="name"><?php _e( 'Image Title Attribute' ); ?></label>
+									<input type="text" id="image-details-title-attribute" data-setting="title" value="{{ data.model.title }}" />
+								</span>
+								<span class="setting extra-classes">
+									<label for="image-details-css-class" class="name"><?php _e( 'Image CSS Class' ); ?></label>
+									<input type="text" id="image-details-css-class" data-setting="extraClasses" value="{{ data.model.extraClasses }}" />
+								</span>
 							</div>
 							<div class="advanced-link">
-								<div class="setting link-target">
-									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new tab' ); ?></label>
-								</div>
-								<label class="setting link-rel">
-									<span><?php _e( 'Link Rel' ); ?></span>
-									<input type="text" data-setting="linkRel" value="{{ data.model.linkRel }}" />
-								</label>
-								<label class="setting link-class-name">
-									<span><?php _e( 'Link CSS Class' ); ?></span>
-									<input type="text" data-setting="linkClassName" value="{{ data.model.linkClassName }}" />
-								</label>
+								<span class="setting link-target">
+									<input type="checkbox" id="image-details-link-target" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>>
+									<label for="image-details-link-target" class="checkbox-label"><?php _e( 'Open link in a new tab' ); ?></label>
+								</span>
+								<span class="setting link-rel">
+									<label for="image-details-link-rel" class="name"><?php _e( 'Link Rel' ); ?></label>
+									<input type="text" id="image-details-link-rel" data-setting="linkRel" value="{{ data.model.linkRel }}" />
+								</span>
+								<span class="setting link-class-name">
+									<label for="image-details-link-css-class" class="name"><?php _e( 'Link CSS Class' ); ?></label>
+									<input type="text" id="image-details-link-css-class" data-setting="linkClassName" value="{{ data.model.linkClassName }}" />
+								</span>
 							</div>
 						</div>
 					</div>
 				</div>
+				<div class="column-image">
+					<div class="image">
+						<img src="{{ data.model.url }}" draggable="false" alt="" />
+						<# if ( data.attachment && window.imageEdit ) { #>
+							<div class="actions">
+								<input type="button" class="edit-attachment button" value="<?php esc_attr_e( 'Edit Original' ); ?>" />
+								<input type="button" class="replace-attachment button" value="<?php esc_attr_e( 'Replace' ); ?>" />
+							</div>
+						<# } #>
+					</div>
+				</div>
 			</div>
 		</div>
 	</script>
 
+	<?php // Template for the Image Editor layout. ?>
 	<script type="text/html" id="tmpl-image-editor">
 		<div id="media-head-{{ data.id }}"></div>
 		<div id="image-editor-{{ data.id }}"></div>
 	</script>
 
+	<?php // Template for an embedded Audio details. ?>
 	<script type="text/html" id="tmpl-audio-details">
 		<# var ext, html5types = {
 			mp3: wp.media.view.settings.embedMimes.mp3,
@@ -1122,11 +1211,11 @@
 						delete html5types[ ext ];
 					}
 				#>
-				<div class="setting">
-					<label for="audio-source"><?php _e( 'URL' ); ?></label>
-					<input type="text" id="audio-source" readonly data-setting="src" value="{{ data.model.src }}" />
+				<span class="setting">
+					<label for="audio-details-source" class="name"><?php _e( 'URL' ); ?></label>
+					<input type="text" id="audio-details-source" readonly data-setting="src" value="{{ data.model.src }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
-				</div>
+				</span>
 				<# } #>
 				<?php
 
@@ -1137,47 +1226,54 @@
 						delete html5types.<?php echo $type; ?>;
 					}
 				#>
-				<div class="setting">
-					<label for="<?php echo $type . '-source'; ?>"><?php echo strtoupper( $type ); ?></span>
-					<input type="text" id="<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
+				<span class="setting">
+					<label for="audio-details-<?php echo $type . '-source'; ?>" class="name"><?php echo strtoupper( $type ); ?></label>
+					<input type="text" id="audio-details-<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
-				</div>
+				</span>
 				<# } #>
 				<?php endforeach ?>
 
 				<# if ( ! _.isEmpty( html5types ) ) { #>
-				<div class="setting">
-					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ); ?></span>
-					<div class="button-large">
-					<# _.each( html5types, function (mime, type) { #>
-					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
-					<# } ) #>
-					</div>
-				</div>
+				<fieldset class="setting-group">
+					<legend class="name"><?php _e( 'Add alternate sources for maximum HTML5 playback' ); ?></legend>
+					<span class="setting">
+						<span class="button-large">
+						<# _.each( html5types, function (mime, type) { #>
+							<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
+						<# } ) #>
+						</span>
+					</span>
+				</fieldset>
 				<# } #>
 
-				<div class="setting preload">
-					<span><?php _e( 'Preload' ); ?></span>
-					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
-						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
-					</div>
-				</div>
+				<fieldset class="setting-group">
+					<legend class="name"><?php _e( 'Preload' ); ?></legend>
+					<span class="setting preload">
+						<span class="button-group button-large" data-setting="preload">
+							<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
+							<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
+							<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+						</span>
+					</span>
+				</fieldset>
 
-				<label class="setting checkbox-setting autoplay">
-					<input type="checkbox" data-setting="autoplay" />
-					<span><?php _e( 'Autoplay' ); ?></span>
-				</label>
+				<span class="setting-group">
+					<span class="setting checkbox-setting autoplay">
+						<input type="checkbox" id="audio-details-autoplay" data-setting="autoplay" />
+						<label for="audio-details-autoplay" class="checkbox-label"><?php _e( 'Autoplay' ); ?></label>
+					</span>
 
-				<label class="setting checkbox-setting">
-					<input type="checkbox" data-setting="loop" />
-					<span><?php _e( 'Loop' ); ?></span>
-				</label>
+					<span class="setting checkbox-setting">
+						<input type="checkbox" id="audio-details-loop" data-setting="loop" />
+						<label for="audio-details-loop" class="checkbox-label"><?php _e( 'Loop' ); ?></label>
+					</span>
+				</span>
 			</div>
 		</div>
 	</script>
 
+	<?php // Template for an embedded Video details. ?>
 	<script type="text/html" id="tmpl-video-details">
 		<# var ext, html5types = {
 			mp4: wp.media.view.settings.embedMimes.mp4,
@@ -1206,11 +1302,11 @@
 						delete html5types[ ext ];
 					}
 				#>
-				<div class="setting">
-					<label for="video-source"><?php _e( 'URL' ); ?></label>
-					<input type="text" id="video-source" readonly data-setting="src" value="{{ data.model.src }}" />
+				<span class="setting">
+					<label for="video-details-source" class="name"><?php _e( 'URL' ); ?></label>
+					<input type="text" id="video-details-source" readonly data-setting="src" value="{{ data.model.src }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
-				</div>
+				</span>
 				<# } #>
 				<?php
 				foreach ( $video_types as $type ) :
@@ -1220,73 +1316,92 @@
 						delete html5types.<?php echo $type; ?>;
 					}
 				#>
-				<div class="setting">
-					<label for="<?php echo $type . '-source'; ?>"><?php echo strtoupper( $type ); ?></label>
-					<input type="text" id="<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
+				<span class="setting">
+					<label for="video-details-<?php echo $type . '-source'; ?>" class="name"><?php echo strtoupper( $type ); ?></label>
+					<input type="text" id="video-details-<?php echo $type . '-source'; ?>" readonly data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
-				</div>
+				</span>
 				<# } #>
 				<?php endforeach ?>
 				</div>
 
 				<# if ( ! _.isEmpty( html5types ) ) { #>
-				<div class="setting">
-					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ); ?></span>
-					<div class="button-large">
-					<# _.each( html5types, function (mime, type) { #>
-					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
-					<# } ) #>
-					</div>
-				</div>
+				<fieldset class="setting-group">
+					<legend class="name"><?php _e( 'Add alternate sources for maximum HTML5 playback' ); ?></legend>
+					<span class="setting">
+						<span class="button-large">
+						<# _.each( html5types, function (mime, type) { #>
+							<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
+						<# } ) #>
+						</span>
+					</span>
+				</fieldset>
 				<# } #>
 
 				<# if ( ! _.isEmpty( data.model.poster ) ) { #>
-				<div class="setting">
-					<label for="poster-image"><?php _e( 'Poster Image' ); ?></label>
-					<input type="text" id="poster-image" readonly data-setting="poster" value="{{ data.model.poster }}" />
+				<span class="setting">
+					<label for="video-details-poster-image" class="name"><?php _e( 'Poster Image' ); ?></label>
+					<input type="text" id="video-details-poster-image" readonly data-setting="poster" value="{{ data.model.poster }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove poster image' ); ?></button>
-				</div>
+				</span>
 				<# } #>
-				<div class="setting preload">
-					<span><?php _e( 'Preload' ); ?></span>
-					<div class="button-group button-large" data-setting="preload">
-						<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
-						<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
-						<button class="button active" value="none"><?php _e( 'None' ); ?></button>
-					</div>
-				</div>
+
+				<fieldset class="setting-group">
+					<legend class="name"><?php _e( 'Preload' ); ?></legend>
+					<span class="setting preload">
+						<span class="button-group button-large" data-setting="preload">
+							<button class="button" value="auto"><?php _ex( 'Auto', 'auto preload' ); ?></button>
+							<button class="button" value="metadata"><?php _e( 'Metadata' ); ?></button>
+							<button class="button active" value="none"><?php _e( 'None' ); ?></button>
+						</span>
+					</span>
+				</fieldset>
 
-				<label class="setting checkbox-setting autoplay">
-					<input type="checkbox" data-setting="autoplay" />
-					<span><?php _e( 'Autoplay' ); ?></span>
-				</label>
+				<span class="setting-group">
+					<span class="setting checkbox-setting autoplay">
+						<input type="checkbox" id="video-details-autoplay" data-setting="autoplay" />
+						<label for="video-details-autoplay" class="checkbox-label"><?php _e( 'Autoplay' ); ?></label>
+					</span>
 
-				<label class="setting checkbox-setting">
-					<input type="checkbox" data-setting="loop" />
-					<span><?php _e( 'Loop' ); ?></span>
-				</label>
+					<span class="setting checkbox-setting">
+						<input type="checkbox" id="video-details-loop" data-setting="loop" />
+						<label for="video-details-loop" class="checkbox-label"><?php _e( 'Loop' ); ?></label>
+					</span>
+				</span>
 
-				<div class="setting" data-setting="content">
+				<span class="setting" data-setting="content">
 					<#
 					var content = '';
 					if ( ! _.isEmpty( data.model.content ) ) {
 						var tracks = jQuery( data.model.content ).filter( 'track' );
-						_.each( tracks.toArray(), function (track) {
+						_.each( tracks.toArray(), function( track, index ) {
 							content += track.outerHTML; #>
-						<label for="video-track"><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
-						<input class="content-track" type="text" id="video-track" readonly value="{{ track.outerHTML }}" />
-						<button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button>
+						<label for="video-details-track-{{ index }}" class="name"><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></label>
+						<input class="content-track" type="text" id="video-details-track-{{ index }}" aria-describedby="video-details-track-desc-{{ index }}" value="{{ track.outerHTML }}" />
+						<span class="description" id="video-details-track-desc-{{ index }}">
+						<?php
+							printf(
+								/* translators: 1: "srclang" HTML attribute, 2: "label" HTML attribute, 3: "kind" HTML attribute. */
+								__( 'The %1$s, %2$s, and %3$s values can be edited to set the video track language and kind.' ),
+								'srclang',
+								'label',
+								'kind'
+							);
+						?>
+						</span>
+						<button type="button" class="button-link remove-setting remove-track"><?php _ex( 'Remove video track', 'media' ); ?></button><br/>
 						<# } ); #>
 					<# } else { #>
-					<span><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span>
+					<span class="name"><?php _e( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ); ?></span><br />
 					<em><?php _e( 'There are no associated subtitles.' ); ?></em>
 					<# } #>
 					<textarea class="hidden content-setting">{{ content }}</textarea>
-				</div>
+				</span>
 			</div>
 		</div>
 	</script>
 
+	<?php // Template for a Gallery within the editor. ?>
 	<script type="text/html" id="tmpl-editor-gallery">
 		<# if ( data.attachments.length ) { #>
 			<div class="gallery gallery-columns-{{ data.columns }}">
@@ -1317,11 +1432,13 @@
 		<# } #>
 	</script>
 
+	<?php // Template for the Crop area layout, used for example in the Customizer. ?>
 	<script type="text/html" id="tmpl-crop-content">
 		<img class="crop-image" src="{{ data.url }}" alt="<?php esc_attr_e( 'Image crop area preview. Requires mouse interaction.' ); ?>">
 		<div class="upload-errors"></div>
 	</script>
 
+	<?php // Template for the Site Icon preview, used for example in the Customizer. ?>
 	<script type="text/html" id="tmpl-site-icon-preview">
 		<h2><?php _e( 'Preview' ); ?></h2>
 		<strong aria-hidden="true"><?php _e( 'As a browser icon' ); ?></strong>
@@ -1331,7 +1448,7 @@
 			<div class="favicon">
 				<img id="preview-favicon" src="{{ data.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
 			</div>
-			<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
+			<span class="browser-title" aria-hidden="true"><# print( '<?php bloginfo( 'name' ); ?>' ) #></span>
 		</div>
 
 		<strong aria-hidden="true"><?php _e( 'As an app icon' ); ?></strong>