diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 04be3efb2..caaa193a7 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: 670, height: 766 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index e3072da12..8381c7c36 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 b3eb0469b..c90e5d887 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -42,7 +42,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 4aa44e51b..da71b52b3 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -8,7 +8,8 @@
             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/adversary/features.less b/styles/less/sheets/actors/adversary/features.less
index 447d050ee..198033008 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -3,14 +3,27 @@
 @import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.adversary {
-    .tab.features {
+    .tab.features.active {
+        position: relative;
+        padding-left: 15px;
         .feature-section {
             display: flex;
             flex-direction: column;
             gap: 10px;
+            padding: 6px 2px 4px 0;
             overflow-y: auto;
-            padding-bottom: 20px;
+            scrollbar-gutter: stable;
             .with-scroll-shadows();
         }
+        > button {
+            --button-size: 1.75rem;
+            width: 1.75rem;
+            position: absolute;
+            inset: auto 16px 0 auto;
+            box-shadow: 0 0 5px @light-black;
+        }
+        &:has(> button) .feature-section {
+            padding-bottom: calc(1px + 1.75rem);
+        }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/index.less b/styles/less/sheets/actors/adversary/index.less
index 28ff9d22f..a05af854c 100644
--- a/styles/less/sheets/actors/adversary/index.less
+++ b/styles/less/sheets/actors/adversary/index.less
@@ -1,7 +1,6 @@
-@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
index a95d070ec..80feb77de 100644
--- a/styles/less/sheets/actors/adversary/notes.less
+++ b/styles/less/sheets/actors/adversary/notes.less
@@ -1,3 +1,7 @@
 .application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
-    padding-bottom: 20px;
+    padding: 6px 0 4px 15px;
+    .editor-content {
+        scrollbar-gutter: stable;
+        .with-scroll-shadows();
+    }
 }
diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less
index 0bd845fa6..509a2d63b 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -9,28 +9,31 @@
         height: 100%;
         width: 100%;
         padding-bottom: 0;
+    }
+
+    .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;
+    }
 
-        .adversary-sidebar-sheet {
-            grid-row: 1 / span 2;
-            grid-column: 1;
+    .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;
-            }
+            padding-right: 0;
+            margin-right: 2px;
+            margin-bottom: 16px;
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index 8548a2fb9..ce52c5af4 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 52b418261..f81f0e326 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 edefe0a15..f196d5bf7 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 fcfbbee90..b07bb6fe6 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 fa3e01765..67b2914b4 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 68792c999..aebcb9b9f 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-header-sheet {
+        position: relative;
+        grid-row: 1;
+        grid-column: 2;
+    }
 
-        .character-sidebar-sheet {
-            grid-row: 1 / span 2;
-            grid-column: 1;
+    .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 c0cac669b..409731962 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 84cf26f88..a8fff5272 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -4,13 +4,25 @@
 
 .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();
         }
+        > button {
+            --button-size: 1.75rem;
+            width: 1.75rem;
+            position: absolute;
+            inset: auto 16px 0 auto;
+            box-shadow: 0 0 5px @light-black;
+        }
+        &:has(> button) .feature-section {
+            padding-bottom: calc(1px + 1.75rem);
+        }
     }
 }
diff --git a/styles/less/sheets/actors/environment/index.less b/styles/less/sheets/actors/environment/index.less
index 211c8e60f..db35eabc5 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 000000000..58447c887
--- /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 f112c0d2c..e66ff34da 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 2d9cc188b..02489cace 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 56f7a457b..279c9db22 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';
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index 444c6a570..4b14e1121 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 000000000..4ef51caa8
--- /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();
+        }
+    }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index dc4642916..7b85eb35f 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 852b6cfc7..33aa64a33 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/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 3b495e74d..685540e7e 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,14 +1,20 @@
 <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
-        }}
+        {{#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
+    {{#if @root.editable}}
+        <button data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize 'TYPES.Item.feature')}}">
+            <i class="fa-solid fa-plus icon-button"></i>
+        </button>
+    {{/if}}
+</section>
diff --git a/templates/sheets/actors/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index a5c3f706d..28df7f8e7 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/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb0389..1dbd4b948 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -4,14 +4,20 @@
     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>
+        {{#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>    
+    {{#if @root.editable}}
+        <button data-action="createDoc" data-document-class="Item" data-type="feature" data-tooltip="{{localize 'DOCUMENT.Create' type=(localize 'TYPES.Item.feature')}}">
+            <i class="fa-solid fa-plus icon-button"></i>
+        </button>
+    {{/if}}
 </section>
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/notes.hbs b/templates/sheets/actors/environment/notes.hbs
index 4f6b131e2..1acf0e930 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 663a484a8..0972bee9a 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