diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index bcfe3cbb..b6e17ddd 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: 645, height: 760 },
+        position: { width: 645, height: 750 },
         window: { resizable: true },
         actions: {
             toggleHitPoints: AdversarySheet.#toggleHitPoints,
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index f7934b71..d570c08c 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -261,7 +261,7 @@
 
     fieldset {
         align-items: center;
-        margin-top: 5px;
+        margin: 5px 0 0 0;
         border-radius: 6px;
         border-color: @color-fieldset-border;
         padding-inline: 0.625rem;
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..3e233013 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -39,6 +39,20 @@
 
     .window-header > .attribution-header-label {
         margin-right: var(--spacer-4);
+        pointer-events: none;
+    }
+
+    .tab-navigation {
+        margin-bottom: 0;
+    }
+
+    .tab {
+        flex: 1;
+        padding: 0;
+        overflow: hidden;
+        .search-section {
+            padding: 12px 14px var(--spacer-8) 12px;
+        }
     }
 
     .tab.inventory {
@@ -46,7 +60,7 @@
             display: grid;
             grid-template-columns: 1fr 1fr 1fr 1fr;
             gap: 10px;
-            padding: 10px 10px 0;
+            padding: var(--spacer-8) 16px var(--spacer-8) 16px;
 
             .input {
                 color: light-dark(@dark, @beige);
@@ -57,7 +71,6 @@
     .tab.notes.active {
         padding: 0;
         margin: 0;
-        margin-top: -10px; // will be removed once tab-navigation bottom margin is removed on all actor sheets
         scrollbar-gutter: unset;
 
         // Add padding around top level level prosemirrors used for note tabs
@@ -66,6 +79,7 @@
             .editor-content {
                 scrollbar-gutter: stable;
                 padding-right: @right-padding;
+                padding-bottom: 4px;
             }
             &.inactive {
                 button.toggle {
@@ -76,7 +90,7 @@
                 }
             }
             &.active {
-                padding: 8px 0 4px 16px;
+                padding: 8px 0 0 16px;
             }
         }
 
diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less
index 4aa44e51..f489bee6 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -7,9 +7,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/features.less b/styles/less/sheets/actors/adversary/features.less
index 447d050e..49289d36 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -5,12 +5,8 @@
 .application.sheet.daggerheart.actor.dh-style.adversary {
     .tab.features {
         .feature-section {
-            display: flex;
-            flex-direction: column;
-            gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less
index 639af98b..1eb7d423 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -30,9 +30,9 @@
         grid-row: 2;
         grid-column: 2;
         &.active {
-            overflow: hidden;
             display: flex;
             flex-direction: column;
+            margin: 0 0 10px 0;
         }
     }
 }
\ 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..9782a588 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -8,17 +8,14 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            height: 100%;
-            overflow-y: auto;
-            padding-top: 8px;
-            padding-bottom: 20px;
-            height: 100%;
-            .with-scroll-shadows();
+            height: 100%;            
+            padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
 
         .characteristics-section {
             gap: 20px;
-            padding: 0 10px;
+            padding: 0 4px;
         }
 
         .biography-section {
diff --git a/styles/less/sheets/actors/character/effects.less b/styles/less/sheets/actors/character/effects.less
index 0ab1007d..8fac301c 100644
--- a/styles/less/sheets/actors/character/effects.less
+++ b/styles/less/sheets/actors/character/effects.less
@@ -8,9 +8,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 52b41826..fcde3e38 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -8,9 +8,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/header.less b/styles/less/sheets/actors/character/header.less
index 91b3545a..81345715 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) {
+            padding-left: 15px;
+            padding-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,12 +220,11 @@
 
         .character-traits {
             display: flex;
-            padding: 0;
             margin-bottom: 15px;
             justify-content: space-between;
             max-width: 38.5rem;
             gap: 0.5rem;
-            padding-left: 0.5rem;
+            margin-left: 0.5rem;
 
             .trait {
                 cursor: pointer;
@@ -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..ce7a8cdb 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -7,11 +7,9 @@
         .items-section {
             display: flex;
             flex-direction: column;
-            gap: 10px;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            gap: 10px;            
+            padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index fa3e0176..cb1baaa6 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -50,11 +50,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            height: 100%;
-            overflow-y: auto;
-            margin-top: 20px;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 8px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less
index 68792c99..43401b19 100644
--- a/styles/less/sheets/actors/character/sheet.less
+++ b/styles/less/sheets/actors/character/sheet.less
@@ -30,7 +30,7 @@
             &.active {
                 display: flex;
                 flex-direction: column;
-                overflow: hidden;
+                margin: 0 0 10px 0;
             }
         }
     }
diff --git a/styles/less/sheets/actors/companion/details.less b/styles/less/sheets/actors/companion/details.less
index 2e43cac4..e10e7680 100644
--- a/styles/less/sheets/actors/companion/details.less
+++ b/styles/less/sheets/actors/companion/details.less
@@ -1,7 +1,10 @@
 @import '../../../utils/colors.less';
 @import '../../../utils/fonts.less';
 
-.application.sheet.daggerheart.actor.dh-style.companion {
+.application.sheet.daggerheart.actor.dh-style.companion .tab.details.active {
+    padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
+    .stable-scroll-container();
+
     .partner-section,
     .attack-section,
     .experience-list {
diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less
index c0cac669..ffe66da8 100644
--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@@ -6,9 +6,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 20px;
-            .with-scroll-shadows();
+            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/features.less b/styles/less/sheets/actors/environment/features.less
index 84cf26f8..c6fe3750 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -5,12 +5,8 @@
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab.features {
         .feature-section {
-            display: flex;
-            flex-direction: column;
-            gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
+            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
+            .stable-scroll-container();
         }
     }
 }
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..07dc5f92 100644
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/styles/less/sheets/actors/environment/potentialAdversaries.less
@@ -6,9 +6,8 @@
             display: flex;
             flex-direction: column;
             gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
+            padding: 7px calc(12px - var(--scrollbar-width)) 4px 12px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index 2d9cc188..ef9d542a 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -14,9 +14,7 @@
 
 .application.sheet.daggerheart.actor.dh-style.environment {
     .tab {
-        flex: 1;
         overflow-y: auto;
-
         &.active {
             overflow: hidden;
             display: flex;
diff --git a/styles/less/sheets/actors/npc/features.less b/styles/less/sheets/actors/npc/features.less
index a579d9f8..f68df8a8 100644
--- a/styles/less/sheets/actors/npc/features.less
+++ b/styles/less/sheets/actors/npc/features.less
@@ -7,12 +7,8 @@
         }
 
         .feature-section {
-            display: flex;
-            flex-direction: column;
-            gap: 10px;
-            overflow-y: auto;
-            padding-bottom: 4px;
-            .with-scroll-shadows();
+            padding: 16px calc(16px - var(--scrollbar-width)) 4px 16px;
+            .stable-scroll-container();
         }
     }
 }
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index 3d882345..ca384322 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -3,7 +3,8 @@
 @import '../../../utils/mixin.less';
 
 .application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
-    overflow: auto;
+    padding: 12px calc(12px - var(--scrollbar-width)) 4px 12px;
+    .stable-scroll-container();
 
     .actions-section {
         display: flex;
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index d24c712c..bf589696 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -17,15 +17,8 @@
 });
 
 .application.sheet.daggerheart.actor.dh-style.party {
-    .tab {
-        flex: 1;
-        overflow-y: auto;
-        scrollbar-gutter: stable;
-
-        &.active {
-            overflow: auto;
-            display: flex;
-            flex-direction: column;
-        }
+    .tab.active {
+        display: flex;
+        flex-direction: column;
     }
 }
diff --git a/styles/less/utils/mixin.less b/styles/less/utils/mixin.less
index e2ef85ef..2ce85166 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;
@@ -198,3 +198,9 @@
         transparent 100%
     );
 }
+
+.stable-scroll-container() {
+    overflow-y: auto;
+    scrollbar-gutter: stable;
+    .with-scroll-shadows();
+}
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 3b495e74..05e95737 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 items-list">
+        {{#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/character/features.hbs b/templates/sheets/actors/character/features.hbs
index b2760900..c96ab623 100644
--- a/templates/sheets/actors/character/features.hbs
+++ b/templates/sheets/actors/character/features.hbs
@@ -1,26 +1,26 @@
-<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-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>
\ 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/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb038..85fa7066 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -3,15 +3,16 @@
     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 items-list">
+        {{#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/npc/features.hbs b/templates/sheets/actors/npc/features.hbs
index 3b495e74..05e95737 100644
--- a/templates/sheets/actors/npc/features.hbs
+++ b/templates/sheets/actors/npc/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 items-list">
+        {{#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