diff --git a/src/Modules/SimplCommerce.Module.Core/Areas/Core/Views/HomeAdmin/Index.cshtml b/src/Modules/SimplCommerce.Module.Core/Areas/Core/Views/HomeAdmin/Index.cshtml
index 5d2cee37ff..3467e765d7 100644
--- a/src/Modules/SimplCommerce.Module.Core/Areas/Core/Views/HomeAdmin/Index.cshtml
+++ b/src/Modules/SimplCommerce.Module.Core/Areas/Core/Views/HomeAdmin/Index.cshtml
@@ -238,8 +238,8 @@
         </div>
     </div>
 
-    <div class="container-fluid body-content">
-        <div ui-view></div>
+    <div class="container-fluid body-content body-content-custom">
+        <div class="ui-view-content" ui-view></div>
         <hr />
         <footer>
             <p class="pull-left">&copy; @DateTime.Now.Year - SimplCommerce</p>
diff --git a/src/Modules/SimplCommerce.Module.Core/wwwroot/admin/admin-core.css b/src/Modules/SimplCommerce.Module.Core/wwwroot/admin/admin-core.css
index 110d8a9bad..dd0abedb9f 100644
--- a/src/Modules/SimplCommerce.Module.Core/wwwroot/admin/admin-core.css
+++ b/src/Modules/SimplCommerce.Module.Core/wwwroot/admin/admin-core.css
@@ -1,5 +1,7 @@
 body {
-    height: auto;
+    height: 100%;
+    display:flex;
+    flex-direction: column;
 }
 
 .inline {
@@ -208,4 +210,15 @@ td>span.glyphicon-remove {
 .btn-translate {
     margin-right: 3px;
 }
- 
\ No newline at end of file
+
+.body-content-custom {
+    width: 100% !important;
+    margin: 0 !important;
+    flex: 1;
+    display: flex;
+    flex-direction:column;
+}
+
+.ui-view-content {
+    flex: 1;
+}
\ No newline at end of file
diff --git a/src/Modules/SimplCommerce.Module.Core/wwwroot/site.css b/src/Modules/SimplCommerce.Module.Core/wwwroot/site.css
index b2cf5d90c4..2ddbc03b2b 100644
--- a/src/Modules/SimplCommerce.Module.Core/wwwroot/site.css
+++ b/src/Modules/SimplCommerce.Module.Core/wwwroot/site.css
@@ -1,4 +1,14 @@
 /* Set widths on the form inputs since otherwise they're 100% wide */
+html {
+    height: 100%;
+}
+
+body {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
 input,
 select,
 textarea {
@@ -143,6 +153,7 @@ li.nav-item-group, li.nav-item-group a {
 }
 
 .footer-content {
+    padding-top: 20px;
     margin-top: 30px;
     background-color: #eee;
 }
diff --git a/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_Layout.cshtml b/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_Layout.cshtml
index afea078a67..4bfee02696 100644
--- a/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_Layout.cshtml
+++ b/src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_Layout.cshtml
@@ -117,7 +117,7 @@
 
     @RenderSection("featured", false)
 
-    <div class="container body-content clearfix">
+    <div class="container body-content clearfix flex-grow-1">
         @RenderBody()
     </div>
     <!-- Footer -->
diff --git a/src/SimplCommerce.WebHost/Themes/SampleTheme/Views/Shared/_Layout.cshtml b/src/SimplCommerce.WebHost/Themes/SampleTheme/Views/Shared/_Layout.cshtml
index b37960e635..836b073995 100644
--- a/src/SimplCommerce.WebHost/Themes/SampleTheme/Views/Shared/_Layout.cshtml
+++ b/src/SimplCommerce.WebHost/Themes/SampleTheme/Views/Shared/_Layout.cshtml
@@ -60,7 +60,7 @@
             </div>
         </div>
     </div>
-    <div class="container body-content">
+    <div class="container body-content flex-grow-1">
         @RenderBody()
     </div>
     <div class="footer-content">
diff --git a/src/SimplCommerce.WebHost/Views/Shared/_Layout.cshtml b/src/SimplCommerce.WebHost/Views/Shared/_Layout.cshtml
index 9ccb3bd007..67124e4956 100644
--- a/src/SimplCommerce.WebHost/Views/Shared/_Layout.cshtml
+++ b/src/SimplCommerce.WebHost/Views/Shared/_Layout.cshtml
@@ -54,7 +54,7 @@
         </div>
     </div>
     <partial name="_CookieConsentPartial" />
-    <div class="container body-content clearfix">
+    <div class="container body-content clearfix flex-grow-1">
         @RenderBody()
     </div>
     <div class="footer-content">