diff --git a/src/themes/scss/theme/components/_boxes.scss b/src/themes/scss/theme/components/_boxes.scss
index 211e3d5..4e3bd83 100644
--- a/src/themes/scss/theme/components/_boxes.scss
+++ b/src/themes/scss/theme/components/_boxes.scss
@@ -2,6 +2,20 @@
 @use '@lucas-labs/lui-micro/color' as color;
 
 @mixin segment {
+    .ui.segment {
+        margin: var.get('measure/1x') 0;
+        padding: var.get('measure/1x');
+        border-radius: var(--border-radius);
+    }
+
+    .ui.segment form >*:first-child {
+        margin-top: 0;
+    }
+
+    .ui.segment form >*:last-child {
+        margin-bottom: 0;
+    }
+
     .ui.top.attached.header {
         border-radius: var(--border-radius) var(--border-radius) 0 0;
     }
@@ -11,15 +25,11 @@
         border-bottom-right-radius: var(--border-radius);
     }
 
-    .ui.segments:not(.horizontal)>.segment:first-child {
-        border-radius: var(--border-radius);
-    }
-
-    .ui.segments:not(.horizontal)>.segment:last-child {
+    .ui.segments:not(.horizontal)>.segment:first-child, .ui.segments.horizontal>.segment:first-child {
         border-radius: var(--border-radius);
     }
 
-    .ui.segment {
+    .ui.segments:not(.horizontal)>.segment:last-child, .ui.horizontal.segments>.segment:last-child {
         border-radius: var(--border-radius);
     }
 }
diff --git a/src/themes/scss/theme/modules/settings/section/_content.scss b/src/themes/scss/theme/modules/settings/section/_content.scss
index 8e94e55..4cde472 100644
--- a/src/themes/scss/theme/modules/settings/section/_content.scss
+++ b/src/themes/scss/theme/modules/settings/section/_content.scss
@@ -2,7 +2,6 @@
 @use '@lucas-labs/lui-micro/color' as color;
 
 @mixin content {
-
     .ui.top.attached.header {
         background: unset;
         border: none;
@@ -54,6 +53,14 @@
             }
         }
 
+        .ui.form .field {
+            margin: 0 0 1em;
+        }
+
+        .ui.form .fields .fields, .ui.form .field:last-child, .ui.form .fields:last-child .field {
+            margin-bottom: 0;
+        }
+
         .field {
             margin: var.get('measure/1x') 0;
         }