diff --git a/LANCommander/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml b/LANCommander/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml
index 993178d..3ab2cf0 100644
--- a/LANCommander/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml
+++ b/LANCommander/Areas/Identity/Pages/Account/FirstTimeSetup.cshtml
@@ -7,8 +7,8 @@
     ViewData["Title"] = "First Time Setup";
 }
 
-<div class="ant-row ant-row-middle ant-row-space-around" style="position: absolute; top:0; left: 0; right: 0; bottom: 0;">
-    <div class="ant-col ant-col-10">
+<div class="ant-row ant-row-middle ant-row-space-around" style="min-height: 100vh; margin-top: -24px;">
+    <div class="ant-col ant-col-xs-24 ant-col-md-10">
 
         <div style="text-align: center; margin-bottom: 24px;">
             <img src="~/static/logo.svg" />
diff --git a/LANCommander/Areas/Identity/Pages/Account/Login.cshtml b/LANCommander/Areas/Identity/Pages/Account/Login.cshtml
index 2e710a1..8b0c13e 100644
--- a/LANCommander/Areas/Identity/Pages/Account/Login.cshtml
+++ b/LANCommander/Areas/Identity/Pages/Account/Login.cshtml
@@ -6,8 +6,8 @@
     ViewData["Title"] = "Log in";
 }
 
-<div class="ant-row ant-row-middle ant-row-space-around" style="position: absolute; top:0; left: 0; right: 0; bottom: 0;">
-    <div class="ant-col ant-col-10">
+<div class="ant-row ant-row-middle ant-row-space-around" style="min-height: 100vh; margin-top: -24px;">
+    <div class="ant-col ant-col-xs-24 ant-col-md-10">
 
         <div style="text-align: center; margin-bottom: 24px;">
             <img src="~/static/logo.svg" />
diff --git a/LANCommander/Areas/Identity/Pages/Account/Register.cshtml b/LANCommander/Areas/Identity/Pages/Account/Register.cshtml
index f141f05..22e087e 100644
--- a/LANCommander/Areas/Identity/Pages/Account/Register.cshtml
+++ b/LANCommander/Areas/Identity/Pages/Account/Register.cshtml
@@ -5,8 +5,8 @@
     ViewData["Title"] = "Register";
 }
 
-<div class="ant-row ant-row-middle ant-row-space-around" style="position: absolute; top:0; left: 0; right: 0; bottom: 0;">
-    <div class="ant-col ant-col-10">
+<div class="ant-row ant-row-middle ant-row-space-around" style="min-height: 100vh; margin-top: -24px;">
+    <div class="ant-col ant-col-xs-24 ant-col-md-10">
 
         <div style="text-align: center; margin-bottom: 24px;">
             <img src="~/static/logo.svg" />
diff --git a/LANCommander/Views/Shared/_LayoutBasic.cshtml b/LANCommander/Views/Shared/_LayoutBasic.cshtml
index 5c0640c..858281d 100644
--- a/LANCommander/Views/Shared/_LayoutBasic.cshtml
+++ b/LANCommander/Views/Shared/_LayoutBasic.cshtml
@@ -9,7 +9,11 @@
     <link href="~/css/site.css" rel="stylesheet" />
 </head>
 <body>
-    @RenderBody()
+    <section class="layout ant-layout">
+        <main class="ant-layout-content" style="padding: 24px; min-height: 100vh;">
+            @RenderBody()
+        </main>
+    </section>
 
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/lib/antv/g2plot/dist/g2plot.js"></script>
