diff --git a/assets/css/plugin-check-admin.css b/assets/css/plugin-check-admin.css
index 7ed8e00db..6d3d033be 100644
--- a/assets/css/plugin-check-admin.css
+++ b/assets/css/plugin-check-admin.css
@@ -19,12 +19,14 @@
   table.plugin-check__results-table thead {
     border: none;
     clip: rect(0 0 0 0);
+    clip-path: inset(50%);
     height: 1px;
     margin: -1px;
     overflow: hidden;
     padding: 0;
     position: absolute;
     width: 1px;
+    white-space: nowrap;
   }
 
   table.plugin-check__results-table tr {
diff --git a/assets/js/plugin-check-admin.js b/assets/js/plugin-check-admin.js
index 22227cc4e..f1e340759 100644
--- a/assets/js/plugin-check-admin.js
+++ b/assets/js/plugin-check-admin.js
@@ -80,6 +80,7 @@
 		e.preventDefault();
 
 		resetResults();
+		announce( defaultString( 'checkingPlugin' ) );
 		checkItButton.disabled = true;
 		pluginsList.disabled = true;
 		spinner.classList.add( 'is-active' );
@@ -102,11 +103,17 @@
 			.then( cleanUpEnvironment )
 			.then( ( data ) => {
 				console.log( data.message );
+				if ( data && data.message ) {
+					announce( data.message );
+				}
 
 				resetForm();
 			} )
 			.catch( ( error ) => {
 				console.error( error );
+				const errorMsg =
+					error && error.message ? error.message : String( error );
+				announce( errorMsg );
 
 				resetForm();
 			} );
@@ -119,7 +126,7 @@
 	 */
 	function resetResults() {
 		// Empty the results container.
-		resultsContainer.innerText = '';
+		resultsContainer.textContent = '';
 		exportContainer.innerHTML = '';
 		exportContainer.classList.add( 'is-hidden' );
 		resetAggregatedResults();
diff --git a/includes/Admin/Admin_Page.php b/includes/Admin/Admin_Page.php
index 5dd4881e8..3478c19e0 100644
--- a/includes/Admin/Admin_Page.php
+++ b/includes/Admin/Admin_Page.php
@@ -180,6 +180,7 @@ public function enqueue_scripts() {
 			WP_PLUGIN_CHECK_PLUGIN_DIR_URL . 'assets/js/plugin-check-admin.js',
 			array(
 				'wp-util',
+				'wp-a11y',
 			),
 			WP_PLUGIN_CHECK_VERSION,
 			true
@@ -218,6 +219,7 @@ public function enqueue_scripts() {
 					/* translators: %s: Formatted issue count string (e.g. "3 errors" or "2 warnings"). */
 					'summarySingleTemplate'           => __( '%s found.', 'plugin-check' ),
 					'strings'                         => array(
+						'checkingPlugin' => __( 'Running plugin checks…', 'plugin-check' ),
 						'exportCsv'      => __( 'Export CSV', 'plugin-check' ),
 						'exportJson'     => __( 'Export JSON', 'plugin-check' ),
 						'exportCtrf'     => __( 'Export CTRF', 'plugin-check' ),
diff --git a/includes/Lib/Readme/Parser.php b/includes/Lib/Readme/Parser.php
index e5524dd37..b58679ace 100644
--- a/includes/Lib/Readme/Parser.php
+++ b/includes/Lib/Readme/Parser.php
@@ -583,7 +583,7 @@ protected function trim_length( $desc, $length = 150, $type = 'char' ) {
 		}
 
 		// Apply the length restriction without counting html entities.
-		$str_length = mb_strlen( html_entity_decode( $desc ) ?: $desc );
+		$str_length = mb_strlen( html_entity_decode( $desc, ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 ) ?: $desc );
 
 		if ( $str_length > $length ) {
 			$desc = mb_substr( $desc, 0, $length );
diff --git a/templates/admin-page.php b/templates/admin-page.php
index d8bfe935e..c05968a74 100644
--- a/templates/admin-page.php
+++ b/templates/admin-page.php
@@ -41,14 +41,14 @@
 				<span id="plugin-check__spinner" class="spinner" style="float: none;"></span>
 				<div class="plugin-check__options">
 					<div>
-						<h4><?php esc_attr_e( 'Categories', 'plugin-check' ); ?></h4>
+						<h4><?php esc_html_e( 'Categories', 'plugin-check' ); ?></h4>
 						<?php if ( ! empty( $categories ) ) : ?>
 							<table id="plugin-check__categories">
 								<?php foreach ( $categories as $category => $label ) : ?>
 									<tr>
 										<td>
 											<fieldset>
-												<legend class="screen-reader-text"><?php echo esc_html( $category ); ?></legend>
+												<legend class="screen-reader-text"><?php echo esc_html( $label ); ?></legend>
 												<label for="<?php echo esc_attr( $category ); ?>">
 													<input type="checkbox" id="<?php echo esc_attr( $category ); ?>" name="categories" value="<?php echo esc_attr( $category ); ?>" <?php checked( in_array( $category, $user_enabled_categories, true ) ); ?> />
 													<?php echo esc_html( $label ); ?>
@@ -61,14 +61,14 @@
 						<?php endif; ?>
 					</div>
 					<div id="plugin-check__types-container">
-						<h4><?php esc_attr_e( 'Types', 'plugin-check' ); ?></h4>
+						<h4><?php esc_html_e( 'Types', 'plugin-check' ); ?></h4>
 						<?php if ( ! empty( $types ) ) : ?>
 							<table id="plugin-check__types">
 								<?php foreach ( $types as $type => $label ) : ?>
 									<tr>
 										<td>
 											<fieldset>
-												<legend class="screen-reader-text"><?php echo esc_html( $type ); ?></legend>
+												<legend class="screen-reader-text"><?php echo esc_html( $label ); ?></legend>
 												<label for="<?php echo esc_attr( $type ); ?>">
 													<input type="checkbox" id="<?php echo esc_attr( $type ); ?>" name="types" value="<?php echo esc_attr( $type ); ?>" checked="checked" />
 													<?php echo esc_html( $label ); ?>
@@ -81,13 +81,12 @@
 						<?php endif; ?>
 					</div>
 					<div id="plugin-check__ai-container">
-						<h4><?php esc_attr_e( 'AI Settings', 'plugin-check' ); ?></h4>
+						<h4><?php esc_html_e( 'AI Settings', 'plugin-check' ); ?></h4>
 						<p>
 							<label><input type="checkbox" value="use-ai" id="plugin-check__use-ai" /> <?php esc_html_e( 'Enable AI Analysis', 'plugin-check' ); ?></label>
 						</p>
 					</div>
 				</div>
-				<span id="plugin-check__spinner" class="spinner" style="float: none;"></span>
 				<?php if ( $has_experimental_checks ) { ?>
 					<p>
 						<label><input type="checkbox" value="include-experimental" id="plugin-check__include-experimental" /> <?php esc_html_e( 'Include Experimental Checks', 'plugin-check' ); ?></label>
diff --git a/templates/results-table.php b/templates/results-table.php
index 2c10949b2..7c1dd6b63 100644
--- a/templates/results-table.php
+++ b/templates/results-table.php
@@ -2,25 +2,25 @@
 <table id="plugin-check__results-table-{{data.index}}" class="widefat striped plugin-check__results-table">
 	<thead>
 		<tr>
-			<td>
+			<th scope="col">
 				<?php esc_html_e( 'Line', 'plugin-check' ); ?>
-			</td>
-			<td>
+			</th>
+			<th scope="col">
 				<?php esc_html_e( 'Column', 'plugin-check' ); ?>
-			</td>
-			<td>
+			</th>
+			<th scope="col">
 				<?php esc_html_e( 'Type', 'plugin-check' ); ?>
-			</td>
-			<td>
+			</th>
+			<th scope="col">
 				<?php esc_html_e( 'Code', 'plugin-check' ); ?>
-			</td>
-			<td>
+			</th>
+			<th scope="col">
 				<?php esc_html_e( 'Message', 'plugin-check' ); ?>
-			</td>
+			</th>
 			<# if ( data.hasLinks ) { #>
-				<td>
+				<th scope="col">
 					<?php esc_html_e( 'Edit Link', 'plugin-check' ); ?>
-				</td>
+				</th>
 			<# } #>
 		</tr>
 	</thead>