diff --git a/src/pages/IndexPage/Index.sass b/src/pages/IndexPage/Index.sass
index ab1ef30..182e771 100644
--- a/src/pages/IndexPage/Index.sass
+++ b/src/pages/IndexPage/Index.sass
@@ -53,3 +53,15 @@ h1
     @media only screen and (max-width: views.$tablet)
       padding: 3.25rem 0 0 0
       font-size: 1rem
+
+.mobile-buttons
+  padding: 2rem 0 0 0
+  display: flex
+  flex-direction: column
+  flex-wrap: wrap
+  justify-content: center
+  align-items: stretch
+  align-content: stretch
+  text-align: center
+  gap: 0.5rem
+  width: 55vw
diff --git a/src/pages/IndexPage/Index.tsx b/src/pages/IndexPage/Index.tsx
index 8e48009..180614d 100644
--- a/src/pages/IndexPage/Index.tsx
+++ b/src/pages/IndexPage/Index.tsx
@@ -1,5 +1,5 @@
 import './Index.sass'
-import { Button, Page, Padding, Display, Row, Logo, Footer, Image, Copyright, Column } from '../../components'
+import { Button, Page, Padding, Display, Row, Logo, Footer, Copyright, Column, Image } from '../../components'
 import { onMount } from 'solid-js'
 import { ofetch } from 'ofetch'
 import ocboAvif from '../../assets/images/optimized/ocbologo.avif'
@@ -50,8 +50,8 @@ export default () => {
   return (
     <>
       <Page>
-        <Padding left={4.75} right={4.75} top={0} bottom={0}>
-          <Display desktop tablet>
+        <Display desktop tablet>
+          <Padding left={4.75} right={4.75} top={0} bottom={0}>
             <Row content="split">
               <Row content="left" gap={2}>
                 <Logo size={200} />
@@ -70,32 +70,15 @@ export default () => {
                 <span class="title__sub">for Office of the City Building Official</span>
                 <p class="title__paragraph">A paperless and effortless solution on signing permits</p>
               </section>
-              <Column>
-                <Image avif={pageLogoAvif} webp={pageLogoWebp} size={500}></Image>
-              </Column>
+
+              <Display desktop>
+                <Column padding="3rem 0 0 0">
+                  <Image avif={pageLogoAvif} webp={pageLogoWebp} size={450}></Image>
+                </Column>
+              </Display>
             </Row>
-          </Display>
+          </Padding>
 
-          <Display mobile>
-            <Row>
-              <Logo size={200} />
-              <h1>OCBO e-Sign</h1>
-
-              <section class="title">
-                <h1 class="title__main">Secure e-Signature</h1>
-                <span class="title__sub">for Office of the City Building Official</span>
-                <p class="title__paragraph">A paperless and effortless solution on signing permits</p>
-              </section>
-
-              <Column gap={0.5}>
-                <Button wide label="Login" edges="curved" design="bo-primary" to="/login" />
-                <Button wide label="Register" edges="curved" design="bo-primary" to="/register" />
-              </Column>
-            </Row>
-          </Display>
-        </Padding>
-
-        <Display desktop tablet>
           <Footer>
             <Row content="split">
               <Row gap={0.5}>
@@ -116,17 +99,26 @@ export default () => {
         </Display>
 
         <Display mobile>
-          <Footer>
-            <Column>
-              <Column gap={0.25}>
-                <Copyright year="2025" name="Office of the City Building Official" />
-                <span>Davao City, Philippines</span>
+          <Column>
+            <Logo size={200} />
+            <h1>OCBO e-Sign</h1>
+            <Image avif={pageLogoAvif} webp={pageLogoWebp} size={200}></Image>
 
-                <Row gap={0.25}>
-                  <span>Developed by:</span> <Image avif={patAvif} webp={patWebp} size={60}></Image>
-                  <span>Pat Alcala</span>
-                </Row>
-              </Column>
+            <section class="mobile-buttons">
+              <Button wide label="Login" edges="curved" design="bo-primary" to="/login" />
+              <Button wide label="Register" edges="curved" design="bo-primary" to="/register" />
+            </section>
+          </Column>
+
+          <Footer>
+            <Column gap={0.25} width="100%">
+              <Copyright year="2025" name="Office of the City Building Official" />
+              <span>Davao City, Philippines</span>
+
+              <Row gap={0.25}>
+                <span>Developed by:</span> <Image avif={patAvif} webp={patWebp} size={60}></Image>
+                <span>Pat Alcala</span>
+              </Row>
             </Column>
           </Footer>
         </Display>