diff --git a/php/public/style.css b/php/public/style.css
index d0ce3e63..3d77cdea 100644
--- a/php/public/style.css
+++ b/php/public/style.css
@@ -1,22 +1,9 @@
 html, body {
     padding: 0;
     margin: 0;
-    height: 100%;
-    width: 100%;
-    overflow: clip;
-    background-color: #0082c9;
-    background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%);
     font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen-Sans, Cantarell, Ubuntu, Helvetica Neue, Arial, Noto Color Emoji, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol;;
 }
 
-h1, h2, p {
-    margin: 8px 0 0;
-    text-align: justify;
-}
-h1, h2 {
-    margin-top: 16px;
-}
-
 a {
     text-decoration: none;
     color: #0082c9;
@@ -31,7 +18,7 @@ input[type="submit"] {
     background-color: #0082c9;
     font-weight: bold;
     border-radius: 8px;
-    margin: 0;
+    margin: 3px 3px 3px 0;
     font-size: 14px;
     color: white;
     border: .5px solid black;
@@ -123,11 +110,16 @@ form {
 
 input[type="text"],
 input[type="password"],
-textarea,
 select {
-    padding: 10px 8px;
-    margin: 0;
+    padding-left: 8px;
+    padding-right: 8px;
     height: 34px;
+    margin-bottom: 15px;
+    border-radius: 8px;
+    border: .5px solid black;
+}
+
+textarea {
     border-radius: 8px;
     border: .5px solid black;
 }
@@ -140,7 +132,8 @@ select:focus {
 }
 
 .login > form > input[type="password"],
-.login > form > input[type="text"] {
+.login > form > input[type="text"],
+.login > form > input[type="submit"] {
     width: 100%;
 }
 
@@ -150,14 +143,12 @@ select:focus {
     display: block;
 }
 
-.login > a.button ,
-.login > input[type="submit"] {
+.login a.button,
+.login input[type="submit"] {
     margin-left: auto;
     margin-right: auto;
     display: block;
     text-align: center;
-    line-height: 33px;
-    margin-top: 20px;
 }
 
 .login-wrapper {
@@ -174,28 +165,11 @@ select:focus {
 }
 
 main {
-    padding: 0;
-    margin: 50px 8px 8px;
-    border-radius: 16px;
-    background-color: white;
-    position: static;
-    overflow: scroll;
-    height: calc(100% - 58px);
-    width: calc(100% - 16px);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: start;
-}
-
-section {
+    padding: 20px;
+    max-width: 100%;
+    word-break: break-word;
     max-width: 500px;
     margin: 0 auto;
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
-    justify-content: start;
-    gap: 16px
 }
 
 .logo {
@@ -213,13 +187,12 @@ section {
 }
 
 header {
+    background-color: #0082c9;
+    background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%);
     height: 50px;
     justify-content: space-between;
-    display: inline-flex;
-    position: absolute;
-    top: 0;
-    width: 100%;
     align-items: center;
+    display: flex;
 }
 
 header > form {
diff --git a/php/templates/containers.twig b/php/templates/containers.twig
index 4d14de6a..91e18424 100644
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -16,7 +16,6 @@
     </header>
 
     <main>
-    <section>
         <h1>Nextcloud AIO v9.4.1</h1>
 
         {# Add 2nd tab warning #}
@@ -675,7 +674,6 @@
         <script type="text/javascript" src="before-unload.js"></script>
     {% endif %}
 
-    </section>
     </main>
     <div id="overlay">
         <div class="loader"></div>