diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index 8062ff73..38926bcb 100644
--- a/styles/less/ui/settings/settings.less
+++ b/styles/less/ui/settings/settings.less
@@ -16,6 +16,12 @@
             }
         }
 
+        &.six-columns {
+            display: grid;
+            grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+            gap: 2px;
+        }
+
         &.start-align {
             align-self: flex-start;
         }
@@ -103,28 +109,14 @@
         gap: 4px;
     }
 
-    .trait-array-container {
-        display: flex;
-        justify-content: space-evenly;
-        gap: 8px;
-        margin-bottom: 16px;
+    .trait-item {
 
-        .trait-array-item {
-            position: relative;
-            display: flex;
-            justify-content: center;
+        span {
+            font-variant: petite-caps;
+        }
 
-            label {
-                position: absolute;
-                top: -7px;
-                font-size: 12px;
-                font-variant: petite-caps;
-                z-index: 2;
-            }
-
-            input {
-                text-align: center;
-            }
+        input {
+            text-align: center;
         }
     }
 
diff --git a/templates/settings/homebrew-settings/settings.hbs b/templates/settings/homebrew-settings/settings.hbs
index 1c7c787d..893e1bc3 100644
--- a/templates/settings/homebrew-settings/settings.hbs
+++ b/templates/settings/homebrew-settings/settings.hbs
@@ -12,15 +12,18 @@
         {{formGroup settingFields.schema.fields.maxLoadout value=settingFields._source.maxLoadout localize=true}}
         <div class="settings-hint"><label>{{localize "DAGGERHEART.SETTINGS.Homebrew.FIELDS.maxLoadout.hint"}}</label></div>
 
-        <h4>{{localize "DAGGERHEART.SETTINGS.Homebrew.FIELDS.traitArray.label"}}</h4>
-        <div class="trait-array-container">
+        <fieldset class="six-columns">
+            <legend>
+                {{localize "DAGGERHEART.SETTINGS.Homebrew.FIELDS.traitArray.label"}}
+            </legend>
+
             {{#each settingFields._source.traitArray as |trait index|}}
-                <div class="trait-array-item">
-                    <label>{{localize "DAGGERHEART.GENERAL.Modifier.single"}} {{add index 1}}</label>
-                    <input type="text" data-dtype="Number" name="{{concat "traitArray." index}}" value="{{this}}" />
-                </div>
+            <div class="input trait-item">
+                <span>{{localize "DAGGERHEART.GENERAL.Modifier.single"}} {{add index 1}}</span>
+                <input type="text" data-dtype="Number" name="{{concat "traitArray." index}}" value="{{this}}" />
+            </div>
             {{/each}}
-        </div>   
+        </fieldset>
 
         <fieldset>
             <legend>