diff --git a/comments.php b/comments.php
index 7083c12c..3dd682de 100644
--- a/comments.php
+++ b/comments.php
@@ -61,14 +61,9 @@
 		);
 
 		// phpcs:ignore -- Title escaped in output.
-		echo apply_filters(
-			'generate_comments_title_output',
-			sprintf(
-				'<h2 class="comments-title">%s</h2>',
-				esc_html( $comments_title )
-			),
-			$comments_title,
-			$comments_number
+		echo sprintf(
+			'<h2 class="comments-title">%s</h2>',
+			esc_html( apply_filters( 'generate_comments_title_output', $comments_title, $comments_number ) )
 		);
 
 		/**
@@ -124,7 +119,7 @@
 		<?php
 	endif;
 
-	comment_form();
+	comment_form( apply_filters( 'generate_comment_form_args', array() ) );
 	?>
 
 </div><!-- #comments -->
diff --git a/content.php b/content.php
index f82ed9f5..5b94c3b7 100644
--- a/content.php
+++ b/content.php
@@ -81,8 +81,10 @@
 
 				wp_link_pages(
 					array(
-						'before' => '<div class="page-links">' . __( 'Pages:', 'generatepress' ),
-						'after'  => '</div>',
+						'before'      => '<div class="page-links" role="navigation" aria-label="' . esc_attr__( 'Page Navigation', 'generatepress' ) . '">' . esc_html__( 'Pages:', 'generatepress' ),
+						'after'       => '</div>',
+						'link_before' => '<span class="page-link-item">',
+						'link_after'  => '</span>',
 					)
 				);
 				?>
diff --git a/no-results.php b/no-results.php
index fc6bba2f..54914d10 100644
--- a/no-results.php
+++ b/no-results.php
@@ -10,7 +10,7 @@
 }
 ?>
 
-<div class="no-results not-found">
+<div class="no-results not-found" role="alert" aria-live="polite">
 	<div class="inside-article">
 		<?php
 		/**
@@ -53,13 +53,23 @@
 					</p>
 
 				<?php elseif ( is_search() ) : ?>
-
-					<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' ); ?></p>
+					<?php
+					$nothing_found_search = apply_filters(
+						'generate_search_not_found',
+						__( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'generatepress' )	
+					);
+					?>
+					<p><?php echo esc_html( $nothing_found_search ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php else : ?>
-
-					<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'generatepress' ); ?></p>
+					<?php
+					$nothing_found_other = apply_filters(
+						'generate_other_not_found',
+						__( 'It seems we can&rsquo;t find what you’re looking for. Perhaps searching can help.', 'generatepress' )
+					);
+					?>
+					<p><?php echo esc_html( $nothing_found_other ); ?></p>
 					<?php get_search_form(); ?>
 
 				<?php endif; ?>