diff --git a/frontend/src/pages/admin/settings.astro b/frontend/src/pages/admin/settings.astro
index 2b5683b..5f29642 100644
--- a/frontend/src/pages/admin/settings.astro
+++ b/frontend/src/pages/admin/settings.astro
@@ -20,7 +20,7 @@ import { API_BASE as apiBase } from '../../lib/api';
       <div id="loading">Loading settings...</div>
       <div id="error" class="error-box" style="display: none;"></div>
 
-      <form id="settings-form" class="ui-form" style="--ui-form-control-max-width: 400px; display: none;">
+      <form id="settings-form" class="ui-form" style="--ui-form-control-max-width: 400px; --ui-form-group-mb: 1rem; display: none;">
         <!-- General Settings -->
         <section class="settings-section ui-card ui-card-soft ui-card-pad-md">
           <h2>General</h2>
@@ -131,30 +131,11 @@ import { API_BASE as apiBase } from '../../lib/api';
     border-bottom: 1px solid var(--color-border);
   }
 
-  .form-group {
-    margin-bottom: 1rem;
-  }
-
-  .form-group:last-child {
-    margin-bottom: 0;
-  }
-
-  .form-group > label {
-    display: block;
-    font-weight: 500;
-    margin-bottom: 0.5rem;
-  }
-
-  .form-group input:focus,
-  .form-group select:focus {
-    outline: none;
-    border-color: var(--color-primary);
-  }
-
   .checkbox-label {
     display: flex;
     align-items: center;
     gap: 0.5rem;
+    margin-bottom: 0;
     cursor: pointer;
     font-weight: normal !important;
     color: var(--color-text);
diff --git a/frontend/src/pages/setup.astro b/frontend/src/pages/setup.astro
index ba8077b..20a27fb 100644
--- a/frontend/src/pages/setup.astro
+++ b/frontend/src/pages/setup.astro
@@ -34,7 +34,7 @@ if (!setupRequired) {
         <p>Let's configure your governance platform</p>
       </div>
 
-      <form id="setup-form" class="setup-form ui-form">
+      <form id="setup-form" class="setup-form ui-form" style="--ui-form-group-mb: 1rem;">
         <!-- Step 1: Instance Identity -->
         <section class="setup-section" data-step="1">
           <h2>Instance Identity</h2>
@@ -172,10 +172,6 @@ if (!setupRequired) {
     margin: 0 0 1rem 0;
   }
 
-  .form-group {
-    margin-bottom: 1rem;
-  }
-
   .mode-options {
     display: grid;
     gap: 1rem;