diff --git a/404.php b/404.php
index 0f852e3e..f1f6519d 100644
--- a/404.php
+++ b/404.php
@@ -6,16 +6,21 @@
  */
 
 get_header();
+
+$container   = get_theme_mod( 'understrap_container_type' );
+$sidebar_pos = get_theme_mod( 'understrap_sidebar_position' );
+
 ?>
+
 <div class="wrapper" id="404-wrapper">
 
-	<div class="container" id="content">
+	<div class="<?php echo esc_html( $container ); ?>" id="content" tabindex="-1">
 
 		<div class="row">
 
-			<div class="content-area" id="primary">
+			<div class="col-md-12 content-area" id="primary">
 
-				<main class="site-main" id="main" role="main">
+				<main class="site-main" id="main">
 
 					<section class="error-404 not-found">
 
@@ -74,7 +79,7 @@ get_header();
 
 			</div><!-- #primary -->
 
-		</div> <!-- .row -->
+		</div><!-- .row -->
 
 	</div><!-- Container end -->