--- a/wp/wp-admin/site-health.php	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/site-health.php	Tue Dec 15 13:49:49 2020 +0100
@@ -7,12 +7,12 @@
  */
 
 if ( isset( $_GET['tab'] ) && 'debug' === $_GET['tab'] ) {
-	require_once( dirname( __FILE__ ) . '/site-health-info.php' );
+	require_once __DIR__ . '/site-health-info.php';
 	return;
 }
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
 
 $title = __( 'Site Health Status' );
 
@@ -24,43 +24,46 @@
 wp_enqueue_script( 'site-health' );
 
 if ( ! class_exists( 'WP_Site_Health' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-site-health.php' );
+	require_once ABSPATH . 'wp-admin/includes/class-wp-site-health.php';
 }
 
-$health_check_site_status = new WP_Site_Health();
+$health_check_site_status = WP_Site_Health::get_instance();
 
 // Start by checking if this is a special request checking for the existence of certain filters.
 $health_check_site_status->check_wp_version_check_exists();
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once ABSPATH . 'wp-admin/admin-header.php';
 ?>
 <div class="health-check-header">
 	<div class="health-check-title-section">
 		<h1>
 			<?php _e( 'Site Health' ); ?>
 		</h1>
+	</div>
 
-		<div class="site-health-progress hide-if-no-js loading">
+	<div class="health-check-title-section site-health-progress-wrapper loading hide-if-no-js">
+		<div class="site-health-progress">
 			<svg role="img" aria-hidden="true" focusable="false" width="100%" height="100%" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg">
 				<circle r="90" cx="100" cy="100" fill="transparent" stroke-dasharray="565.48" stroke-dashoffset="0"></circle>
 				<circle id="bar" r="90" cx="100" cy="100" fill="transparent" stroke-dasharray="565.48" stroke-dashoffset="0"></circle>
 			</svg>
-			<span class="screen-reader-text"><?php _e( 'Current health score:' ); ?></span>
-			<span class="site-health-progress-count"></span>
+		</div>
+		<div class="site-health-progress-label">
+			<?php _e( 'Results are still loading&hellip;' ); ?>
 		</div>
 	</div>
 
 	<nav class="health-check-tabs-wrapper hide-if-no-js" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
 		<a href="<?php echo esc_url( admin_url( 'site-health.php' ) ); ?>" class="health-check-tab active" aria-current="true">
 			<?php
-			/* translators: tab heading for Site Health Status page */
+			/* translators: Tab heading for Site Health Status page. */
 			_ex( 'Status', 'Site Health' );
 			?>
 		</a>
 
 		<a href="<?php echo esc_url( admin_url( 'site-health.php?tab=debug' ) ); ?>" class="health-check-tab">
 			<?php
-			/* translators: tab heading for Site Health Info page */
+			/* translators: Tab heading for Site Health Info page. */
 			_ex( 'Info', 'Site Health' );
 			?>
 		</a>
@@ -98,8 +101,8 @@
 		<div class="site-health-issues-wrapper" id="health-check-issues-critical">
 			<h3 class="site-health-issue-count-title">
 				<?php
-					/* translators: %s: number of critical issues found */
-					printf( _n( '%s Critical issue', '%s Critical issues', 0 ), '<span class="issue-count">0</span>' );
+					/* translators: %s: Number of critical issues found. */
+					printf( _n( '%s critical issue', '%s critical issues', 0 ), '<span class="issue-count">0</span>' );
 				?>
 			</h3>
 
@@ -109,8 +112,8 @@
 		<div class="site-health-issues-wrapper" id="health-check-issues-recommended">
 			<h3 class="site-health-issue-count-title">
 				<?php
-					/* translators: %s: number of recommended improvements */
-					printf( _n( '%s Recommended improvement', '%s Recommended improvements', 0 ), '<span class="issue-count">0</span>' );
+					/* translators: %s: Number of recommended improvements. */
+					printf( _n( '%s recommended improvement', '%s recommended improvements', 0 ), '<span class="issue-count">0</span>' );
 				?>
 			</h3>
 
@@ -128,8 +131,8 @@
 	<div class="site-health-issues-wrapper hidden" id="health-check-issues-good">
 		<h3 class="site-health-issue-count-title">
 			<?php
-				/* translators: %s: number of items with no issues */
-				printf( _n( '%s Item with no issues detected', '%s Items with no issues detected', 0 ), '<span class="issue-count">0</span>' );
+				/* translators: %s: Number of items with no issues. */
+				printf( _n( '%s item with no issues detected', '%s items with no issues detected', 0 ), '<span class="issue-count">0</span>' );
 			?>
 		</h3>
 
@@ -147,11 +150,13 @@
 	</h4>
 	<div id="health-check-accordion-block-{{ data.test }}" class="health-check-accordion-panel" hidden="hidden">
 		{{{ data.description }}}
-		<div class="actions">
-			<p class="button-container">{{{ data.actions }}}</p>
-		</div>
+		<# if ( data.actions ) { #>
+			<div class="actions">
+				{{{ data.actions }}}
+			</div>
+		<# } #>
 	</div>
 </script>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once ABSPATH . 'wp-admin/admin-footer.php';