diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less
index cee5475f..5dd203db 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,9 @@
         gap: 4px;
     }
 
-    .trait-array-container {
-        display: flex;
-        justify-content: space-evenly;
-        gap: 8px;
-        margin-bottom: 16px;
-
-        .trait-array-item {
-            position: relative;
-            display: flex;
-            justify-content: center;
-
-            label {
-                position: absolute;
-                top: -7px;
-                font-size: var(--font-size-12);
-                font-variant: petite-caps;
-                z-index: 2;
-            }
-
-            input {
-                text-align: center;
-            }
+    .trait-item {
+        input {
+            text-align: center;
         }
     }
 
diff --git a/templates/settings/homebrew-settings.hbs b/templates/settings/homebrew-settings.hbs
deleted file mode 100644
index 4e2c442f..00000000
--- a/templates/settings/homebrew-settings.hbs
+++ /dev/null
@@ -1,90 +0,0 @@
-<div class="scrollable">
-    <header class="dialog-header">
-        <h1>{{localize 'DAGGERHEART.SETTINGS.Menu.homebrew.name'}}</h1>
-    </header>
-    {{formGroup settingFields.schema.fields.maxFear value=settingFields._source.maxFear localize=true}}
-    {{formGroup settingFields.schema.fields.maxDomains value=settingFields._source.maxDomains localize=true}}
-    {{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">
-        {{#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>
-        {{/each}}
-</div>   
-
-    <fieldset>
-        <legend>
-            {{localize "DAGGERHEART.SETTINGS.Homebrew.currency.title"}} 
-        </legend>
-        {{formGroup settingFields.schema.fields.currency.fields.enabled value=settingFields._source.currency.enabled localize=true}}
-        {{formGroup settingFields.schema.fields.currency.fields.title value=settingFields._source.currency.title localize=true}}
-        {{formGroup settingFields.schema.fields.currency.fields.coins value=settingFields._source.currency.coins localize=true}}
-        {{formGroup settingFields.schema.fields.currency.fields.handfuls value=settingFields._source.currency.handfuls localize=true}}
-        {{formGroup settingFields.schema.fields.currency.fields.bags value=settingFields._source.currency.bags localize=true}}
-        {{formGroup settingFields.schema.fields.currency.fields.chests value=settingFields._source.currency.chests localize=true}}
-        
-    </fieldset>
-
-    <fieldset class="two-columns even">
-        <legend>{{localize "DAGGERHEART.SETTINGS.Homebrew.downtimeMoves"}}</legend>
-
-        <fieldset class="start-align">
-            <legend>
-                {{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}} 
-                <a data-action="addItem" data-type="longRest"><i class="fa-solid fa-plus"></i></a>
-                <a data-action="resetMoves" data-type="longRest"><i class="fa-solid fa-arrow-rotate-left"></i></a>
-            </legend>
-
-            <div class="form-group setting-group-field">
-                <label>{{localize "DAGGERHEART.SETTINGS.Homebrew.nrChoices"}}</label>
-                <div class="form-fields">
-                    <input type="text" name="restMoves.longRest.nrChoices" value="{{settingFields._source.restMoves.longRest.nrChoices}}" />
-                </div>
-            </div>
-            
-            <div class="settings-items">
-                {{#each settingFields._source.restMoves.longRest.moves as |move id|}}
-                    {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" this type="longRest" id=id }}
-                {{/each}}
-            </div>
-        </fieldset>
-
-        <fieldset class="start-align">
-            <legend>
-                {{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}}
-                <a data-action="addItem" data-type="shortRest"><i class="fa-solid fa-plus"></i></a>
-                <a data-action="resetMoves" data-type="shortRest"><i class="fa-solid fa-arrow-rotate-left"></i></a>
-            </legend>
-
-            <div class="form-group setting-group-field">
-                <label>{{localize "DAGGERHEART.SETTINGS.Homebrew.nrChoices"}}</label>
-                <div class="form-fields">
-                    <input type="text" name="restMoves.shortRest.nrChoices" value="{{settingFields._source.restMoves.shortRest.nrChoices}}" />
-                </div>
-            </div>
-
-            <div class="settings-items">
-                {{#each settingFields._source.restMoves.shortRest.moves as |move id|}}
-                    {{> "systems/daggerheart/templates/settings/components/settings-item-line.hbs" this type="shortRest" id=id }}
-                {{/each}}
-            </div>
-        </fieldset>
-    </fieldset>
-   
-    <footer class="form-footer">
-        <button data-action="reset">
-            <i class="fa-solid fa-arrow-rotate-left"></i>
-            <span>{{localize "Reset"}}</span>
-        </button>
-        <button data-action="save" >
-            <i class="fa-solid fa-floppy-disk"></i>
-            <span>{{localize "Save Changes"}}</span>
-        </button>
-    </footer>
-</div>
-  
\ No newline at end of file
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>