diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index df12eda4..8b35b288 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -261,13 +261,15 @@
 
     fieldset {
         align-items: center;
+        margin: 0;
         margin-top: 5px;
         border-radius: 6px;
         border-color: @color-fieldset-border;
 
         &.glassy {
             background-color: light-dark(@dark-blue-10, @golden-10);
-            border-color: transparent;
+            border: none;
+            padding-inline: 10px;
 
             legend {
                 padding: 2px 12px;
@@ -512,7 +514,7 @@
         height: 1px;
         width: 100%;
         border-bottom: 1px solid @color-border;
-        mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+        mask-image: linear-gradient(270deg, transparent 0%, black 35%, black 50%, black 65%, transparent 100%);
     }
 
     side-line-div {
@@ -546,50 +548,6 @@
         transform-origin: top;
     }
 
-    .item-buttons {
-        grid-column: span 3;
-        display: flex;
-        gap: 8px;
-        flex-wrap: wrap;
-        margin-top: 2px;
-
-        .item-button {
-            display: flex;
-            border: 1px solid light-dark(#18162e, #18162e);
-            color: light-dark(#18162e, #18162e);
-            outline: none;
-            box-shadow: none;
-            border-radius: 6px;
-
-            button {
-                border-radius: 3px 0px 0px 3px;
-                color: light-dark(@dark-blue, @dark-blue);
-                white-space: nowrap;
-                border: 0;
-
-                &:hover {
-                    color: @color-text-emphatic;
-                }
-
-                &:not(:first-child) {
-                    padding: 6px;
-                    background: light-dark(@dark-blue-10, @golden-secondary);
-                    border-radius: 0px 3px 3px 0px;
-                    color: light-dark(@dark-blue, @dark-golden);
-
-                    &:hover {
-                        background: light-dark(@light-black, @dark-blue);
-                        color: light-dark(@dark-blue, @golden-secondary);
-                    }
-                }
-            }
-
-            .spacer {
-                border-right: 1px solid black;
-                content: '';
-            }
-        }
-    }
     .artist-attribution {
         width: 100%;
         display: flex;
@@ -597,7 +555,7 @@
         font-style: italic;
         font-family: @font-body;
         margin-top: 4px;
-        color: light-dark(#14142599, #efe6d850);
+        color: @color-text-subtle;
         font-size: var(--font-size-12);
         padding-left: 3px;
     }
diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index 19a9e519..d79661f2 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -96,7 +96,7 @@
             flex-wrap: wrap;
             font-size: var(--font-size-12);
             justify-content: start;
-            padding: 3px 5px;
+            padding: 2px 5px;
         }
     }
 }
diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less
index fc73ba95..e95ce06c 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -45,8 +45,11 @@
 
             .item-main {
                 border-radius: 5px;
+
+                // Make hover extend out of bounds.
+                // Because of this extra spacing, the scroll container parent needs some padding
                 padding: 2px;
-                margin: -2px;
+                margin: -2px -2px 0 -2px;
             }
 
             &:hover {
@@ -271,6 +274,50 @@
                 grid-area: labels;
             }
         }
+
+        .item-buttons {
+            grid-column: span 3;
+            display: flex;
+            gap: 8px;
+            flex-wrap: wrap;
+
+            .item-button {
+                display: flex;
+                border: 1px solid light-dark(#18162e, #18162e);
+                color: light-dark(#18162e, #18162e);
+                outline: none;
+                box-shadow: none;
+                border-radius: 6px;
+
+                button {
+                    border-radius: 3px 0px 0px 3px;
+                    color: light-dark(@dark-blue, @dark-blue);
+                    white-space: nowrap;
+                    border: 0;
+
+                    &:hover {
+                        color: @color-text-emphatic;
+                    }
+
+                    &:not(:first-child) {
+                        padding: 6px;
+                        background: light-dark(@dark-blue-10, @golden-secondary);
+                        border-radius: 0px 3px 3px 0px;
+                        color: light-dark(@dark-blue, @dark-golden);
+
+                        &:hover {
+                            background: light-dark(@light-black, @dark-blue);
+                            color: light-dark(@dark-blue, @golden-secondary);
+                        }
+                    }
+                }
+
+                .spacer {
+                    border-right: 1px solid black;
+                    content: '';
+                }
+            }
+        }
     }
 
     .card-item {
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index e3072da1..8381c7c3 100755
--- a/styles/less/global/sheet.less
+++ b/styles/less/global/sheet.less
@@ -54,7 +54,7 @@ body.game:is(.performance-low, .noblur) {
         position: relative;
         min-height: -webkit-fill-available;
         transition: opacity 0.3s ease;
-        padding-bottom: 20px;
+        padding-bottom: 16px;
 
         .tab {
             padding: 0 10px;
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 5eb5b43c..7f6afc22 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -18,6 +18,8 @@
 });
 
 .application.sheet.daggerheart.actor.dh-style {
+    --side-indent: 16px;
+
     .portrait img,
     .profile {
         width: 100%;
@@ -39,6 +41,33 @@
 
     .window-header > .attribution-header-label {
         margin-right: var(--spacer-4);
+        pointer-events: none;
+    }
+
+    .tab-navigation {
+        margin-bottom: 0;
+    }
+
+    .tab {
+        padding: 0;
+        .search-section {
+            padding: var(--spacer-16) 12px var(--spacer-8) 10px;
+        }
+
+        .scroll-container {
+            scrollbar-gutter: stable;
+            overflow-y: auto;
+            .with-scroll-shadows();
+
+            padding: var(--spacer-16) calc(var(--side-indent) - var(--scrollbar-width)) 4px var(--side-indent);
+
+            > fieldset:first-child {
+                margin-top: 0;
+            }
+        }
+        .scroll-container:not(:first-child) {
+            padding-top: var(--spacer-8); // nested have less top padding
+        }
     }
 
     .tab.inventory {
@@ -46,7 +75,7 @@
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr;
             gap: 10px;
-            padding: 10px 10px 0;
+            padding: var(--spacer-8) var(--side-indent) var(--spacer-12) var(--side-indent);
 
             .input {
                 color: light-dark(@dark, @beige);
@@ -94,7 +123,6 @@
             position: relative;
             color: light-dark(@dark-blue-50, @beige-50);
             width: 100%;
-            padding-top: 5px;
 
             input {
                 border-radius: 50px;
diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less
index 4aa44e51..c082341b 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -7,9 +7,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/features.less b/styles/less/sheets/actors/adversary/features.less
index 447d050e..94e255db 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -8,9 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/header.less b/styles/less/sheets/actors/adversary/header.less
index 549a219d..858f8b13 100644
--- a/styles/less/sheets/actors/adversary/header.less
+++ b/styles/less/sheets/actors/adversary/header.less
@@ -7,7 +7,7 @@
         width: 100%;
 
         > *:not(line-div, .tab-navigation) {
-            padding-left: 15px;
+            padding-left: var(--side-indent);
             padding-right: 15px;
         }
 
diff --git a/styles/less/sheets/actors/adversary/notes.less b/styles/less/sheets/actors/adversary/notes.less
deleted file mode 100644
index a95d070e..00000000
--- a/styles/less/sheets/actors/adversary/notes.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
-    padding-bottom: 20px;
-}
diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less
index 639af98b..74e7ab5a 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -33,6 +33,8 @@
             overflow: hidden;
             display: flex;
             flex-direction: column;
+            margin: 0 0 10px 0;
+            position: relative;
         }
     }
 }
\ No newline at end of file
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index 8548a2fb..1d0f7787 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -8,17 +8,11 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            height: 100%;
-            overflow-y: auto;
-            padding-top: 8px;
-            padding-bottom: 20px;
-            height: 100%;
-            .with-scroll-shadows();
+            flex: 1;
         }
 
         .characteristics-section {
             gap: 20px;
-            padding: 0 10px;
         }
 
         .biography-section {
diff --git a/styles/less/sheets/actors/character/effects.less b/styles/less/sheets/actors/character/effects.less
index 0ab1007d..0a207d4d 100644
--- a/styles/less/sheets/actors/character/effects.less
+++ b/styles/less/sheets/actors/character/effects.less
@@ -8,9 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 52b41826..8c1c6d0e 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -8,9 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 91b3545a..7eef14a7 100644
--- a/styles/less/sheets/actors/character/header.less
+++ b/styles/less/sheets/actors/character/header.less
@@ -19,16 +19,19 @@
 
 .application.sheet.daggerheart.actor.dh-style.character {
     .character-header-sheet {
-        padding: 0 15px;
         padding-top: var(--header-height);
         width: 100%;
+        
+        > *:not(line-div, .tab-navigation) {
+            margin-left: var(--side-indent);
+            margin-right: 15px;
+        }
 
         .name-row {
             display: flex;
             gap: 6px;
             align-items: start;
             justify-content: space-between;
-            padding: 0;
             padding-top: 5px;
             flex: 1;
 
@@ -100,8 +103,8 @@
         .character-details {
             display: flex;
             justify-content: space-between;
-            padding: 5px 0;
-            margin-bottom: 8px;
+            margin-top: 5px;
+            margin-bottom: 10px;
             font-size: var(--font-size-12);
             color: @color-text-emphatic;
 
@@ -130,7 +133,6 @@
         .character-row {
             display: flex;
             align-items: center;
-            padding: 0;
             margin-bottom: 12px;
 
             .resource-section {
@@ -218,7 +220,6 @@
 
         .character-traits {
             display: flex;
-            padding: 0;
             margin-bottom: 15px;
             justify-content: space-between;
             max-width: 38.5rem;
@@ -325,5 +326,9 @@
                 }
             }
         }
+
+        .tab-navigation button[data-action="openSettings"] {
+            margin-right: 12px;
+        }
     }
 }
diff --git a/styles/less/sheets/actors/character/index.less b/styles/less/sheets/actors/character/index.less
index edefe0a1..f196d5bf 100644
--- a/styles/less/sheets/actors/character/index.less
+++ b/styles/less/sheets/actors/character/index.less
@@ -1,8 +1,8 @@
+@import './sheet.less';
 @import './biography.less';
 @import './effects.less';
 @import './features.less';
 @import './header.less';
 @import './inventory.less';
 @import './loadout.less';
-@import './sheet.less';
 @import './sidebar.less';
diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less
index fcfbbee9..4bb94b63 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -8,10 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index fa3e0176..a7c24a14 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -50,11 +50,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            height: 100%;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less
index 68792c99..b89a83af 100644
--- a/styles/less/sheets/actors/character/sheet.less
+++ b/styles/less/sheets/actors/character/sheet.less
@@ -2,6 +2,8 @@
 @import '../../../utils/fonts.less';
 
 .application.sheet.daggerheart.actor.dh-style.character {
+    --side-indent: 16px;
+
     .window-content {
         display: grid;
         grid-template-columns: 275px 1fr;
@@ -10,28 +12,34 @@
         width: 100%;
         padding-bottom: 0;
         overflow-x: auto;
+    }
+    
+    .character-sidebar-sheet {
+        grid-row: 1 / span 2;
+        grid-column: 1;
+        display: flex;
+        flex-direction: column;
+    }
 
-        .character-sidebar-sheet {
-            grid-row: 1 / span 2;
-            grid-column: 1;
+    .character-header-sheet {
+        position: relative;
+        grid-row: 1;
+        grid-column: 2;
+    }
+
+    .tab {
+        grid-row: 2;
+        grid-column: 2;
+        padding-right: 0;
+        margin-right: 2px;
+        margin-bottom: 12px;
+        &.active {
             display: flex;
             flex-direction: column;
-        }
-
-        .character-header-sheet {
+            overflow: hidden;
+            margin: 0 0 10px 0;
+            padding: 0;
             position: relative;
-            grid-row: 1;
-            grid-column: 2;
-        }
-
-        .tab {
-            grid-row: 2;
-            grid-column: 2;
-            &.active {
-                display: flex;
-                flex-direction: column;
-                overflow: hidden;
-            }
         }
     }
 }
diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less
index c0cac669..40973196 100644
--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@@ -1,13 +1,17 @@
 @import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.companion {
     .tab.effects {
+        margin-right: 2px;
+        padding-right: 0;
         .effects-sections {
             display: flex;
             flex-direction: column;
             gap: 10px;
             overflow-y: auto;
-            padding-bottom: 20px;
+            padding-bottom: 4px;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
     }
diff --git a/styles/less/sheets/actors/environment/features.less b/styles/less/sheets/actors/environment/features.less
index 84cf26f8..f1ad8140 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -8,9 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/header.less b/styles/less/sheets/actors/environment/header.less
index da6954e0..6e037901 100644
--- a/styles/less/sheets/actors/environment/header.less
+++ b/styles/less/sheets/actors/environment/header.less
@@ -138,10 +138,11 @@
         }
 
         .environment-navigation {
-            padding: 0 20px;
+            padding-right: 20px;
 
             .tab-navigation {
                 margin-top: 0;
+                margin-bottom: 0;
             }
         }
     }
diff --git a/styles/less/sheets/actors/environment/index.less b/styles/less/sheets/actors/environment/index.less
index 211c8e60..df7e6fc2 100644
--- a/styles/less/sheets/actors/environment/index.less
+++ b/styles/less/sheets/actors/environment/index.less
@@ -1,4 +1,4 @@
+@import './sheet.less';
 @import './features.less';
 @import './header.less';
 @import './potentialAdversaries.less';
-@import './sheet.less';
diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less
index f112c0d2..fc2623c3 100644
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/styles/less/sheets/actors/environment/potentialAdversaries.less
@@ -1,4 +1,5 @@
 @import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab.potentialAdversaries {
@@ -6,9 +7,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/party/index.less b/styles/less/sheets/actors/party/index.less
index 56f7a457..e1972a32 100644
--- a/styles/less/sheets/actors/party/index.less
+++ b/styles/less/sheets/actors/party/index.less
@@ -1,4 +1,4 @@
+@import './sheet.less';
 @import './header.less';
 @import './party-members.less';
-@import './sheet.less';
 @import './inventory.less';
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index 444c6a57..c085ae10 100644
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@@ -8,10 +8,6 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
         }
     }
 }
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index 2490757f..328360a8 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -2,8 +2,30 @@
 @import '../../../utils/fonts.less';
 @import '../../../utils/mixin.less';
 
-.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
-    overflow: auto;
+.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers.active {
+    padding: var(--spacer-8) 4px 0 10px;
+    scrollbar-gutter: stable;
+    .with-scroll-shadows();
+
+    .actions-section {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 10px;
+        margin-bottom: 10px;
+        gap: 20px;
+        background-color: light-dark(@dark-blue-10, @golden-10);
+
+        button {
+            span {
+                font-size: 12px;
+            }
+        }
+
+        .active-action {
+            animation: glow 0.75s infinite alternate;
+        }
+    }
 
     .actors-list {
         display: flex;
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index 852b6cfc..e07a0ae9 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -17,35 +17,10 @@
 });
 
 .application.sheet.daggerheart.actor.dh-style.party {
-    .tab {
+    .tab.active {
+        overflow: auto;
+        display: flex;
+        flex-direction: column;
         flex: 1;
-        overflow-y: auto;
-        scrollbar-gutter: stable;
-
-        &.active {
-            overflow: auto;
-            display: flex;
-            flex-direction: column;
-        }
-
-        .actions-section {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            padding: 10px;
-            margin-bottom: 10px;
-            gap: 20px;
-            background-color: light-dark(@dark-blue-10, @golden-10);
-
-            button {
-                span {
-                    font-size: 12px;
-                }
-            }
-
-            .active-action {
-                animation: glow 0.75s infinite alternate;
-            }
-        }
     }
 }
diff --git a/styles/less/utils/mixin.less b/styles/less/utils/mixin.less
index e2ef85ef..f6a461cf 100644
--- a/styles/less/utils/mixin.less
+++ b/styles/less/utils/mixin.less
@@ -174,10 +174,10 @@
             --fade-start: 0;
         }
         10%, 100% {
-            --fade-start: 12px;
+            --fade-start: 14px;
         }
         0%, 90% {
-            --fade-end: 12px;
+            --fade-end: 14px;
         }
         100% {
             --fade-end: 0;
diff --git a/templates/sheets/actors/adversary/effects.hbs b/templates/sheets/actors/adversary/effects.hbs
index 087e8b30..1855e46f 100644
--- a/templates/sheets/actors/adversary/effects.hbs
+++ b/templates/sheets/actors/adversary/effects.hbs
@@ -1,22 +1,22 @@
-<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'>
-    <div class="effects-sections">
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.activeEffects'
-        type='effect'
-        isGlassy=true
-        collection=effects.actives
-        canCreate=@root.editable
-        hideResources=true
-        }}
-
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.inactiveEffects'
-        type='effect'
-        isGlassy=true
-        collection=effects.inactives
-        canCreate=@root.editable
-        hideResources=true
-        }}
-    </div>
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+    <div class="effects-sections scroll-container">
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.activeEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.actives
+        canCreate=@root.editable
+        hideResources=true
+        }}
+
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.inactiveEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.inactives
+        canCreate=@root.editable
+        hideResources=true
+        }}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 3b495e74..c8b6bdc2 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,14 +1,17 @@
-<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'>
-    <div class="feature-section">
-        {{> 'daggerheart.inventory-items'
-            title=tabs.features.label
-            type='feature'
-            collection=@root.features
-            hideContextMenu=true
-            hideModifyControls=true
-            canCreate=@root.editable
-            showActions=@root.editable
-        }}
+<section 
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}">
+    <div class="feature-section scroll-container">
+        {{#each @root.features as |item|}}
+            {{> "daggerheart.inventory-item"
+                item=item
+                type="feature"
+                actorType=@root.document.type
+                hideContextMenu=true
+                hideModifyControls=true
+                showActions=@root.editable
+            }}
+        {{/each}}
     </div>
-</section>
\ No newline at end of file
+</section>
diff --git a/templates/sheets/actors/character/biography.hbs b/templates/sheets/actors/character/biography.hbs
index 7da920e0..a3d34109 100644
--- a/templates/sheets/actors/character/biography.hbs
+++ b/templates/sheets/actors/character/biography.hbs
@@ -1,34 +1,34 @@
-<section
-    class='tab {{tabs.biography.cssClass}} {{tabs.biography.id}}'
-    data-tab='{{tabs.biography.id}}'
-    data-group='{{tabs.biography.group}}'
->
-    <div class="items-section">
-        <div class="characteristics-section flexrow">
-            <div class="input">
-                <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
-                {{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}}
-            </div>
-
-            <div class="input">
-                <span>{{localize 'DAGGERHEART.ACTORS.Character.age'}}</span>
-                {{formInput systemFields.biography.fields.characteristics.fields.age value=source.system.biography.characteristics.age enriched=source.system.biography.characteristics.age localize=true toggled=true}}
-            </div>
-
-            <div class="input">
-                <span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
-                {{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}}
-            </div>
-        </div>
-
-        <fieldset class="glassy biography-section">
-            <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
-            {{formInput background.field value=background.value enriched=background.enriched toggled=true}}
-        </fieldset>
-
-        <fieldset class="glassy biography-section">
-            <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
-            {{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
-        </fieldset>
-    </div>
+<section
+    class="tab {{tabs.biography.cssClass}} {{tabs.biography.id}}"
+    data-tab="{{tabs.biography.id}}"
+    data-group='{{tabs.biography.group}}'
+>
+    <div class="items-section scroll-container">
+        <div class="characteristics-section flexrow">
+            <div class="input">
+                <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
+                {{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}}
+            </div>
+
+            <div class="input">
+                <span>{{localize 'DAGGERHEART.ACTORS.Character.age'}}</span>
+                {{formInput systemFields.biography.fields.characteristics.fields.age value=source.system.biography.characteristics.age enriched=source.system.biography.characteristics.age localize=true toggled=true}}
+            </div>
+
+            <div class="input">
+                <span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
+                {{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}}
+            </div>
+        </div>
+
+        <fieldset class="glassy biography-section">
+            <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
+            {{formInput background.field value=background.value enriched=background.enriched toggled=true}}
+        </fieldset>
+
+        <fieldset class="glassy biography-section">
+            <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
+            {{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
+        </fieldset>
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/effects.hbs b/templates/sheets/actors/character/effects.hbs
index a2e5a420..f3bda981 100644
--- a/templates/sheets/actors/character/effects.hbs
+++ b/templates/sheets/actors/character/effects.hbs
@@ -1,24 +1,24 @@
-<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
-    data-group='{{tabs.effects.group}}'>
-
-    <div class="effects-sections">
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.activeEffects'
-        type='effect'
-        isGlassy=true
-        collection=effects.actives
-        canCreate=@root.editable
-        hideResources=true
-        }}
-
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.inactiveEffects'
-        type='effect'
-        isGlassy=true
-        collection=effects.inactives
-        canCreate=@root.editable
-        hideResources=true
-        disabled=true
-        }}
-    </div>
+<section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
+    data-group='{{tabs.effects.group}}'>
+
+    <div class="effects-sections scroll-container">
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.activeEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.actives
+        canCreate=@root.editable
+        hideResources=true
+        }}
+
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.inactiveEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.inactives
+        canCreate=@root.editable
+        hideResources=true
+        disabled=true
+        }}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/features.hbs b/templates/sheets/actors/character/features.hbs
index b2760900..50a2ce08 100644
--- a/templates/sheets/actors/character/features.hbs
+++ b/templates/sheets/actors/character/features.hbs
@@ -1,26 +1,28 @@
-<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'>
-    <div class="features-sections">
-        {{#each document.system.sheetLists as |category|}}
-            {{#if (eq category.type 'feature' )}}
-                {{> 'daggerheart.inventory-items'
-                    title=category.title
-                    type='feature'
-                    actorType='character'
-                    collection=category.values
-                    canCreate=@root.editable
-                    showActions=@root.editable
-                }}
-                {{else if category.values}}
-                {{> 'daggerheart.inventory-items'
-                    title=category.title
-                    type='feature'
-                    actorType='character'
-                    collection=category.values
-                    canCreate=false
-                    showActions=@root.editable
-                }}
-            {{/if}}
-        {{/each}}
-    </div>
+<section 
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}">
+    <div class="features-section scroll-container">
+        {{#each document.system.sheetLists as |category|}}
+            {{#if (eq category.type "feature" )}}
+                {{> "daggerheart.inventory-items"
+                    title=category.title
+                    type="feature"
+                    actorType="character"
+                    collection=category.values
+                    canCreate=@root.editable
+                    showActions=@root.editable
+                }}
+                {{else if category.values}}
+                {{> "daggerheart.inventory-items"
+                    title=category.title
+                    type="feature"
+                    actorType="character"
+                    collection=category.values
+                    canCreate=false
+                    showActions=@root.editable
+                }}
+            {{/if}}
+        {{/each}}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs
index 459911af..a40c336a 100644
--- a/templates/sheets/actors/character/header.hbs
+++ b/templates/sheets/actors/character/header.hbs
@@ -1,165 +1,163 @@
-<header class="character-header-sheet">
-    <line-div></line-div>
-    <div class="name-row">
-        <h1
-            class="actor-name input"
-            contenteditable="plaintext-only"
-            data-property="name"
-            placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}"
-            autocomplete="off"
-            spellcheck="false"
-        >{{source.name}}</h1>
-        <div class='level-div'>
-            <h3 class='label'>
-                {{#if @root.editable}}
-                    {{#if document.system.needsCharacterSetup}}
-                        <button
-                            type="button"
-                            class="level-button glow"
-                            data-action="levelManagement"
-                        >
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.buttonTitle"}}
-                        </button>
-                    {{else if document.system.levelData.canLevelUp}}
-                        <button
-                            type="button"
-                            class="level-button glow" data-tooltip="{{localize "DAGGERHEART.ACTORS.Character.levelUp"}}"
-                            data-action="levelManagement"
-                        >
-                            <i class="fa-solid fa-angles-up"></i>
-                        </button>
-                    {{/if}}
-                {{/if}}
-                {{#unless document.system.needsCharacterSetup}}
-                    {{localize 'DAGGERHEART.GENERAL.level'}}
-                    <input type="text" data-dtype="Number" class="level-value" value={{#if document.system.needsCharacterSetup}}0{{else}}{{document.system.levelData.level.changed}}{{/if}} {{#if document.system.needsCharacterSetup}}disabled{{/if}} />
-                {{/unless}}
-            </h3>
-        </div>
-    </div>
-    <div class="character-details">
-        <div>
-            {{#if document.system.class.value}}
-                <span data-action="editDoc" data-item-uuid="{{document.system.class.value.uuid}}">{{document.system.class.value.name}}</span>
-            {{else}}
-                <span class="missing-header-feature" data-action="openPack" data-key="classes">{{localize 'TYPES.Item.class'}}</span>
-            {{/if}}
-            <span class="dot">•</span>
-            {{#if document.system.class.subclass}}
-                <span data-action="editDoc" data-item-uuid="{{document.system.class.subclass.uuid}}">{{document.system.class.subclass.name}}</span>
-            {{else}}
-                <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
-            {{/if}}
-            <span class="dot">•</span>
-            {{#if document.system.community}}
-                <span data-action="editDoc" data-item-uuid="{{document.system.community.uuid}}">{{document.system.community.name}}</span>
-            {{else}}
-                <span class="missing-header-feature" data-action="openPack" data-key="communities">{{localize 'TYPES.Item.community'}}</span>
-            {{/if}}
-            <span class="dot">•</span>
-            {{#if document.system.ancestry}}
-                <span data-action="editDoc" data-item-uuid="{{document.system.ancestry.uuid}}">{{document.system.ancestry.name}}</span>
-            {{else}}
-                <span class="missing-header-feature" data-action="openPack" data-key="ancestries">{{localize 'TYPES.Item.ancestry'}}</span>
-            {{/if}}
-        </div>
-
-        {{#if (or document.system.multiclass.value document.system.multiclass.subclass)}}
-            <div class="multiclass">
-                {{#if document.system.multiclass.value}}
-                    <span data-action="editDoc"data-item-uuid="{{document.system.multiclass.value.uuid}}">{{document.system.multiclass.value.name}}</span>
-                {{else}}
-                    <span data-action="openPack" data-key="classes">{{localize 'DAGGERHEART.GENERAL.multiclass'}}</span>
-                {{/if}}
-                <span class="dot">•</span>
-                {{#if document.system.multiclass.subclass}}
-                    <span data-action="editDoc" data-item-uuid="{{document.system.multiclass.subclass.uuid}}">{{document.system.multiclass.subclass.name}}</span>
-                {{else}}
-                    <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
-                {{/if}}
-            </div>
-        {{/if}}
-
-
-    </div>
-
-    <div class="character-row">
-        <div class="resource-section">
-            <div class="hope-section">
-                <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
-                {{#times document.system.resources.hope.max}}
-                    <span class='hope-value' data-action='toggleHope' data-value="{{add this 1}}">
-                        {{#if (gte ../document.system.resources.hope.value (add this 1))}}
-                            <i class='fa-solid fa-diamond'></i>
-                        {{else}}
-                            <i class='fa-regular fa-circle'></i>
-                        {{/if}}
-                    </span>
-                {{/times}}
-                {{#times document.system.scars}}
-                    <span class='hope-value scar'>
-                        <i class='fa-regular fa-ban'></i>
-                    </span>
-                {{/times}}
-                {{#if hasExtraResources}}<a type="button" class="resource-manager" data-action="toggleResourceManagement"><i class="fa-solid fa-angle-down"></i></a>{{/if}}
-            </div>
-        </div>
-        {{#if document.system.class.value}}
-            <div class="domains-section">
-                {{#each document.system.domainData as |data|}}
-                    <div class="domain">
-                        <img src="{{data.src}}" alt="" data-tooltip="{{data.label}}" />
-                    </div>
-                {{/each}}
-            </div>
-        {{/if}}
-        <div class="downtime-section">
-            {{#if document.parties.size}}
-                <button type="button" data-action="viewParty" data-tooltip="DAGGERHEART.ACTORS.Character.viewParty">
-                    <i class="fa-solid fa-fw fa-users"></i>
-                </button>
-            {{/if}}
-            {{#if @root.editable}}
-                <button type="button" data-action="useDowntime" data-type="shortRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.shortRest.title">
-                    <i class="fa-solid fa-fw fa-utensils"></i>
-                </button>
-                <button type="button" data-action="useDowntime" data-type="longRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.longRest.title">
-                    <i class="fa-solid fa-fw fa-bed"></i>
-                </button>
-            {{/if}}
-        </div>
-    </div>
-
-    <div class="character-traits">
-        {{#each this.attributes as |attribute key|}} 
-            <div class="trait {{#if isSpellcasting}}with-spellcasting{{/if}}" data-tooltip="<b>{{attribute.label}}:</b><br>{{#each attribute.verbs}}{{this}}<br>{{/each}}" data-action="rollAttribute" data-attribute="{{key}}" data-value="{{attribute.value}}">
-                <div class="trait-name">
-                    <div class="tier-mark {{#if attribute.tierMarked}}marked{{/if}}"></div>
-                    <span>{{attribute.label}}</span>
-                </div>
-                <div class="trait-value-area">
-                    <svg width="52" height="46" viewBox="0 0 52 46" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path d="M 0,0 H 52 L 51.0714,18.254 48.781,24.0952 47.5745,39.9596 26,46 4.42553,39.9596 3.219,24.0952 0.928571,18.254 Z" fill="var(--color-border)"/>
-                        <path d="M 3.312,5.357 8.58596,0 H 43.414 l 5.274,5.357 -1.8797,28.846 c -0.2431,2.605 -2.1461,4.7522 -4.7031,5.3064 l -14.8343,3.2151 c -0.8375,0.1816 -1.7043,0.1816 -2.5418,0 L 9.89482,39.5094 C 7.33785,38.9552 5.43478,36.808 5.19169,34.203 Z" fill="var(--background)"/>
-                    </svg>
-                    <div class="trait-value">
-                        {{#if (gt attribute.value 0)}}
-                            <span>+{{attribute.value}}</span>
-                        {{else}}
-                            <span>{{attribute.value}}</span>
-                        {{/if}}
-                    </div>
-                    {{#if isSpellcasting}}
-                        <div class="spellcasting-mark" data-tooltip="DAGGERHEART.ITEMS.Subclass.spellcastingTrait">
-                            <i class="fa-solid fa-wand-magic-sparkles" inert></i>
-                        </div>
-                    {{/if}}
-                </div>
-            </div>
-        {{/each}}
-    </div>
-
-    {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' }}
-        <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}"><i class="fa-solid fa-wrench"></i></button>
-    {{/'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+<header class="character-header-sheet">
+    <line-div></line-div>
+    <div class="name-row">
+        <h1
+            class="actor-name input"
+            contenteditable="plaintext-only"
+            data-property="name"
+            placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}"
+            autocomplete="off"
+            spellcheck="false"
+        >{{source.name}}</h1>
+        <div class='level-div'>
+            <h3 class='label'>
+                {{#if @root.editable}}
+                    {{#if document.system.needsCharacterSetup}}
+                        <button
+                            type="button"
+                            class="level-button glow"
+                            data-action="levelManagement"
+                        >
+                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.buttonTitle"}}
+                        </button>
+                    {{else if document.system.levelData.canLevelUp}}
+                        <button
+                            type="button"
+                            class="level-button glow" data-tooltip="{{localize "DAGGERHEART.ACTORS.Character.levelUp"}}"
+                            data-action="levelManagement"
+                        >
+                            <i class="fa-solid fa-angles-up"></i>
+                        </button>
+                    {{/if}}
+                {{/if}}
+                {{#unless document.system.needsCharacterSetup}}
+                    {{localize 'DAGGERHEART.GENERAL.level'}}
+                    <input type="text" data-dtype="Number" class="level-value" value={{#if document.system.needsCharacterSetup}}0{{else}}{{document.system.levelData.level.changed}}{{/if}} {{#if document.system.needsCharacterSetup}}disabled{{/if}} />
+                {{/unless}}
+            </h3>
+        </div>
+    </div>
+    <div class="character-details">
+        <div>
+            {{#if document.system.class.value}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.value.uuid}}">{{document.system.class.value.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="classes">{{localize 'TYPES.Item.class'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.class.subclass}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.subclass.uuid}}">{{document.system.class.subclass.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.community}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.community.uuid}}">{{document.system.community.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="communities">{{localize 'TYPES.Item.community'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.ancestry}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.ancestry.uuid}}">{{document.system.ancestry.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="ancestries">{{localize 'TYPES.Item.ancestry'}}</span>
+            {{/if}}
+        </div>
+
+        {{#if (or document.system.multiclass.value document.system.multiclass.subclass)}}
+            <div class="multiclass">
+                {{#if document.system.multiclass.value}}
+                    <span data-action="editDoc"data-item-uuid="{{document.system.multiclass.value.uuid}}">{{document.system.multiclass.value.name}}</span>
+                {{else}}
+                    <span data-action="openPack" data-key="classes">{{localize 'DAGGERHEART.GENERAL.multiclass'}}</span>
+                {{/if}}
+                <span class="dot">•</span>
+                {{#if document.system.multiclass.subclass}}
+                    <span data-action="editDoc" data-item-uuid="{{document.system.multiclass.subclass.uuid}}">{{document.system.multiclass.subclass.name}}</span>
+                {{else}}
+                    <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
+                {{/if}}
+            </div>
+        {{/if}}
+    </div>
+
+    <div class="character-row">
+        <div class="resource-section">
+            <div class="hope-section">
+                <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
+                {{#times document.system.resources.hope.max}}
+                    <span class='hope-value' data-action='toggleHope' data-value="{{add this 1}}">
+                        {{#if (gte ../document.system.resources.hope.value (add this 1))}}
+                            <i class='fa-solid fa-diamond'></i>
+                        {{else}}
+                            <i class='fa-regular fa-circle'></i>
+                        {{/if}}
+                    </span>
+                {{/times}}
+                {{#times document.system.scars}}
+                    <span class='hope-value scar'>
+                        <i class='fa-regular fa-ban'></i>
+                    </span>
+                {{/times}}
+                {{#if hasExtraResources}}<a type="button" class="resource-manager" data-action="toggleResourceManagement"><i class="fa-solid fa-angle-down"></i></a>{{/if}}
+            </div>
+        </div>
+        {{#if document.system.class.value}}
+            <div class="domains-section">
+                {{#each document.system.domainData as |data|}}
+                    <div class="domain">
+                        <img src="{{data.src}}" alt="" data-tooltip="{{data.label}}" />
+                    </div>
+                {{/each}}
+            </div>
+        {{/if}}
+        <div class="downtime-section">
+            {{#if document.parties.size}}
+                <button type="button" data-action="viewParty" data-tooltip="DAGGERHEART.ACTORS.Character.viewParty">
+                    <i class="fa-solid fa-fw fa-users"></i>
+                </button>
+            {{/if}}
+            {{#if @root.editable}}
+                <button type="button" data-action="useDowntime" data-type="shortRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.shortRest.title">
+                    <i class="fa-solid fa-fw fa-utensils"></i>
+                </button>
+                <button type="button" data-action="useDowntime" data-type="longRest" data-tooltip="DAGGERHEART.APPLICATIONS.Downtime.longRest.title">
+                    <i class="fa-solid fa-fw fa-bed"></i>
+                </button>
+            {{/if}}
+        </div>
+    </div>
+
+    <div class="character-traits">
+        {{#each this.attributes as |attribute key|}} 
+            <div class="trait {{#if isSpellcasting}}with-spellcasting{{/if}}" data-tooltip="<b>{{attribute.label}}:</b><br>{{#each attribute.verbs}}{{this}}<br>{{/each}}" data-action="rollAttribute" data-attribute="{{key}}" data-value="{{attribute.value}}">
+                <div class="trait-name">
+                    <div class="tier-mark {{#if attribute.tierMarked}}marked{{/if}}"></div>
+                    <span>{{attribute.label}}</span>
+                </div>
+                <div class="trait-value-area">
+                    <svg width="52" height="46" viewBox="0 0 52 46" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <path d="M 0,0 H 52 L 51.0714,18.254 48.781,24.0952 47.5745,39.9596 26,46 4.42553,39.9596 3.219,24.0952 0.928571,18.254 Z" fill="var(--color-border)"/>
+                        <path d="M 3.312,5.357 8.58596,0 H 43.414 l 5.274,5.357 -1.8797,28.846 c -0.2431,2.605 -2.1461,4.7522 -4.7031,5.3064 l -14.8343,3.2151 c -0.8375,0.1816 -1.7043,0.1816 -2.5418,0 L 9.89482,39.5094 C 7.33785,38.9552 5.43478,36.808 5.19169,34.203 Z" fill="var(--background)"/>
+                    </svg>
+                    <div class="trait-value">
+                        {{#if (gt attribute.value 0)}}
+                            <span>+{{attribute.value}}</span>
+                        {{else}}
+                            <span>{{attribute.value}}</span>
+                        {{/if}}
+                    </div>
+                    {{#if isSpellcasting}}
+                        <div class="spellcasting-mark" data-tooltip="DAGGERHEART.ITEMS.Subclass.spellcastingTrait">
+                            <i class="fa-solid fa-wand-magic-sparkles" inert></i>
+                        </div>
+                    {{/if}}
+                </div>
+            </div>
+        {{/each}}
+    </div>
+
+    {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' }}
+        <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}"><i class="fa-solid fa-wrench"></i></button>
+    {{/'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
 </header>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs
index c3ddb0ad..fe1e6972 100644
--- a/templates/sheets/actors/character/inventory.hbs
+++ b/templates/sheets/actors/character/inventory.hbs
@@ -1,54 +1,54 @@
-<section class='tab {{tabs.inventory.cssClass}} {{tabs.inventory.id}}' data-tab='{{tabs.inventory.id}}'
-    data-group='{{tabs.inventory.group}}'>
-    <div class="search-section">
-        <div class="search-bar">
-            <div class="icon">
-                <i class="fa-solid fa-magnifying-glass"></i>
-            </div>
-            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
-        </div>
-        <a class="filter-button">
-            <i class="fa-solid fa-filter"></i>
-        </a>
-    </div>
-
-    {{#if this.inventory.hasCurrency}}
-        {{> "systems/daggerheart/templates/sheets/global/partials/gold.hbs" currencies=inventory.currencies}}
-    {{/if}}
-
-    <div class="items-section">
-        {{> 'daggerheart.inventory-items'
-        title='TYPES.Item.weapon'
-        type='weapon'
-        collection=@root.inventory.weapons
-        isGlassy=true
-        canCreate=@root.editable
-        hideResources=true
-        }}
-        {{> 'daggerheart.inventory-items'
-        title='TYPES.Item.armor'
-        type='armor'
-        collection=@root.inventory.armor
-        isGlassy=true
-        canCreate=@root.editable
-        hideResources=true
-        }}
-        {{> 'daggerheart.inventory-items'
-        title='TYPES.Item.consumable'
-        type='consumable'
-        collection=@root.inventory.consumables
-        isGlassy=true
-        canCreate=@root.editable
-        isQuantifiable=true
-        }}
-        {{> 'daggerheart.inventory-items'
-        title='TYPES.Item.loot'
-        type='loot'
-        collection=@root.inventory.loot
-        isGlassy=true
-        canCreate=@root.editable
-        showActions=@root.editable
-        isQuantifiable=true
-        }}
-    </div>
+<section class='tab {{tabs.inventory.cssClass}} {{tabs.inventory.id}}' data-tab='{{tabs.inventory.id}}'
+    data-group='{{tabs.inventory.group}}'>
+    <div class="search-section">
+        <div class="search-bar">
+            <div class="icon">
+                <i class="fa-solid fa-magnifying-glass"></i>
+            </div>
+            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
+        </div>
+        <a class="filter-button">
+            <i class="fa-solid fa-filter"></i>
+        </a>
+    </div>
+
+    {{#if this.inventory.hasCurrency}}
+        {{> "systems/daggerheart/templates/sheets/global/partials/gold.hbs" currencies=inventory.currencies}}
+    {{/if}}
+
+    <div class="items-section scroll-container">
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.weapon'
+        type='weapon'
+        collection=@root.inventory.weapons
+        isGlassy=true
+        canCreate=@root.editable
+        hideResources=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.armor'
+        type='armor'
+        collection=@root.inventory.armor
+        isGlassy=true
+        canCreate=@root.editable
+        hideResources=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.consumable'
+        type='consumable'
+        collection=@root.inventory.consumables
+        isGlassy=true
+        canCreate=@root.editable
+        isQuantifiable=true
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='TYPES.Item.loot'
+        type='loot'
+        collection=@root.inventory.loot
+        isGlassy=true
+        canCreate=@root.editable
+        showActions=@root.editable
+        isQuantifiable=true
+        }}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/character/loadout.hbs b/templates/sheets/actors/character/loadout.hbs
index 9ba3fb04..945f06d2 100644
--- a/templates/sheets/actors/character/loadout.hbs
+++ b/templates/sheets/actors/character/loadout.hbs
@@ -1,42 +1,42 @@
-<section class='tab {{tabs.loadout.cssClass}} {{tabs.loadout.id}}' data-tab='{{tabs.loadout.id}}'
-    data-group='{{tabs.loadout.group}}'>
-    <div class="search-section">
-        <div class="search-bar">
-            <div class="icon">
-                <i class="fa-solid fa-magnifying-glass"></i>
-            </div>
-            <input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
-        </div>
-        <a class="filter-button">
-            <i class="fa-solid fa-filter"></i>
-        </a>
-        <button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{not cardView}}">
-            <span class="{{ifThen cardView '' 'list-active'}} list-icon">
-                <i class="fa-solid fa-bars"></i>
-            </span>
-            <span class="{{ifThen cardView 'grid-active' ''}} grid-icon">
-                <i class="fa-solid fa-grip"></i>
-            </span>
-        </button>
-    </div>
-
-    <div class="items-section">
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.Tabs.loadout'
-        type='domainCard'
-        isGlassy=true
-        cardView=cardView
-        collection=document.system.domainCards.loadout
-        canCreate=@root.editable
-        }}
-        {{> 'daggerheart.inventory-items'
-        title='DAGGERHEART.GENERAL.Tabs.vault'
-        type='domainCard'
-        isGlassy=true
-        cardView=cardView
-        collection=document.system.domainCards.vault
-        canCreate=@root.editable
-        inVault=true
-        }}
-    </div>
+<section class='tab {{tabs.loadout.cssClass}} {{tabs.loadout.id}}' data-tab='{{tabs.loadout.id}}'
+    data-group='{{tabs.loadout.group}}'>
+    <div class="search-section">
+        <div class="search-bar">
+            <div class="icon">
+                <i class="fa-solid fa-magnifying-glass"></i>
+            </div>
+            <input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
+        </div>
+        <a class="filter-button">
+            <i class="fa-solid fa-filter"></i>
+        </a>
+        <button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{not cardView}}">
+            <span class="{{ifThen cardView '' 'list-active'}} list-icon">
+                <i class="fa-solid fa-bars"></i>
+            </span>
+            <span class="{{ifThen cardView 'grid-active' ''}} grid-icon">
+                <i class="fa-solid fa-grip"></i>
+            </span>
+        </button>
+    </div>
+
+    <div class="items-section scroll-container">
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.Tabs.loadout'
+        type='domainCard'
+        isGlassy=true
+        cardView=cardView
+        collection=document.system.domainCards.loadout
+        canCreate=@root.editable
+        }}
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.Tabs.vault'
+        type='domainCard'
+        isGlassy=true
+        cardView=cardView
+        collection=document.system.domainCards.vault
+        canCreate=@root.editable
+        inVault=true
+        }}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb038..ec5c540a 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -1,17 +1,18 @@
 <section
-    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
-    data-tab='{{tabs.features.id}}'
-    data-group='{{tabs.features.group}}'
+    class="tab {{tabs.features.cssClass}} {{tabs.features.id}}"
+    data-tab="{{tabs.features.id}}"
+    data-group="{{tabs.features.group}}"
 >
-    <div class="feature-section">
-        {{> 'daggerheart.inventory-items'
-        title=tabs.features.label
-        type='feature'
-        collection=@root.features
-        hideContextMenu=true
-        hideModifyControls=true
-        canCreate=@root.editable
-        showActions=@root.editable
-        }}
+    <div class="feature-section scroll-container">
+        {{#each @root.features as |item|}}
+            {{> "daggerheart.inventory-item"
+                item=item
+                type="feature"
+                actorType=@root.document.type
+                hideContextMenu=true
+                hideModifyControls=true
+                showActions=@root.editable
+            }}
+        {{/each}}
     </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/potentialAdversaries.hbs b/templates/sheets/actors/environment/potentialAdversaries.hbs
index 5f4d039e..fbe5a993 100644
--- a/templates/sheets/actors/environment/potentialAdversaries.hbs
+++ b/templates/sheets/actors/environment/potentialAdversaries.hbs
@@ -1,20 +1,20 @@
-<section
-    class='tab {{tabs.potentialAdversaries.cssClass}} {{tabs.potentialAdversaries.id}}'
-    data-tab='{{tabs.potentialAdversaries.id}}'
-    data-group='{{tabs.potentialAdversaries.group}}'
->    
-    <div class="items-section">
-        {{#each document.system.potentialAdversaries as |category categoryId|}}
-            {{> 'daggerheart.inventory-items'
-            title=category.label
-            type='adversary'
-            isGlassy=true
-            isActor=true
-            categoryAdversary=categoryId
-            hideControls=true
-            collection=category.adversaries
-            hideResources=true
-            }}
-        {{/each}}
-    </div>
+<section
+    class='tab {{tabs.potentialAdversaries.cssClass}} {{tabs.potentialAdversaries.id}}'
+    data-tab='{{tabs.potentialAdversaries.id}}'
+    data-group='{{tabs.potentialAdversaries.group}}'
+>    
+    <div class="items-section scroll-container">
+        {{#each document.system.potentialAdversaries as |category categoryId|}}
+            {{> 'daggerheart.inventory-items'
+            title=category.label
+            type='adversary'
+            isGlassy=true
+            isActor=true
+            categoryAdversary=categoryId
+            hideControls=true
+            collection=category.adversaries
+            hideResources=true
+            }}
+        {{/each}}
+    </div>
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/party/inventory.hbs b/templates/sheets/actors/party/inventory.hbs
index cf056608..09e52dab 100644
--- a/templates/sheets/actors/party/inventory.hbs
+++ b/templates/sheets/actors/party/inventory.hbs
@@ -19,7 +19,7 @@
         {{> "systems/daggerheart/templates/sheets/global/partials/gold.hbs" currencies=inventory.currencies}}
     {{/if}}
 
-    <div class="items-section">
+    <div class="items-section scroll-container">
         {{> 'daggerheart.inventory-items'
         title='TYPES.Item.weapon'
         type='weapon'