diff --git a/404.php b/404.php
index 2c957f5..d08865d 100644
--- a/404.php
+++ b/404.php
@@ -10,15 +10,18 @@ get_header(); ?>
     <div  id="content" class="container">
         
         <div id="primary" class="content-area">
-            <main id="main" class="site-main" role="main" tabindex="-1">
+
+            <main id="main" class="site-main" role="main">
 
                 <section class="error-404 not-found">
                     
                     <header class="page-header">
+
                         <h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'understrap' ); ?></h1>
                     </header><!-- .page-header -->
 
                     <div class="page-content">
+
                         <p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'understrap' ); ?></p>
 
                         <?php get_search_form(); ?>
@@ -26,20 +29,25 @@ get_header(); ?>
                         <?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
 
                         <?php if ( understrap_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
-                        <div class="widget widget_categories">
-                            <h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap' ); ?></h2>
-                            <ul>
-                            <?php
-                                wp_list_categories( array(
-                                    'orderby'    => 'count',
-                                    'order'      => 'DESC',
-                                    'show_count' => 1,
-                                    'title_li'   => '',
-                                    'number'     => 10,
-                                ) );
-                            ?>
-                            </ul>
-                        </div><!-- .widget -->
+
+                            <div class="widget widget_categories">
+
+                                <h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap' ); ?></h2>
+
+                                <ul>
+                                <?php
+                                    wp_list_categories( array(
+                                        'orderby'    => 'count',
+                                        'order'      => 'DESC',
+                                        'show_count' => 1,
+                                        'title_li'   => '',
+                                        'number'     => 10,
+                                    ) );
+                                ?>
+                                </ul>
+
+                            </div><!-- .widget -->
+                        
                         <?php endif; ?>
 
                         <?php
diff --git a/archive.php b/archive.php
index d296e88..d8f198c 100644
--- a/archive.php
+++ b/archive.php
@@ -13,9 +13,9 @@ get_header(); ?>
     
     <div  id="content" class="container">
         
-	   <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
+	    <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
            
-            <main id="main" class="site-main" role="main" tabindex="-1">
+        <main id="main" class="site-main" role="main">
 
                   <?php if ( have_posts() ) : ?>
 
@@ -47,13 +47,13 @@ get_header(); ?>
 
                     <?php endif; ?>
 
-              </main><!-- #main -->
+        </main><!-- #main -->
            
 	    </div><!-- #primary -->
 
         <?php get_sidebar(); ?>
         
-     </div><!-- Container end -->
+    </div><!-- Container end -->
     
 </div><!-- Wrapper end -->
 
diff --git a/index.php b/index.php
index f395411..f2acdea 100644
--- a/index.php
+++ b/index.php
@@ -23,7 +23,7 @@ get_header(); ?>
            
 	       <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
                
-                 <main id="main" class="site-main" role="main" tabindex="-1">
+                 <main id="main" class="site-main" role="main">
                 
                 <?php if ( have_posts() ) : ?>
 
diff --git a/loop-templates/content-page.php b/loop-templates/content-page.php
index 1e8ef87..0ac1495 100644
--- a/loop-templates/content-page.php
+++ b/loop-templates/content-page.php
@@ -6,7 +6,7 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class('content-page-item'); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<header class="entry-header">
 
diff --git a/loop-templates/content-search.php b/loop-templates/content-search.php
index 2708be4..a90e078 100644
--- a/loop-templates/content-search.php
+++ b/loop-templates/content-search.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class('content-search-item'); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<header class="entry-header">
 
diff --git a/loop-templates/content-single.php b/loop-templates/content-single.php
index b9a975c..988f665 100644
--- a/loop-templates/content-single.php
+++ b/loop-templates/content-single.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class('content-single-item'); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
 	<header class="entry-header">
 
diff --git a/page.php b/page.php
index 43229f4..78745c4 100644
--- a/page.php
+++ b/page.php
@@ -18,7 +18,7 @@ get_header(); ?>
         
 	   <div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
        
-             <main id="main" class="site-main" role="main" tabindex="-1">
+             <main id="main" class="site-main" role="main">
 
                 <?php while ( have_posts() ) : the_post(); ?>