diff --git a/src/webui/site-info/index.html b/src/webui/site-info/index.html
index 564e31b..8eeebe4 100644
--- a/src/webui/site-info/index.html
+++ b/src/webui/site-info/index.html
@@ -6,6 +6,7 @@
 
     <h1>Edit Site Info</h1>
     <form id="site-info-form">
+    <button type="submit" class="top-save">Save</button>
       <!-- Info Section -->
       <fieldset>
         <h2>Info</h2>
@@ -132,6 +133,7 @@
       </fieldset>
       <button type="submit">Save</button>
     </form>
+    <!-- Stepper -->
     <div class="section">
         <h2>Steps</h2>
         <p> Follow the steps to generate your static gallery</p>
diff --git a/src/webui/style/style.css b/src/webui/style/style.css
index 368d246..373df7b 100644
--- a/src/webui/style/style.css
+++ b/src/webui/style/style.css
@@ -7,7 +7,7 @@ body {
   flex-direction: column;
   min-height: 100vh;
   margin:0px;
-  width: 100vw;
+  min-width: 320px;
 }
 
 a {
@@ -244,6 +244,14 @@ h2 {
   margin: 30px 0 0 0;
 }
 
+#hero-count-bottom, #gallery-count-bottom {
+  flex-basis: 100%;
+}
+
+.bottom-action-row {
+  margin-top: 30px;
+}
+
 /* --- Photo Card --- */
 .photo {
   background-color: rgb(67 67 67 / 26%);
@@ -618,6 +626,10 @@ label {
   box-shadow: 0 2px 8px rgba(0,0,0,0.07);
 }
 
+#site-info-form button[type="submit"].top-save, #theme-editor-form button[type="submit"].top-save {
+  margin-bottom: 0;
+}
+
 #theme-editor-form input, #theme-editor-form textarea,#theme-editor-form select {
   margin-bottom: 18px;
 }
@@ -626,7 +638,9 @@ label {
   gap: 0 18px;
 }
 
-
+.theme-info {
+  margin-bottom: 25px;
+}
 
 #site-info-form input::placeholder,
 #theme-editor-form input::placeholder,
@@ -919,6 +933,7 @@ justify-content: center;
 
 #footer a {
   color: #fff;
+  margin: auto;
 }
 
 .footer-credit .lum-first::before {
@@ -1035,14 +1050,16 @@ justify-content: center;
     /* Hide the default arrow */
     color: transparent;
   }
-  #site-info-form, #theme-editor-form {
-    padding: 18px 8px;
-  }
+
   .input-field {
     min-width: 100%;
     margin-bottom: 12px;
   }
 
+  #site-info-form button[type="submit"], #theme-editor-form button[type="submit"] {
+    width: 100%;
+  }
+
   #color-picker .input-field{
     min-width: 170px;
   }
@@ -1053,10 +1070,3 @@ justify-content: center;
   }
 }
 
-#hero-count-bottom, #gallery-count-bottom {
-  flex-basis: 100%;
-}
-
-.bottom-action-row {
-  margin-top: 30px;
-}
\ No newline at end of file
diff --git a/src/webui/theme-editor/index.html b/src/webui/theme-editor/index.html
index 2a97c8e..084a272 100644
--- a/src/webui/theme-editor/index.html
+++ b/src/webui/theme-editor/index.html
@@ -10,6 +10,7 @@
       <strong>Current theme:</strong> <span id="current-theme"></span>
     </div>
     <form id="theme-editor-form">
+      <button type="submit" class="top-save">Save</button>
       <!-- Colors Section -->
       <fieldset id="color-picker">
         <h2>Colors</h2>
@@ -133,8 +134,9 @@
           </div>
         </div>
       </fieldset>
-      <button type="submit">Save Theme</button>
+      <button type="submit">Save</button>
     </form>
+    <!-- Stepper -->
     <div class="section">
       <h2>Steps</h2>
       <p> Follow the steps to generate your static gallery</p>