From a15b82df3685d8abf17de0e69e283ac06881abaa Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Fri, 29 May 2026 05:41:22 -0400
Subject: [PATCH] Styling pass for scrollbars, fieldsets, and scroll shadows

---
 .../applications/sheets/actors/adversary.mjs  |   9 +-
 styles/less/global/elements.less              |  51 +----
 styles/less/global/global.less                |   2 +-
 styles/less/global/inventory-item.less        |  48 +++++
 styles/less/global/sheet.less                 |   2 +-
 .../sheets/actors/actor-sheet-shared.less     |   3 +-
 .../less/sheets/actors/adversary/effects.less |   3 -
 .../sheets/actors/adversary/features.less     |   5 +-
 .../less/sheets/actors/adversary/header.less  |   3 +-
 .../less/sheets/actors/adversary/index.less   |   6 +-
 .../less/sheets/actors/adversary/notes.less   |   3 -
 .../less/sheets/actors/adversary/sheet.less   |  65 ++++--
 .../less/sheets/actors/adversary/sidebar.less |  22 +-
 .../sheets/actors/character/biography.less    |   3 +-
 .../sheets/actors/character/features.less     |   1 +
 .../less/sheets/actors/character/index.less   |   2 +-
 .../sheets/actors/character/inventory.less    |   7 +-
 .../less/sheets/actors/character/loadout.less |   4 +-
 .../less/sheets/actors/character/sheet.less   |  41 ++--
 .../less/sheets/actors/companion/effects.less |   6 +-
 .../sheets/actors/environment/features.less   |   4 +-
 .../less/sheets/actors/environment/index.less |   3 +-
 .../less/sheets/actors/environment/notes.less |  11 +
 .../environment/potentialAdversaries.less     |   4 +-
 .../less/sheets/actors/environment/sheet.less |   2 +
 styles/less/sheets/actors/party/index.less    |   3 +-
 .../less/sheets/actors/party/inventory.less   |   6 +
 styles/less/sheets/actors/party/notes.less    |  12 ++
 .../sheets/actors/party/party-members.less    |   1 +
 styles/less/sheets/actors/party/sheet.less    |   2 +
 templates/sheets/actors/adversary/effects.hbs |  42 ++--
 .../sheets/actors/adversary/features.hbs      |  23 +-
 templates/sheets/actors/adversary/notes.hbs   |   5 +-
 templates/sheets/actors/adversary/sidebar.hbs | 200 +++++++++---------
 .../sheets/actors/environment/features.hbs    |  19 +-
 templates/sheets/actors/environment/notes.hbs |   5 +-
 templates/sheets/actors/party/notes.hbs       |   5 +-
 37 files changed, 355 insertions(+), 278 deletions(-)
 delete mode 100644 styles/less/sheets/actors/adversary/notes.less
 create mode 100644 styles/less/sheets/actors/environment/notes.less
 create mode 100644 styles/less/sheets/actors/party/notes.less

diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 85380392..c25ed64b 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -7,7 +7,7 @@ export default class AdversarySheet extends DHBaseActorSheet {
     /** @inheritDoc */
     static DEFAULT_OPTIONS = {
         classes: ['adversary'],
-        position: { width: 660, height: 766 },
+        position: { width: 650, height: 750 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,
@@ -58,12 +58,13 @@ export default class AdversarySheet extends DHBaseActorSheet {
             template: 'systems/daggerheart/templates/sheets/actors/adversary/features.hbs',
             scrollable: ['.feature-section']
         },
-        notes: {
-            template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs'
-        },
         effects: {
             template: 'systems/daggerheart/templates/sheets/actors/adversary/effects.hbs',
             scrollable: ['.effects-sections']
+        },
+        notes: {
+            template: 'systems/daggerheart/templates/sheets/actors/adversary/notes.hbs',
+            scrollable: ['.editor-content']
         }
     };
 
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index e57ba50d..5cc22cce 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -261,13 +261,14 @@
 
     fieldset {
         align-items: center;
-        margin-top: 5px;
         border-radius: 6px;
         border-color: @color-fieldset-border;
+        margin-top: 5px;
 
         &.glassy {
             background-color: light-dark(@dark-blue-10, @golden-10);
-            border-color: transparent;
+            padding-inline: 10px;
+            border: none;
 
             legend {
                 padding: 2px 12px;
@@ -501,7 +502,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 {
@@ -535,50 +536,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;
diff --git a/styles/less/global/global.less b/styles/less/global/global.less
index c0e7f3fc..404f32cf 100644
--- a/styles/less/global/global.less
+++ b/styles/less/global/global.less
@@ -93,7 +93,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..27773ff6 100644
--- a/styles/less/global/inventory-item.less
+++ b/styles/less/global/inventory-item.less
@@ -45,8 +45,12 @@
 
             .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-bottom: 0;
             }
 
             &:hover {
@@ -271,6 +275,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 89617103..6015047b 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -39,6 +39,7 @@
 
     .window-header > .attribution-header-label {
         margin-right: var(--spacer-4);
+        pointer-events: none;
     }
 
     .tab.inventory {
@@ -46,7 +47,7 @@
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr;
             gap: 10px;
-            padding: 10px 10px 0;
+            padding: 12px 12px 0 10px;
 
             .input {
                 color: light-dark(@dark, @beige);
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..851561cf 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -3,14 +3,11 @@
 @import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
-    .tab.features {
+    .tab.features.active {
         .feature-section {
             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..0d50b886 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(--left-indent);
             padding-right: 15px;
         }
 
@@ -75,6 +75,7 @@
 
         .tab-navigation {
             margin-top: 0;
+            margin-bottom: 0;
             button[data-action="openSettings"] {
                 margin-right: 12px;
             }
diff --git a/styles/less/sheets/actors/adversary/index.less b/styles/less/sheets/actors/adversary/index.less
index 28ff9d22..9d531139 100644
--- a/styles/less/sheets/actors/adversary/index.less
+++ b/styles/less/sheets/actors/adversary/index.less
@@ -1,7 +1,5 @@
-@import './features.less';
-@import './header.less';
 @import './sheet.less';
+@import './header.less';
+@import './features.less';
 @import './sidebar.less';
 @import './effects.less';
-@import './notes.less';
-
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 0bd845fa..155de097 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -2,35 +2,62 @@
 @import '../../../utils/fonts.less';
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
+    --left-indent: 16px;
+    --sidebar-width: 265px;
+
     .window-content {
         display: grid;
-        grid-template-columns: 275px 1fr;
+        grid-template-columns: var(--sidebar-width) 1fr;
         grid-template-rows: auto 1fr;
         height: 100%;
         width: 100%;
         padding-bottom: 0;
+    }
 
-        .adversary-sidebar-sheet {
-            grid-row: 1 / span 2;
-            grid-column: 1;
+    .adversary-sidebar-sheet {
+        grid-row: 1 / span 2;
+        grid-column: 1;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .adversary-header-sheet {
+        grid-row: 1;
+        grid-column: 2;
+    }
+
+    .tab {
+        grid-row: 2;
+        grid-column: 2;
+        &.active {
             overflow: hidden;
             display: flex;
             flex-direction: column;
-        }
-
-        .adversary-header-sheet {
-            grid-row: 1;
-            grid-column: 2;
-        }
-
-        .tab {
-            grid-row: 2;
-            grid-column: 2;
-            &.active {
-                overflow: hidden;
-                display: flex;
-                flex-direction: column;
+            margin: 0 0 10px 0;
+            padding: 0;
+            position: relative;
+                    
+            .scroll-container,
+            > prose-mirror.inactive .editor-content {
+                scrollbar-gutter: stable;
+                overflow-y: auto;
+                padding: var(--spacer-16) calc(var(--left-indent) - 6px) 4px var(--left-indent);
+                .with-scroll-shadows();
+                > fieldset {
+                    margin-left: -10px; // align content with indent
+                    margin-right: -10px;
+                    &:first-child {
+                        margin-top: 0;
+                    }
+                }
+            }
+            > prose-mirror.inactive button.toggle {
+                top: var(--spacer-16);
+            }
+            &:has(> prose-mirror.active) {
+                padding: var(--spacer-12) 0 0 var(--left-indent);
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/adversary/sidebar.less b/styles/less/sheets/actors/adversary/sidebar.less
index 5db9f5e9..dc8650aa 100644
--- a/styles/less/sheets/actors/adversary/sidebar.less
+++ b/styles/less/sheets/actors/adversary/sidebar.less
@@ -22,8 +22,8 @@
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
     .adversary-sidebar-sheet {
-        width: 275px;
-        min-width: 275px;
+        width: var(--sidebar-width);
+        min-width: var(--sidebar-width);
         border-right: 1px solid light-dark(@dark-blue, @golden);
 
         .portrait {
@@ -52,7 +52,7 @@
             }
 
             img {
-                height: 275px;
+                height: var(--sidebar-width);
             }
 
             .death-roll-btn {
@@ -63,7 +63,7 @@
         .threshold-section {
             position: relative;
             display: flex;
-            gap: 10px;
+            gap: 8px;
             background-color: light-dark(transparent, @dark-blue);
             color: @color-text-emphatic;
             padding: 5px 10px;
@@ -74,7 +74,7 @@
             height: 30px;
 
             h4 {
-                font-size: var(--font-size-14);
+                font-size: var(--font-size-13);
                 font-weight: bold;
                 text-transform: uppercase;
                 color: @color-text-emphatic;
@@ -107,7 +107,7 @@
             flex-direction: column;
             top: -20px;
             gap: 16px;
-            margin-bottom: -10px;
+            margin-bottom: -16px;
 
             &.pip-display {
                 top: -15px;
@@ -286,6 +286,7 @@
             overflow-y: hidden;
             padding-top: 10px;
             padding-bottom: 20px;
+            flex: 1;
             scrollbar-gutter: stable;
             .with-scroll-shadows();
 
@@ -331,21 +332,21 @@
                 gap: 5px;
                 width: 100%;
                 margin-top: 10px;
-                align-items: center;
+                padding: 0 4px 0 12px;
+                align-items: stretch;
 
                 .experience-row {
                     display: flex;
                     gap: 5px;
-                    width: 250px;
                     align-items: center;
                     justify-content: space-between;
 
                     .experience-name {
-                        width: 180px;
                         display: flex;
                         align-items: center;
                         text-align: start;
                         font-size: var(--font-size-14);
+                        flex: 1;
                         color: light-dark(@dark, @beige);
                         line-height: 1;
                     }
@@ -371,7 +372,8 @@
         .reaction-section {
             display: flex;
             padding: 0 10px;
-            margin-top: 20px;
+            margin-top: 16px;
+            margin-bottom: 10px;
             width: 100%;
 
             button {
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index 8548a2fb..ce52c5af 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -11,8 +11,9 @@
             height: 100%;
             overflow-y: auto;
             padding-top: 8px;
-            padding-bottom: 20px;
+            padding-bottom: 4px;
             height: 100%;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
 
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 52b41826..f81f0e32 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -10,6 +10,7 @@
             gap: 10px;
             overflow-y: auto;
             padding-bottom: 20px;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
     }
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..b07bb6fe 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -4,13 +4,18 @@
 
 .application.sheet.daggerheart.actor.dh-style.character {
     .tab.inventory {
+        padding-right: 0;
+        .search-section {
+            padding-right: 14px;
+        }
         .items-section {
             display: flex;
             flex-direction: column;
             gap: 10px;
             overflow-y: auto;
+            scrollbar-gutter: stable;
             margin-top: 20px;
-            padding-bottom: 20px;
+            padding-bottom: 4px;
             .with-scroll-shadows();
         }
     }
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index fa3e0176..67b2914b 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -5,6 +5,7 @@
 .application.sheet.daggerheart.actor.dh-style.character {
     .tab.loadout {
         .search-section {
+            padding-right: 14px;
             .btn-toggle-view {
                 background: light-dark(@dark-blue-10, @dark-blue);
                 border: 1px solid @color-border;
@@ -52,8 +53,9 @@
             gap: 10px;
             height: 100%;
             overflow-y: auto;
+            scrollbar-gutter: stable;
             margin-top: 20px;
-            padding-bottom: 20px;
+            padding-bottom: 4px;
             .with-scroll-shadows();
         }
     }
diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less
index 68792c99..aebcb9b9 100644
--- a/styles/less/sheets/actors/character/sheet.less
+++ b/styles/less/sheets/actors/character/sheet.less
@@ -10,28 +10,31 @@
         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 {
-            position: relative;
-            grid-row: 1;
-            grid-column: 2;
-        }
-
-        .tab {
-            grid-row: 2;
-            grid-column: 2;
-            &.active {
-                display: flex;
-                flex-direction: column;
-                overflow: hidden;
-            }
+            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..295636a7 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -4,12 +4,14 @@
 
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab.features {
+        position: relative;
         .feature-section {
             display: flex;
             flex-direction: column;
             gap: 10px;
             overflow-y: auto;
-            padding-bottom: 4px;
+            padding: 4px 8px;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
     }
diff --git a/styles/less/sheets/actors/environment/index.less b/styles/less/sheets/actors/environment/index.less
index 211c8e60..db35eabc 100644
--- a/styles/less/sheets/actors/environment/index.less
+++ b/styles/less/sheets/actors/environment/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
 @import './features.less';
 @import './header.less';
 @import './potentialAdversaries.less';
-@import './sheet.less';
+@import './notes.less';
diff --git a/styles/less/sheets/actors/environment/notes.less b/styles/less/sheets/actors/environment/notes.less
new file mode 100644
index 00000000..58447c88
--- /dev/null
+++ b/styles/less/sheets/actors/environment/notes.less
@@ -0,0 +1,11 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+    .tab.notes {
+        padding: 6px 0 4px 15px;
+        .editor-content {
+            scrollbar-gutter: stable;
+            .with-scroll-shadows();
+        }
+    }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less
index f112c0d2..e66ff34d 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 {
@@ -7,7 +8,8 @@
             flex-direction: column;
             gap: 10px;
             overflow-y: auto;
-            padding-bottom: 4px;
+            padding: 0 4px 4px 4px;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
     }
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index 2d9cc188..02489cac 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -16,6 +16,8 @@
     .tab {
         flex: 1;
         overflow-y: auto;
+        padding-right: 0;
+        margin-right: 2px;
 
         &.active {
             overflow: hidden;
diff --git a/styles/less/sheets/actors/party/index.less b/styles/less/sheets/actors/party/index.less
index 56f7a457..68839512 100644
--- a/styles/less/sheets/actors/party/index.less
+++ b/styles/less/sheets/actors/party/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
 @import './header.less';
 @import './party-members.less';
-@import './sheet.less';
 @import './inventory.less';
+@import './notes.less';
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index 444c6a57..4b14e112 100644
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@@ -4,11 +4,17 @@
 
 .application.sheet.daggerheart.actor.dh-style.party {
     .tab.inventory {
+        padding-right: 0;
+        .search-section {
+            padding-right: 14px;
+        }
+
         .items-section {
             display: flex;
             flex-direction: column;
             gap: 10px;
             overflow-y: auto;
+            scrollbar-gutter: stable;
             margin-top: 20px;
             padding-bottom: 4px;
             .with-scroll-shadows();
diff --git a/styles/less/sheets/actors/party/notes.less b/styles/less/sheets/actors/party/notes.less
new file mode 100644
index 00000000..391f1056
--- /dev/null
+++ b/styles/less/sheets/actors/party/notes.less
@@ -0,0 +1,12 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.party {
+    .tab.notes {
+        padding: 16px 0 4px 15px;
+        .editor-content {
+            scrollbar-gutter: stable;
+            padding-left: 8px;
+            .with-scroll-shadows();
+        }
+    }
+}
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index dc464291..7b85eb35 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -4,6 +4,7 @@
 
 .application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
     overflow: auto;
+    .with-scroll-shadows();
 
     .actors-list {
         display: flex;
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index 852b6cfc..33aa64a3 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -21,6 +21,8 @@
         flex: 1;
         overflow-y: auto;
         scrollbar-gutter: stable;
+        margin-right: 2px;
+        padding-right: 8px;
 
         &.active {
             overflow: auto;
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..281e92fd 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,14 +1,15 @@
 <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
-        }}
+    <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/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index a5c3f706..28df7f8e 100644
--- a/templates/sheets/actors/adversary/notes.hbs
+++ b/templates/sheets/actors/adversary/notes.hbs
@@ -3,10 +3,7 @@
     data-tab='{{tabs.notes.id}}'
     data-group='{{tabs.notes.group}}'
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
-    </fieldset>
+    {{formInput notes.field value=notes.value enriched=notes.enriched class="aaa" toggled=true}}
 
     {{#if (and showAttribution document.system.attribution.artist)}}
         <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
diff --git a/templates/sheets/actors/adversary/sidebar.hbs b/templates/sheets/actors/adversary/sidebar.hbs
index d2fca5f1..213c96ee 100644
--- a/templates/sheets/actors/adversary/sidebar.hbs
+++ b/templates/sheets/actors/adversary/sidebar.hbs
@@ -1,100 +1,102 @@
-<aside class="adversary-sidebar-sheet">
-    <div class="portrait {{#if (and source.system.resources.hitPoints.max (gte source.system.resources.hitPoints.value source.system.resources.hitPoints.max))}}death-roll{{/if}}">
-        <img src="{{source.img}}" alt="{{source.name}}" data-action='editImage' data-edit="img">
-        <a class="death-roll-btn"><i class="fa-solid fa-skull death-save"></i></a>
-    </div>
-
-    <div class="info-section {{#if useResourcePips}}pip-display{{/if}}">
-        <div class="resources-section">
-            {{> "systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs" resource=resources.hitPoints label="DAGGERHEART.GENERAL.HitPoints.short" key="system.resources.hitPoints.value" action="toggleHitPoints" }}
-            {{> "systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs" resource=resources.stress label="DAGGERHEART.GENERAL.stress" key="system.resources.stress.value" action="toggleStress" }}
-        </div>
-        <div class="status-section">
-            <div class="status-number">
-                <div class='status-value armor-slots'>
-                    {{#if source.system.difficulty}}
-                    <p>{{source.system.difficulty}}</p>
-                    {{else}}
-                    <p>-</p>
-                    {{/if}}
-                </div>
-                <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.difficulty"}}</h4>
-                </div>
-            </div>
-            <div class="status-number">
-                <div class='status-value armor-slots'>
-                    {{#if source.system.attack.roll.bonus includeZero=true}}
-                    <p>{{numberFormat source.system.attack.roll.bonus sign=true}}</p>
-                    {{else}}
-                    <p>-</p>
-                    {{/if}}
-                </div>
-                <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.attack"}}</h4>
-                </div>
-            </div>
-            {{#if (lt source.system.criticalThreshold 20)}}
-                <div class="status-number">
-                    <div class='status-value armor-slots'>
-                        <p>{{source.system.criticalThreshold}}+</p>
-                    </div>
-                    <div class="status-label">
-                        <h4>{{localize "DAGGERHEART.GENERAL.criticalShort"}}</h4>
-                    </div>
-                </div>
-            {{/if}}
-        </div>
-        <div class="status-section">
-            <div class="threshold-section">
-                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}</h4>
-                <h4 class="threshold-value">{{document.system.damageThresholds.major}}</h4>
-                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.major"}}</h4>
-                <h4 class="threshold-value">{{document.system.damageThresholds.severe}}</h4>
-                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.severe"}}</h4>
-            </div>
-        </div>
-    </div>
-    <div class="shortcut-items-section">
-        <div class="attack-section">
-            <div class="title">
-                <side-line-div class="invert"></side-line-div>
-                <h3>{{localize "DAGGERHEART.GENERAL.attack"}}</h3>
-                <side-line-div></side-line-div>
-            </div>
-            <ul class="items-sidebar-list">
-                {{> 'daggerheart.inventory-item-compact'
-                    item=document.system.attack
-                    type='attack'
-                    noCompendiumEdit=true
-                }}
-            </ul>
-        </div>
-        <div class="experience-section">
-            <div class="title">
-                <side-line-div class="invert"></side-line-div>
-                <h3>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</h3>
-                <side-line-div></side-line-div>
-            </div>
-            <div class="experience-list">
-                {{#each source.system.experiences as |experience id|}}
-                    <div class="experience-row" data-tooltip-text="{{experience.description}}">
-                        <span class="experience-value">
-                            +{{experience.value}}
-                        </span>
-                        <span class="experience-name">{{experience.name}}</span>
-                        <div class="controls">
-                            <a data-action="sendExpToChat" data-id="{{id}}">
-                                <i class="fa-regular fa-message"></i>
-                            </a>
-                        </div>
-                    </div>
-                {{/each}}
-            </div>
-        </div>
-        <line-div></line-div>
-        <div class="reaction-section">
-            <button type="button" data-action="reactionRoll">{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</button>
-        </div>
-    </div>
+<aside class="adversary-sidebar-sheet">
+    <div class="portrait {{#if (and source.system.resources.hitPoints.max (gte source.system.resources.hitPoints.value source.system.resources.hitPoints.max))}}death-roll{{/if}}">
+        <img src="{{source.img}}" alt="{{source.name}}" data-action='editImage' data-edit="img">
+        <a class="death-roll-btn"><i class="fa-solid fa-skull death-save"></i></a>
+    </div>
+
+    <div class="info-section {{#if useResourcePips}}pip-display{{/if}}">
+        <div class="resources-section">
+            {{> "systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs" resource=resources.hitPoints label="DAGGERHEART.GENERAL.HitPoints.short" key="system.resources.hitPoints.value" action="toggleHitPoints" }}
+            {{> "systems/daggerheart/templates/sheets/global/partials/resource-bar.hbs" resource=resources.stress label="DAGGERHEART.GENERAL.stress" key="system.resources.stress.value" action="toggleStress" }}
+        </div>
+        <div class="status-section">
+            <div class="status-number">
+                <div class='status-value armor-slots'>
+                    {{#if source.system.difficulty}}
+                    <p>{{source.system.difficulty}}</p>
+                    {{else}}
+                    <p>-</p>
+                    {{/if}}
+                </div>
+                <div class="status-label">
+                    <h4>{{localize "DAGGERHEART.GENERAL.difficulty"}}</h4>
+                </div>
+            </div>
+            <div class="status-number">
+                <div class='status-value armor-slots'>
+                    {{#if source.system.attack.roll.bonus includeZero=true}}
+                    <p>{{numberFormat source.system.attack.roll.bonus sign=true}}</p>
+                    {{else}}
+                    <p>-</p>
+                    {{/if}}
+                </div>
+                <div class="status-label">
+                    <h4>{{localize "DAGGERHEART.GENERAL.attack"}}</h4>
+                </div>
+            </div>
+            {{#if (lt source.system.criticalThreshold 20)}}
+                <div class="status-number">
+                    <div class='status-value armor-slots'>
+                        <p>{{source.system.criticalThreshold}}+</p>
+                    </div>
+                    <div class="status-label">
+                        <h4>{{localize "DAGGERHEART.GENERAL.criticalShort"}}</h4>
+                    </div>
+                </div>
+            {{/if}}
+        </div>
+        <div class="status-section">
+            <div class="threshold-section">
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.minor"}}</h4>
+                <h4 class="threshold-value">{{document.system.damageThresholds.major}}</h4>
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.major"}}</h4>
+                <h4 class="threshold-value">{{document.system.damageThresholds.severe}}</h4>
+                <h4 class="threshold-label">{{localize "DAGGERHEART.GENERAL.DamageThresholds.severe"}}</h4>
+            </div>
+        </div>
+    </div>
+    <div class="shortcut-items-section">
+        <div class="attack-section">
+            <div class="title">
+                <side-line-div class="invert"></side-line-div>
+                <h3>{{localize "DAGGERHEART.GENERAL.attack"}}</h3>
+                <side-line-div></side-line-div>
+            </div>
+            <ul class="items-sidebar-list">
+                {{> 'daggerheart.inventory-item-compact'
+                    item=document.system.attack
+                    type='attack'
+                    noCompendiumEdit=true
+                }}
+            </ul>
+        </div>
+        <div class="experience-section">
+            <div class="title">
+                <side-line-div class="invert"></side-line-div>
+                <h3>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</h3>
+                <side-line-div></side-line-div>
+            </div>
+            <div class="experience-list">
+                {{#each source.system.experiences as |experience id|}}
+                    <div class="experience-row" data-tooltip-text="{{experience.description}}">
+                        <span class="experience-value">
+                            +{{experience.value}}
+                        </span>
+                        <span class="experience-name">{{experience.name}}</span>
+                        <div class="controls">
+                            <a data-action="sendExpToChat" data-id="{{id}}">
+                                <i class="fa-regular fa-message"></i>
+                            </a>
+                        </div>
+                    </div>
+                {{/each}}
+            </div>
+        </div>
+    </div>
+    <div class="reaction-section">
+        <button type="button" data-action="reactionRoll">
+            <i class="fa-solid fa-dice"></i>
+            {{localize "DAGGERHEART.GENERAL.Roll.reaction"}}
+        </button>
+    </div>
 </aside>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb038..264d6bf5 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -4,14 +4,15 @@
     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
-        }}
+        {{#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/notes.hbs b/templates/sheets/actors/environment/notes.hbs
index 4f6b131e..1acf0e93 100644
--- a/templates/sheets/actors/environment/notes.hbs
+++ b/templates/sheets/actors/environment/notes.hbs
@@ -3,10 +3,7 @@
     data-tab='{{tabs.notes.id}}'
     data-group='{{tabs.notes.group}}'
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-    </fieldset>
+    {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
 
     {{#if (and showAttribution document.system.attribution.artist)}}
         <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
diff --git a/templates/sheets/actors/party/notes.hbs b/templates/sheets/actors/party/notes.hbs
index 663a484a..0972bee9 100644
--- a/templates/sheets/actors/party/notes.hbs
+++ b/templates/sheets/actors/party/notes.hbs
@@ -3,8 +3,5 @@
     data-tab='{{tabs.notes.id}}'
     data-group='{{tabs.notes.group}}'
 >
-    <fieldset class="fit-height">
-        <legend>{{localize tabs.notes.label}}</legend>
-        {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-    </fieldset>
+    {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
 </section>
\ No newline at end of file