diff --git a/404.php b/404.php
index 4b58b334..492cdc09 100644
--- a/404.php
+++ b/404.php
@@ -76,7 +76,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 					</section><!-- .error-404 -->
 
-				</main><!-- #main -->
+				</main>
 
 			</div><!-- #primary -->
 
diff --git a/archive.php b/archive.php
index 2607bc0d..97b48cd4 100644
--- a/archive.php
+++ b/archive.php
@@ -21,8 +21,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the right sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -52,12 +54,13 @@ $container = get_theme_mod( 'understrap_container_type' );
 				}
 				?>
 
-			</main><!-- #main -->
+			</main>
 
 			<?php
 			// Display the pagination component.
 			understrap_pagination();
-			// Do the right sidebar check.
+
+			// Do the right sidebar check and close div#primary.
 			get_template_part( 'global-templates/right-sidebar-check' );
 			?>
 
diff --git a/author.php b/author.php
index 107050b0..6f1608ca 100644
--- a/author.php
+++ b/author.php
@@ -20,8 +20,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the left sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -82,8 +84,8 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 				</header><!-- .page-header -->
 
-				<!-- The Loop -->
 				<?php
+				// Start the loop.
 				if ( have_posts() ) {
 					while ( have_posts() ) {
 						the_post();
@@ -93,15 +95,17 @@ $container = get_theme_mod( 'understrap_container_type' );
 					get_template_part( 'loop-templates/content', 'none' );
 				}
 				?>
-				<!-- End Loop -->
 
-			</main><!-- #main -->
+			</main>
 
-			<!-- The pagination component -->
-			<?php understrap_pagination(); ?>
 
-			<!-- Do the right sidebar check -->
-			<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+			<?php
+			// Display the pagination component.
+			understrap_pagination();
+
+			// Do the right sidebar check and close div#primary.
+			get_template_part( 'global-templates/right-sidebar-check' );
+			?>
 
 		</div> <!-- .row -->
 
diff --git a/footer.php b/footer.php
index 4d54502b..e436b331 100644
--- a/footer.php
+++ b/footer.php
@@ -33,15 +33,16 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 				</footer><!-- #colophon -->
 
-			</div><!--col end -->
+			</div><!-- col -->
 
-		</div><!-- row end -->
+		</div><!-- .row -->
 
-	</div><!-- container end -->
+	</div><!-- .container(fluid) -->
 
-</div><!-- wrapper end -->
+</div><!-- #wrapper-footer -->
 
-</div><!-- #page we need this extra closing tag here -->
+<?php // Closing div#page from header.php. ?>
+</div><!-- #page -->
 
 <?php wp_footer(); ?>
 
diff --git a/global-templates/navbar-collapse-bootstrap4.php b/global-templates/navbar-collapse-bootstrap4.php
index c6235925..dd2126fa 100644
--- a/global-templates/navbar-collapse-bootstrap4.php
+++ b/global-templates/navbar-collapse-bootstrap4.php
@@ -66,4 +66,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 	</div><!-- .container -->
 <?php endif; ?>
 
-</nav><!-- .site-navigation -->
+</nav><!-- #main-nav -->
diff --git a/global-templates/navbar-collapse-bootstrap5.php b/global-templates/navbar-collapse-bootstrap5.php
index ab4bdea7..88ad7254 100644
--- a/global-templates/navbar-collapse-bootstrap5.php
+++ b/global-templates/navbar-collapse-bootstrap5.php
@@ -62,4 +62,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 	</div><!-- .container(-fluid) -->
 
-</nav><!-- .site-navigation -->
+</nav><!-- #main-nav -->
diff --git a/global-templates/navbar-offcanvas-bootstrap5.php b/global-templates/navbar-offcanvas-bootstrap5.php
index bccd6d14..cf7cc360 100644
--- a/global-templates/navbar-offcanvas-bootstrap5.php
+++ b/global-templates/navbar-offcanvas-bootstrap5.php
@@ -69,4 +69,4 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 	</div><!-- .container(-fluid) -->
 
-</nav><!-- .site-navigation -->
+</nav><!-- #main-nav -->
diff --git a/global-templates/right-sidebar-check.php b/global-templates/right-sidebar-check.php
index 1987914d..68c26db2 100644
--- a/global-templates/right-sidebar-check.php
+++ b/global-templates/right-sidebar-check.php
@@ -7,9 +7,10 @@
 
 // Exit if accessed directly.
 defined( 'ABSPATH' ) || exit;
-?>
 
-</div><!-- #closing the primary container from /global-templates/left-sidebar-check.php -->
+// Closing the primary container from /global-templates/left-sidebar-check.php.
+?>
+</div><!-- #primary -->
 
 <?php
 $sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
diff --git a/header.php b/header.php
index c71a7872..ddcb5c9a 100644
--- a/header.php
+++ b/header.php
@@ -33,4 +33,4 @@ $navbar_type       = get_theme_mod( 'understrap_navbar_type', 'collapse' );
 
 		<?php get_template_part( 'global-templates/navbar', $navbar_type . '-' . $bootstrap_version ); ?>
 
-	</header><!-- #wrapper-navbar end -->
+	</header><!-- #wrapper-navbar -->
diff --git a/inc/pagination.php b/inc/pagination.php
index d7f620d7..0a32b976 100644
--- a/inc/pagination.php
+++ b/inc/pagination.php
@@ -72,6 +72,7 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
 
 		?>
 
+		<!-- The pagination component -->
 		<nav aria-labelledby="posts-nav-label">
 
 			<h2 id="posts-nav-label" class="screen-reader-text">
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 282098d0..c1216eff 100644
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -293,7 +293,7 @@ if ( ! function_exists( 'understrap_post_nav' ) ) {
 				}
 				?>
 			</div><!-- .nav-links -->
-		</nav><!-- .navigation -->
+		</nav><!-- .post-navigation -->
 		<?php
 	}
 }
diff --git a/inc/woocommerce.php b/inc/woocommerce.php
index 0e59d53b..54abfebd 100644
--- a/inc/woocommerce.php
+++ b/inc/woocommerce.php
@@ -58,11 +58,11 @@ if ( ! function_exists( 'understrap_woocommerce_wrapper_end' ) ) {
 	 * Display the theme specific end of the page wrapper.
 	 */
 	function understrap_woocommerce_wrapper_end() {
-		echo '</main><!-- #main -->';
+		echo '</main>';
 		get_template_part( 'global-templates/right-sidebar-check' );
 		echo '</div><!-- .row -->';
-		echo '</div><!-- Container end -->';
-		echo '</div><!-- Wrapper end -->';
+		echo '</div><!-- .container(-fluid) -->';
+		echo '</div><!-- #woocommerce-wrapper -->';
 	}
 }
 
diff --git a/index.php b/index.php
index 048ed203..26041211 100644
--- a/index.php
+++ b/index.php
@@ -29,8 +29,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check and opens the primary div -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the left sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -52,13 +54,15 @@ $container = get_theme_mod( 'understrap_container_type' );
 				}
 				?>
 
-			</main><!-- #main -->
+			</main>
 
-			<!-- The pagination component -->
-			<?php understrap_pagination(); ?>
+			<?php
+			// Display the pagination component.
+			understrap_pagination();
 
-			<!-- Do the right sidebar check -->
-			<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+			// Do the right sidebar check and close div#primary.
+			get_template_part( 'global-templates/right-sidebar-check' );
+			?>
 
 		</div><!-- .row -->
 
diff --git a/loop-templates/content-author.php b/loop-templates/content-author.php
index 46f193ac..a4d1971f 100644
--- a/loop-templates/content-author.php
+++ b/loop-templates/content-author.php
@@ -44,4 +44,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</footer><!-- .entry-footer -->
 
-</article><!-- #post-## -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/loop-templates/content-page.php b/loop-templates/content-page.php
index 0511c45c..19445996 100644
--- a/loop-templates/content-page.php
+++ b/loop-templates/content-page.php
@@ -34,4 +34,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</footer><!-- .entry-footer -->
 
-</article><!-- #post-## -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/loop-templates/content-search.php b/loop-templates/content-search.php
index cd6088f2..a78cd438 100644
--- a/loop-templates/content-search.php
+++ b/loop-templates/content-search.php
@@ -44,4 +44,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</footer><!-- .entry-footer -->
 
-</article><!-- #post-## -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/loop-templates/content-single.php b/loop-templates/content-single.php
index c24d3ed0..987c5e7c 100644
--- a/loop-templates/content-single.php
+++ b/loop-templates/content-single.php
@@ -40,4 +40,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</footer><!-- .entry-footer -->
 
-</article><!-- #post-## -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/loop-templates/content.php b/loop-templates/content.php
index 53338529..b696eaa5 100644
--- a/loop-templates/content.php
+++ b/loop-templates/content.php
@@ -47,4 +47,4 @@ defined( 'ABSPATH' ) || exit;
 
 	</footer><!-- .entry-footer -->
 
-</article><!-- #post-## -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/page-templates/both-sidebarspage.php b/page-templates/both-sidebarspage.php
index 5e9788c7..131da455 100644
--- a/page-templates/both-sidebarspage.php
+++ b/page-templates/both-sidebarspage.php
@@ -48,7 +48,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 					}
 					?>
 
-				</main><!-- #main -->
+				</main>
 
 			</div><!-- #primary -->
 
diff --git a/page-templates/fullwidthpage.php b/page-templates/fullwidthpage.php
index b1f161e2..fff2eb45 100644
--- a/page-templates/fullwidthpage.php
+++ b/page-templates/fullwidthpage.php
@@ -40,11 +40,11 @@ if ( is_front_page() ) {
 					}
 					?>
 
-				</main><!-- #main -->
+				</main>
 
 			</div><!-- #primary -->
 
-		</div><!-- .row end -->
+		</div><!-- .row -->
 
 	</div><!-- #content -->
 
diff --git a/page-templates/left-sidebarpage.php b/page-templates/left-sidebarpage.php
index 422f67c8..7c95f7d1 100644
--- a/page-templates/left-sidebarpage.php
+++ b/page-templates/left-sidebarpage.php
@@ -39,7 +39,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 					}
 					?>
 
-				</main><!-- #main -->
+				</main>
 
 			</div><!-- #primary -->
 
diff --git a/page-templates/right-sidebarpage.php b/page-templates/right-sidebarpage.php
index a71e3a13..125d578b 100644
--- a/page-templates/right-sidebarpage.php
+++ b/page-templates/right-sidebarpage.php
@@ -37,7 +37,7 @@ $container = get_theme_mod( 'understrap_container_type' );
 					}
 					?>
 
-				</main><!-- #main -->
+				</main>
 
 			</div><!-- #primary -->
 
diff --git a/page.php b/page.php
index 91efd02b..d3b9d1e1 100644
--- a/page.php
+++ b/page.php
@@ -25,8 +25,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the left sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -42,10 +44,12 @@ $container = get_theme_mod( 'understrap_container_type' );
 				}
 				?>
 
-			</main><!-- #main -->
+			</main>
 
-			<!-- Do the right sidebar check -->
-			<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+			<?php
+			// Do the right sidebar check and close div#primary.
+			get_template_part( 'global-templates/right-sidebar-check' );
+			?>
 
 		</div><!-- .row -->
 
diff --git a/search.php b/search.php
index 17993f05..dee69f8d 100644
--- a/search.php
+++ b/search.php
@@ -20,8 +20,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check and opens the primary div -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the left sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -61,13 +63,15 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 				<?php endif; ?>
 
-			</main><!-- #main -->
+			</main>
 
-			<!-- The pagination component -->
-			<?php understrap_pagination(); ?>
+			<?php
+			// Display the pagination component.
+			understrap_pagination();
 
-			<!-- Do the right sidebar check -->
-			<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+			// Do the right sidebar check and close div#primary.
+			get_template_part( 'global-templates/right-sidebar-check' );
+			?>
 
 		</div><!-- .row -->
 
diff --git a/single.php b/single.php
index 80edec6d..38379d84 100644
--- a/single.php
+++ b/single.php
@@ -18,8 +18,10 @@ $container = get_theme_mod( 'understrap_container_type' );
 
 		<div class="row">
 
-			<!-- Do the left sidebar check -->
-			<?php get_template_part( 'global-templates/left-sidebar-check' ); ?>
+			<?php
+			// Do the left sidebar check and open div#primary.
+			get_template_part( 'global-templates/left-sidebar-check' );
+			?>
 
 			<main class="site-main" id="main">
 
@@ -36,10 +38,12 @@ $container = get_theme_mod( 'understrap_container_type' );
 				}
 				?>
 
-			</main><!-- #main -->
+			</main>
 
-			<!-- Do the right sidebar check -->
-			<?php get_template_part( 'global-templates/right-sidebar-check' ); ?>
+			<?php
+			// Do the right sidebar check and close div#primary.
+			get_template_part( 'global-templates/right-sidebar-check' );
+			?>
 
 		</div><!-- .row -->