diff --git a/churchinfo/Include/Footer.php b/churchinfo/Include/Footer.php
index 5e99cff74a..d8e33587b0 100644
--- a/churchinfo/Include/Footer.php
+++ b/churchinfo/Include/Footer.php
@@ -17,8 +17,8 @@
 ?>
 			</section><!-- /.content -->
 
-		</aside><!-- /.right-side -->
-        <!-- /.control-sidebar -->
+			</div>
+			<!-- /.content-wrapper -->
 		<footer class="main-footer">
 			<div class="pull-right hidden-xs">
 				<b>Version</b> <?= $_SESSION['sSoftwareInstalledVersion'] ?>
diff --git a/churchinfo/Include/Header-function.php b/churchinfo/Include/Header-function.php
index a333fd5ebb..41d443b3b7 100644
--- a/churchinfo/Include/Header-function.php
+++ b/churchinfo/Include/Header-function.php
@@ -403,8 +403,8 @@ function Header_body_menu()
                     </ul>
                 </section>
             </aside>
-            <!-- Right side column. Contains the navbar and content of the page -->
-            <aside class="right-side">
+            <!-- Content Wrapper. Contains page content -->
+            <div class="content-wrapper">
                 <section class="content-header">
                     <h1>
                         <?php