diff --git a/footer.php b/footer.php
index 469ebf6..9e0eb4e 100644
--- a/footer.php
+++ b/footer.php
@@ -1,5 +1,3 @@
-</main>
-
 <?php do_action('tailpress_content_end'); ?>
 
 
diff --git a/front-page.php b/front-page.php
index e683a00..f3ff5d4 100755
--- a/front-page.php
+++ b/front-page.php
@@ -1,17 +1,17 @@
 <?php get_header(); ?>
+<main id="content" class="site-content flex-grow">
 
-
-	<?php if ( have_posts() ) : ?>
+	<?php if (have_posts()) : ?>
 		<?php
-		while ( have_posts() ) :
+		while (have_posts()) :
 			the_post();
 			the_content();
-			?>
+		?>
 
 
 		<?php endwhile; ?>
 
 	<?php endif; ?>
 
-<?php
-get_footer();
+	<?php get_footer(); ?>
+</main>
\ No newline at end of file
diff --git a/header.php b/header.php
index 546be28..d0f378f 100644
--- a/header.php
+++ b/header.php
@@ -38,5 +38,4 @@
 
 		<?php do_action('tailpress_content_start'); ?>
 
-		<?php get_template_part('template-parts/utils/scroll-top'); ?>
-		<main id="content" class="site-content flex-grow">
\ No newline at end of file
+		<?php get_template_part('template-parts/utils/scroll-top'); ?>
\ No newline at end of file
diff --git a/page.php b/page.php
index 4b0efa4..3b1e099 100644
--- a/page.php
+++ b/page.php
@@ -1,16 +1,18 @@
 <?php get_header(); ?>
 
-
-<?php if (have_posts()) : ?>
-<?php
-	while (have_posts()) :
-		the_post();
-		the_content();
-?>
+<main id="content" class="site-content flex-grow">
+	<?php if (have_posts()) : ?>
+		<?php
+		while (have_posts()) :
+			the_post();
+			the_content();
+		?>
 
 
-<?php endwhile; ?>
+		<?php endwhile; ?>
 
-<?php endif; ?>
+	<?php endif; ?>
+	</div>
 
-<?php get_footer();
+	<?php get_footer(); ?>
+</main>
\ No newline at end of file