diff --git a/src/lang/de.json b/src/lang/de.json
index 74b2e99c..2d37befb 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -121,6 +121,8 @@
     "DS4.SpellMinimumLevelsSorcerer": "Zugangsstufe für Schwarzmagier",
     "DS4.SpellMinimumLevelsSorcererAbbr": "Zugangsstufe Sch",
     "DS4.SpellPrice": "Preis (Gold)",
+    "DS4.ActorName": "Name",
+    "DS4.ActorImageAltText": "Bild des Aktors",
     "DS4.ActorTypeCharacter": "Charakter",
     "DS4.ActorTypeCreature": "Kreatur",
     "DS4.Attribute": "Attribut",
@@ -144,6 +146,14 @@
     "DS4.CombatValuesRangedAttack": "Schießen",
     "DS4.CombatValuesSpellcasting": "Zaubern",
     "DS4.CombatValuesTargetedSpellcasting": "Zielzaubern",
+    "DS4.CombatValuesHitPointsSheet": "Lebenskraft",
+    "DS4.CombatValuesDefenseSheet": "Abwehr",
+    "DS4.CombatValuesInitiativeSheet": "Initiative",
+    "DS4.CombatValuesMovementSheet": "Laufen",
+    "DS4.CombatValuesMeleeAttackSheet": "Schlagen",
+    "DS4.CombatValuesRangedAttackSheet": "Schießen",
+    "DS4.CombatValuesSpellcastingSheet": "Zaubern",
+    "DS4.CombatValuesTargetedSpellcastingSheet": "Zielzaubern",
     "DS4.CharacterBaseInfoRace": "Volk",
     "DS4.CharacterBaseInfoClass": "Klasse",
     "DS4.CharacterBaseInfoHeroClass": "Heldenklasse",
diff --git a/src/lang/en.json b/src/lang/en.json
index 22a4ac0c..60f638ac 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -121,6 +121,8 @@
     "DS4.SpellMinimumLevelsSorcerer": "Minimum level for Sorcerers",
     "DS4.SpellMinimumLevelsSorcererAbbr": "Min lvl SRC",
     "DS4.SpellPrice": "Price (Gold)",
+    "DS4.ActorName": "Name",
+    "DS4.ActorImageAltText": "Image of the Actor",
     "DS4.ActorTypeCharacter": "Character",
     "DS4.ActorTypeCreature": "Creature",
     "DS4.Attribute": "Attribute",
@@ -144,6 +146,14 @@
     "DS4.CombatValuesRangedAttack": "Ranged Attack",
     "DS4.CombatValuesSpellcasting": "Spellcasting",
     "DS4.CombatValuesTargetedSpellcasting": "Targeted Spellcasting",
+    "DS4.CombatValuesHitPointsSheet": "Hit Points",
+    "DS4.CombatValuesDefenseSheet": "Defense",
+    "DS4.CombatValuesInitiativeSheet": "Initiative",
+    "DS4.CombatValuesMovementSheet": "Movement",
+    "DS4.CombatValuesMeleeAttackSheet": "Melee Attack",
+    "DS4.CombatValuesRangedAttackSheet": "RAT",
+    "DS4.CombatValuesSpellcastingSheet": "Spellcasting",
+    "DS4.CombatValuesTargetedSpellcastingSheet": "TSC",
     "DS4.CharacterBaseInfoRace": "Race",
     "DS4.CharacterBaseInfoClass": "Class",
     "DS4.CharacterBaseInfoHeroClass": "Hero Class",
diff --git a/src/module/config.ts b/src/module/config.ts
index a8850b37..0c132436 100644
--- a/src/module/config.ts
+++ b/src/module/config.ts
@@ -162,6 +162,20 @@ export const DS4 = {
             targetedSpellcasting: "DS4.CombatValuesTargetedSpellcasting",
         },
 
+        /**
+         * The what do display in the actor sheets for the combat value text (in some languages, abbreviations are necessary)
+         */
+        combatValuesSheet: {
+            hitPoints: "DS4.CombatValuesHitPointsSheet",
+            defense: "DS4.CombatValuesDefenseSheet",
+            initiative: "DS4.CombatValuesInitiativeSheet",
+            movement: "DS4.CombatValuesMovementSheet",
+            meleeAttack: "DS4.CombatValuesMeleeAttackSheet",
+            rangedAttack: "DS4.CombatValuesRangedAttackSheet",
+            spellcasting: "DS4.CombatValuesSpellcastingSheet",
+            targetedSpellcasting: "DS4.CombatValuesTargetedSpellcastingSheet",
+        },
+
         /**
          * Define the base info of a character
          */
diff --git a/src/module/handlebars/handlebars-partials.ts b/src/module/handlebars/handlebars-partials.ts
index 82e58e85..60067eca 100644
--- a/src/module/handlebars/handlebars-partials.ts
+++ b/src/module/handlebars/handlebars-partials.ts
@@ -6,14 +6,17 @@
 
 export default async function registerHandlebarsPartials(): Promise<void> {
     const templatePaths = [
+        "systems/ds4/templates/sheets/actor/components/actor-header.hbs",
+        "systems/ds4/templates/sheets/actor/components/actor-progression.hbs",
         "systems/ds4/templates/sheets/actor/components/biography.hbs",
-        "systems/ds4/templates/sheets/actor/components/character-progression.hbs",
+        "systems/ds4/templates/sheets/actor/components/character-properties.hbs",
         "systems/ds4/templates/sheets/actor/components/check.hbs",
         "systems/ds4/templates/sheets/actor/components/checks.hbs",
         "systems/ds4/templates/sheets/actor/components/combat-value.hbs",
         "systems/ds4/templates/sheets/actor/components/combat-values.hbs",
         "systems/ds4/templates/sheets/actor/components/core-value.hbs",
         "systems/ds4/templates/sheets/actor/components/core-values.hbs",
+        "systems/ds4/templates/sheets/actor/components/creature-properties.hbs",
         "systems/ds4/templates/sheets/actor/components/currency.hbs",
         "systems/ds4/templates/sheets/actor/components/item-list-entry.hbs",
         "systems/ds4/templates/sheets/actor/components/item-list-header.hbs",
diff --git a/src/scss/components/_actor_header.scss b/src/scss/components/_actor_header.scss
new file mode 100644
index 00000000..a9828e1d
--- /dev/null
+++ b/src/scss/components/_actor_header.scss
@@ -0,0 +1,53 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Johannes Loher
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+@use "../utils/typography";
+
+.ds4-actor-header {
+    display: flex;
+    flex-grow: 0;
+    flex-shrink: 0;
+    gap: 1em;
+
+    &__img {
+        border: none;
+        cursor: pointer;
+        height: 100px;
+        width: 100px;
+    }
+
+    &__data {
+        display: flex;
+        flex-direction: column;
+    }
+
+    &__data-row {
+        align-content: center;
+        display: flex;
+        flex: 1;
+        flex-direction: row;
+        gap: 0.5em;
+        > * {
+            flex: 1;
+        }
+    }
+
+    &__name {
+        display: flex;
+        align-items: center;
+        border-bottom: 0;
+        margin: 0;
+    }
+
+    &__name-input {
+        @include typography.font-heading-upper;
+        background-color: transparent;
+        border: none;
+        flex: 1;
+        font-size: 1.25em;
+        height: auto;
+    }
+}
diff --git a/src/scss/components/_actor_progression.scss b/src/scss/components/_actor_progression.scss
new file mode 100644
index 00000000..3d5679fd
--- /dev/null
+++ b/src/scss/components/_actor_progression.scss
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Johannes Loher
+ * SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+@use "../utils/colors";
+@use "../utils/typography";
+@use "../utils/variables";
+@use "../utils/mixins";
+
+.ds4-actor-progression {
+    @include mixins.mark-invalid-or-disabled-input;
+    display: flex;
+    gap: 0.5em;
+
+    &__entry {
+        align-items: center;
+        display: flex;
+        flex: 1;
+        gap: 0.25em;
+        justify-content: flex-end;
+    }
+
+    &__label {
+        @include typography.font-heading-upper;
+        border: none;
+        color: colors.$c-light-grey;
+        margin: 0;
+        padding: 0;
+        text-align: right;
+    }
+
+    &__input {
+        flex: 0 0 5ch;
+
+        &--slayer-points {
+            &::-webkit-inner-spin-button,
+            &::-webkit-outer-spin-button {
+                -webkit-appearance: auto;
+            }
+            &:hover,
+            &:focus {
+                -moz-appearance: auto;
+            }
+        }
+    }
+}
diff --git a/src/scss/components/_actor_properties.scss b/src/scss/components/_actor_properties.scss
new file mode 100644
index 00000000..0f735047
--- /dev/null
+++ b/src/scss/components/_actor_properties.scss
@@ -0,0 +1,36 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Johannes Loher
+ * SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+ * SPDX-FileCopyrightText: 2021 Gesina Schwalbe
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+@use "../utils/mixins";
+@use "../utils/variables";
+
+.ds4-actor-properties {
+    @include mixins.mark-invalid-or-disabled-input;
+    display: flex;
+    gap: 0.25em;
+
+    &__property {
+        flex: 1;
+    }
+
+    &__property-label {
+        font-size: 0.9em;
+        font-weight: bold;
+        white-space: nowrap;
+    }
+
+    &__property-select {
+        width: 100%;
+        height: variables.$default-input-height;
+    }
+
+    &__property-multi-input {
+        display: flex;
+        gap: 0.125em;
+    }
+}
diff --git a/src/scss/components/_character_progression.scss b/src/scss/components/_character_progression.scss
deleted file mode 100644
index 8e316a81..00000000
--- a/src/scss/components/_character_progression.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021 Johannes Loher
- * SPDX-FileCopyrightText: 2021 Oliver Rümpelein
- *
- * SPDX-License-Identifier: MIT
- */
-
-@use "../utils/colors";
-@use "../utils/typography";
-@use "../utils/variables";
-@use "../utils/mixins";
-
-.progression {
-    .progression-entry {
-        @include mixins.mark-invalid-or-disabled-input;
-
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        justify-content: flex-end;
-        align-items: center;
-
-        padding-right: 3px;
-        h2.progression-label {
-            @include typography.font-heading-upper;
-            display: block;
-            height: 50px;
-            padding: 0;
-            color: colors.$c-light-grey;
-            border: none;
-            line-height: 50px;
-            margin: variables.$margin-sm 0;
-            text-align: right;
-        }
-        input.progression-value {
-            margin-left: 5px;
-            flex: 0 0 40px;
-            text-align: left;
-
-            &--slayer-points {
-                &::-webkit-inner-spin-button,
-                &::-webkit-outer-spin-button {
-                    -webkit-appearance: auto;
-                }
-                &:hover,
-                &:focus {
-                    -moz-appearance: auto;
-                }
-            }
-        }
-    }
-}
diff --git a/src/scss/components/_combat_value.scss b/src/scss/components/_combat_value.scss
index 66b102ef..326d0f6e 100644
--- a/src/scss/components/_combat_value.scss
+++ b/src/scss/components/_combat_value.scss
@@ -6,13 +6,14 @@
 
 @use "../utils/mixins";
 @use "../utils/variables";
+@use "../utils/typography";
 
 .ds4-combat-value {
     $size: 3.75rem;
 
     display: grid;
     place-items: center;
-    row-gap: 0.5em;
+    row-gap: 0.125em;
 
     &__value {
         $combat-values-icons-path: "#{variables.$official-icons-path}/combat-values";
@@ -51,6 +52,12 @@
         }
     }
 
+    &__label {
+        @include typography.font-heading-upper;
+        font-size: 1.2em;
+        white-space: nowrap;
+    }
+
     &__formula {
         align-items: center;
         justify-content: space-between;
diff --git a/src/scss/components/_character_values.scss b/src/scss/components/_sheet.scss
similarity index 52%
rename from src/scss/components/_character_values.scss
rename to src/scss/components/_sheet.scss
index 5dfb4648..2308aef2 100644
--- a/src/scss/components/_character_values.scss
+++ b/src/scss/components/_sheet.scss
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 
-header.sheet-header {
-    .character-values {
-        flex: 0 0 100%;
-    }
+.ds4-sheet {
+    display: flex;
+    flex-direction: column;
+    flex-wrap: nowrap;
 }
diff --git a/src/scss/components/_tabs.scss b/src/scss/components/_sheet_tab_nav.scss
similarity index 78%
rename from src/scss/components/_tabs.scss
rename to src/scss/components/_sheet_tab_nav.scss
index a16447aa..ed8bcdba 100644
--- a/src/scss/components/_tabs.scss
+++ b/src/scss/components/_sheet_tab_nav.scss
@@ -6,16 +6,13 @@
 
 @use "../utils/variables";
 
-nav.tabs {
-    height: auto;
-    border-top: variables.$border-groove;
+.ds4-sheet-tab-nav {
     border-bottom: variables.$border-groove;
-    .item {
+    border-top: variables.$border-groove;
+    height: auto;
+
+    &__item {
         font-weight: bold;
         white-space: nowrap;
     }
-
-    .item.active {
-        text-decoration: none;
-    }
 }
diff --git a/src/scss/ds4.scss b/src/scss/ds4.scss
index 7e33edde..a6afe386 100644
--- a/src/scss/ds4.scss
+++ b/src/scss/ds4.scss
@@ -20,10 +20,11 @@
 
 /* Styles limited to ds4 sheets */
 .ds4 {
+    @include meta.load-css("components/actor_header");
+    @include meta.load-css("components/actor_progression");
+    @include meta.load-css("components/actor_properties");
     @include meta.load-css("components/apps");
     @include meta.load-css("components/basic_property");
-    @include meta.load-css("components/character_progression");
-    @include meta.load-css("components/character_values");
     @include meta.load-css("components/check");
     @include meta.load-css("components/checks");
     @include meta.load-css("components/combat_value");
@@ -36,7 +37,8 @@
     @include meta.load-css("components/item_list");
     @include meta.load-css("components/profile");
     @include meta.load-css("components/rollable_image");
-    @include meta.load-css("components/tabs");
+    @include meta.load-css("components/sheet_tab_nav");
+    @include meta.load-css("components/sheet");
     @include meta.load-css("components/talent_rank_equation");
     @include meta.load-css("tabs/biography");
 }
diff --git a/src/templates/sheets/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs
index 8e5eb279..99ff588c 100644
--- a/src/templates/sheets/actor/character-sheet.hbs
+++ b/src/templates/sheets/actor/character-sheet.hbs
@@ -6,83 +6,19 @@ SPDX-FileCopyrightText: 2021 Gesina Schwalbe
 SPDX-License-Identifier: MIT
 --}}
 
-<form class="{{cssClass}} flexcol" autocomplete="off">
-    {{!-- Sheet Header --}}
-    <header class="sheet-header">
-        <img class="profile-img" src="{{data.img}}" data-edit="img" alt="Actor Icon" title="{{data.name}}" height="100"
-            width="100" />
-        <div class="header-fields flexrow">
-            <h1 class="charname">
-                <label for="name" class="hidden">Name</label>
-                <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
-            </h1>
-            {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
-
-            <div class="flexrow basic-properties">
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.race">{{config.i18n.characterBaseInfo.race}}</label>
-                    <input type="text" name="data.baseInfo.race" id="data.baseInfo.race"
-                        value="{{data.data.baseInfo.race}}" data-dtype="String" />
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.culture">{{config.i18n.characterBaseInfo.culture}}</label>
-                    <input id="data.baseInfo.culture" type="text" name="data.baseInfo.culture"
-                        value="{{data.data.baseInfo.culture}}" data-dtype="String" />
-                </div>
-                <div class="basic-property flex125">
-                    <label class="basic-property-label"
-                        for="data.progression.progressPoints.used">{{config.i18n.characterProgression.progressPoints}}</label>
-                    <div class="flexrow">
-                        <input id="data.progression.progressPoints.used" type="number"
-                            name="data.progression.progressPoints.used"
-                            value="{{data.data.progression.progressPoints.used}}" data-dtype="Number" />
-                        <span class="input-divider"> / </span>
-                        <label class="hidden" for="data.progression.progressPoints.total">Total
-                            Progression Points</label>
-                        <input type="number" id="data.progression.progressPoints.total"
-                            name="data.progression.progressPoints.total"
-                            value="{{data.data.progression.progressPoints.total}}" data-dtype="Number" />
-                    </div>
-                </div>
-                <div class="basic-property flex125">
-                    <label class="basic-property-label"
-                        for="data.progression.talentPoints.used">{{config.i18n.characterProgression.talentPoints}}</label>
-                    <div class="flexrow">
-                        <input type="number" name="data.progression.talentPoints.used"
-                            id="data.progression.talentPoints.used" value="{{data.data.progression.talentPoints.used}}"
-                            data-dtype="Number" />
-                        <span class="input-divider"> / </span>
-                        <label for="data.progression.talentPoints.total" class="hidden">Total Talent Points</label>
-                        <input type="number" name="data.progression.talentPoints.total"
-                            id="data.progression.talentPoints.total"
-                            value="{{data.data.progression.talentPoints.total}}" data-dtype="Number" />
-                    </div>
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.class">{{config.i18n.characterBaseInfo.class}}</label>
-                    <input type="text" id="data.baseInfo.class" name="data.baseInfo.class"
-                        value="{{data.data.baseInfo.class}}" data-dtype="String" />
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.heroClass">{{config.i18n.characterBaseInfo.heroClass}}</label>
-                    <input type="text" id="data.baseInfo.heroClass" name="data.baseInfo.heroClass"
-                        value="{{data.data.baseInfo.heroClass}}" data-dtype="String" />
-                </div>
-            </div>
-        </div>
-    </header>
+<form class="{{cssClass}} ds4-sheet" autocomplete="off">
+    {{!-- Header --}}
+    {{#> systems/ds4/templates/sheets/actor/components/actor-header.hbs}}
+    {{> systems/ds4/templates/sheets/actor/components/character-properties.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/actor-header.hbs}}
 
     {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="values">{{localize 'DS4.HeadingValues'}}</a>
-        <a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
-        <a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
-        <a class="item" data-tab="abilities">{{localize 'DS4.HeadingAbilities'}}</a>
-        <a class="item" data-tab="biography">{{localize 'DS4.HeadingBiography'}}</a>
+    <nav class="ds4-sheet-tab-nav sheet-tabs tabs" data-group="primary">
+        <a class="ds4-sheet-tab-nav__item item" data-tab="values">{{localize 'DS4.HeadingValues'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="abilities">{{localize 'DS4.HeadingAbilities'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="biography">{{localize 'DS4.HeadingBiography'}}</a>
     </nav>
 
     <!-- beautify ignore:start -->
diff --git a/src/templates/sheets/actor/components/actor-header.hbs b/src/templates/sheets/actor/components/actor-header.hbs
new file mode 100644
index 00000000..b4a38c12
--- /dev/null
+++ b/src/templates/sheets/actor/components/actor-header.hbs
@@ -0,0 +1,29 @@
+{{!--
+SPDX-FileCopyrightText: 2021 Johannes Loher
+SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+SPDX-FileCopyrightText: 2021 Gesina Schwalbe
+
+SPDX-License-Identifier: MIT
+--}}
+
+{{!--
+!-- Render an actor sheet header.
+!-- @param @partial-block: Properties to render in the second header row.
+--}}
+<header class="ds4-actor-header">
+    <img class="ds4-actor-header__img" src="{{data.img}}" data-edit="img" alt="{{localize 'DS4.ActorImageAltText'}}"
+        title="{{data.name}}" height="100" width="100" />
+    <div class="ds4-actor-header__data">
+        <div class="ds4-actor-header__data-row">
+            <h1 class="ds4-actor-header__name">
+                <label for="name-{{data._id}}" class="hidden">{{localize 'DS4.ActorName'}}</label>
+                <input class="ds4-actor-header__name-input" name="name" type="text" id="name-{{data._id}}"
+                    value="{{data.name}}" placeholder="{{localize 'DS4.ActorName'}}" />
+            </h1>
+            {{> systems/ds4/templates/sheets/actor/components/actor-progression.hbs}}
+        </div>
+        <div class="ds4-actor-header__data-row">
+            {{> @partial-block}}
+        </div>
+    </div>
+</header>
diff --git a/src/templates/sheets/actor/components/actor-progression.hbs b/src/templates/sheets/actor/components/actor-progression.hbs
new file mode 100644
index 00000000..bfb3a860
--- /dev/null
+++ b/src/templates/sheets/actor/components/actor-progression.hbs
@@ -0,0 +1,48 @@
+{{!--
+SPDX-FileCopyrightText: 2021 Johannes Loher
+SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+SPDX-FileCopyrightText: 2021 Gesina Schwalbe
+
+SPDX-License-Identifier: MIT
+--}}
+
+<div class="ds4-actor-progression">
+    <div class="ds4-actor-progression__entry">
+        <h2 class="ds4-actor-progression__label"><label for="data.combatValues.hitPoints.value-{{data._id}}"
+                title="{{localize 'DS4.CombatValuesHitPointsCurrent'}}">{{localize
+                "DS4.CombatValuesHitPointsCurrentAbbr"}}</label>
+        </h2>
+        <input class="ds4-actor-progression__input" type="number" name="data.combatValues.hitPoints.value"
+            id="data.combatValues.hitPoints.value-{{data._id}}" value="{{data.data.combatValues.hitPoints.value}}"
+            data-dtype="Number" />
+    </div>
+    {{#if (eq data.type "character")}}
+    {{#if settings.showSlayerPoints}}
+    <div class="ds4-actor-progression__entry">
+        <h2 class="ds4-actor-progression__label"><label for="data.slayersPoints.value-{{data._id}}"
+                title="{{localize 'DS4.CharacterSlayerPoints'}}">{{localize "DS4.CharacterSlayerPointsAbbr"}}</label>
+        </h2>
+        <input class="ds4-actor-progression__input ds4-actor-progression__input--slayer-points" type="number"
+            max="{{data.data.slayerPoints.max}}" min="0" step="1" name="data.slayerPoints.value"
+            id="data.slayersPoints.value-{{data._id}}" value="{{data.data.slayerPoints.value}}" data-dtype="Number" />
+    </div>
+    {{/if}}
+    <div class="ds4-actor-progression__entry">
+        <h2 class="ds4-actor-progression__label"><label for="data.progression.level-{{data._id}}"
+                title="{{localize 'DS4.CharacterProgressionLevel'}}">{{localize
+                "DS4.CharacterProgressionLevelAbbr"}}</label>
+        </h2>
+        <input class="ds4-actor-progression__input" type="number" min="0" name="data.progression.level"
+            id="data.progression.level-{{data._id}}" value="{{data.data.progression.level}}" data-dtype="Number" />
+    </div>
+    <div class="ds4-actor-progression__entry">
+        <h2 class="ds4-actor-progression__label"><label for="data.progression.experiencePoints-{{data._id}}"
+                title="{{localize 'DS4.CharacterProgressionExperiencePoints'}}">{{localize
+                "DS4.CharacterProgressionExperiencePointsAbbr"}}</label>
+        </h2>
+        <input class="ds4-actor-progression__input" type="number" min="0" name="data.progression.experiencePoints"
+            id="data.progression.experiencePoints-{{data._id}}" value="{{data.data.progression.experiencePoints}}"
+            data-dtype="Number" />
+    </div>
+    {{/if}}
+</div>
diff --git a/src/templates/sheets/actor/components/character-progression.hbs b/src/templates/sheets/actor/components/character-progression.hbs
deleted file mode 100644
index 9788ea5c..00000000
--- a/src/templates/sheets/actor/components/character-progression.hbs
+++ /dev/null
@@ -1,48 +0,0 @@
-{{!--
-SPDX-FileCopyrightText: 2021 Johannes Loher
-SPDX-FileCopyrightText: 2021 Oliver Rümpelein
-SPDX-FileCopyrightText: 2021 Gesina Schwalbe
-
-SPDX-License-Identifier: MIT
---}}
-
-<div class="progression flexrow">
-    <div class="progression-entry">
-        <h2 class="progression-label"><label for="data.combatValues.hitPoints.value"
-                title="{{localize 'DS4.CombatValuesHitPointsCurrent'}}">{{localize
-                "DS4.CombatValuesHitPointsCurrentAbbr"}}</label>
-        </h2>
-        <input class="progression-value" type="number" name="data.combatValues.hitPoints.value"
-            id="data.combatValues.hitPoints.value" value="{{data.data.combatValues.hitPoints.value}}"
-            data-dtype="Number" />
-    </div>
-    {{#if (eq actor.type "character")}}
-    {{#if settings.showSlayerPoints}}
-    <div class="progression-entry">
-        <h2 class="progression-label"><label for="data.slayersPoints.value"
-                title="{{localize 'DS4.CharacterSlayerPoints'}}">{{localize "DS4.CharacterSlayerPointsAbbr"}}</label>
-        </h2>
-        <input class="progression-value progression-value--slayer-points" type="number"
-            max="{{data.data.slayerPoints.max}}" min="0" step="1" name="data.slayerPoints.value"
-            id="data.slayersPoints.value" value="{{data.data.slayerPoints.value}}" data-dtype="Number" />
-    </div>
-    {{/if}}
-    <div class="progression-entry">
-        <h2 class="progression-label"><label for="data.progression.level"
-                title="{{localize 'DS4.CharacterProgressionLevel'}}">{{localize
-                "DS4.CharacterProgressionLevelAbbr"}}</label>
-        </h2>
-        <input class="progression-value" type="number" min="0" name="data.progression.level" id="data.progression.level"
-            value="{{data.data.progression.level}}" data-dtype="Number" />
-    </div>
-    <div class="progression-entry">
-        <h2 class="progression-label"><label for="data.progression.experiencePoints"
-                title="{{localize 'DS4.CharacterProgressionExperiencePoints'}}">{{localize
-                "DS4.CharacterProgressionExperiencePointsAbbr"}}</label>
-        </h2>
-        <input class="progression-value" type="number" min="0" name="data.progression.experiencePoints"
-            id="data.progression.experiencePoints" value="{{data.data.progression.experiencePoints}}"
-            data-dtype="Number" />
-    </div>
-    {{/if}}
-</div>
diff --git a/src/templates/sheets/actor/components/character-properties.hbs b/src/templates/sheets/actor/components/character-properties.hbs
new file mode 100644
index 00000000..d522e25f
--- /dev/null
+++ b/src/templates/sheets/actor/components/character-properties.hbs
@@ -0,0 +1,63 @@
+{{!--
+SPDX-FileCopyrightText: 2021 Johannes Loher
+SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+SPDX-FileCopyrightText: 2021 Gesina Schwalbe
+
+SPDX-License-Identifier: MIT
+--}}
+
+<div class="ds4-actor-properties">
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.race-{{data._id}}">{{config.i18n.characterBaseInfo.race}}</label>
+        <input type="text" name="data.baseInfo.race" id="data.baseInfo.race-{{data._id}}"
+            value="{{data.data.baseInfo.race}}" data-dtype="String" />
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.culture-{{data._id}}">{{config.i18n.characterBaseInfo.culture}}</label>
+        <input id="data.baseInfo.culture-{{data._id}}" type="text" name="data.baseInfo.culture"
+            value="{{data.data.baseInfo.culture}}" data-dtype="String" />
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.progression.progressPoints.used-{{data._id}}">{{config.i18n.characterProgression.progressPoints}}</label>
+        <div class="ds4-actor-properties__property-multi-input">
+            <input id="data.progression.progressPoints.used-{{data._id}}" type="number"
+                name="data.progression.progressPoints.used" value="{{data.data.progression.progressPoints.used}}"
+                data-dtype="Number" />
+            <span class="input-divider"> / </span>
+            <label class="hidden" for="data.progression.progressPoints.total-{{data._id}}">Total
+                Progression Points</label>
+            <input type="number" id="data.progression.progressPoints.total-{{data._id}}"
+                name="data.progression.progressPoints.total" value="{{data.data.progression.progressPoints.total}}"
+                data-dtype="Number" />
+        </div>
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.progression.talentPoints.used-{{data._id}}">{{config.i18n.characterProgression.talentPoints}}</label>
+        <div class="ds4-actor-properties__property-multi-input">
+            <input type="number" name="data.progression.talentPoints.used"
+                id="data.progression.talentPoints.used-{{data._id}}" value="{{data.data.progression.talentPoints.used}}"
+                data-dtype="Number" />
+            <span class="input-divider"> / </span>
+            <label for="data.progression.talentPoints.total-{{data._id}}" class="hidden">Total Talent Points</label>
+            <input type="number" name="data.progression.talentPoints.total"
+                id="data.progression.talentPoints.total-{{data._id}}"
+                value="{{data.data.progression.talentPoints.total}}" data-dtype="Number" />
+        </div>
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.class-{{data._id}}">{{config.i18n.characterBaseInfo.class}}</label>
+        <input type="text" id="data.baseInfo.class-{{data._id}}" name="data.baseInfo.class"
+            value="{{data.data.baseInfo.class}}" data-dtype="String" />
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.heroClass-{{data._id}}">{{config.i18n.characterBaseInfo.heroClass}}</label>
+        <input type="text" id="data.baseInfo.heroClass-{{data._id}}" name="data.baseInfo.heroClass"
+            value="{{data.data.baseInfo.heroClass}}" data-dtype="String" />
+    </div>
+</div>
diff --git a/src/templates/sheets/actor/components/combat-value.hbs b/src/templates/sheets/actor/components/combat-value.hbs
index 5d55c0f0..3037f92d 100644
--- a/src/templates/sheets/actor/components/combat-value.hbs
+++ b/src/templates/sheets/actor/components/combat-value.hbs
@@ -9,20 +9,24 @@ SPDX-License-Identifier: MIT
 !--
 !-- @param combat-value-key: The key of the combat value
 !-- @param combat-value-data: The data for the combat value
-!-- @param combat-value-label: The label for the combat value
+!-- @param combat-value-title: The title for the combat value
+!-- @param combat-value-label: The label for the combat value (possibly an abbreviation)
+!-- @param actor-id: The id of the actor the core value belongs to
 --}}
 
 <div class="ds4-combat-value">
     <div class="ds4-combat-value__value ds4-combat-value__value--{{combat-value-key}}"
-        title="{{combat-value-label}}: {{combat-value-data.tooltip}}">
+        title="{{combat-value-title}}: {{combat-value-data.tooltip}}">
         {{combat-value-data.total}}
     </div>
+    <span title="{{combat-value-title}}" class="ds4-combat-value__label">{{combat-value-label}}</span>
     <div class="ds4-combat-value__formula">
         <span class="ds4-combat-value__formula-base"
-            title="{{combat-value-label}} {{localize 'DS4.TooltipBaseValue'}}">{{combat-value-data.base}}</span>
+            title="{{combat-value-title}} {{localize 'DS4.TooltipBaseValue'}}">{{combat-value-data.base}}</span>
         <span>+</span>
-        <input class="ds4-combat-value__formula-modifier" type="number" name="data.combatValues.{{combat-value-key}}.mod"
-            value='{{combat-value-data.mod}}' data-dtype="Number"
-            title="{{combat-value-label}} {{localize 'DS4.TooltipModifier'}}" />
+        <input class="ds4-combat-value__formula-modifier" type="number"
+            id="data.combatValues.{{combat-value-key}}.mod-{{actor-id}}"
+            name="data.combatValues.{{combat-value-key}}.mod" value='{{combat-value-data.mod}}' data-dtype="Number"
+            title="{{combat-value-title}} {{localize 'DS4.TooltipModifier'}}" />
     </div>
 </div>
diff --git a/src/templates/sheets/actor/components/combat-values.hbs b/src/templates/sheets/actor/components/combat-values.hbs
index fe0fabc6..63ebe6e6 100644
--- a/src/templates/sheets/actor/components/combat-values.hbs
+++ b/src/templates/sheets/actor/components/combat-values.hbs
@@ -6,8 +6,10 @@ SPDX-License-Identifier: MIT
 --}}
 
 <div class="ds4-combat-values">
-    {{#each config.i18n.combatValues as |combat-value-label combat-value-key|}}
+    {{#each config.i18n.combatValues as |combat-value-title combat-value-key|}}
     {{> systems/ds4/templates/sheets/actor/components/combat-value.hbs combat-value-key=combat-value-key
-    combat-value-data=(lookup ../data.data.combatValues combat-value-key) combat-value-label=combat-value-label}}
+    combat-value-data=(lookup ../data.data.combatValues combat-value-key) combat-value-label=(lookup
+    ../config.i18n.combatValuesSheet combat-value-key) combat-value-title=combat-value-title
+    actor-id=../data._id}}
     {{/each}}
 </div>
diff --git a/src/templates/sheets/actor/components/core-value.hbs b/src/templates/sheets/actor/components/core-value.hbs
index d9e07976..0d24a838 100644
--- a/src/templates/sheets/actor/components/core-value.hbs
+++ b/src/templates/sheets/actor/components/core-value.hbs
@@ -11,21 +11,22 @@ SPDX-License-Identifier: MIT
 !-- @param core-value-key: The key of the core value
 !-- @param core-value-data: The data for the core value
 !-- @param core-value-variant: The variant of the core value, i.e. attribute or trait
+!-- @param actor-id: The id of the actor the core value belongs to
 --}}
 
 <div class="ds4-core-value ds4-core-value--{{core-value-variant}}">
-    <label for="data.{{core-value-variant}}s.{{core-value-key}}.base"
+    <label for="data.{{core-value-variant}}s.{{core-value-key}}.base-{{actor-id}}"
         class="ds4-core-value__label">{{core-value-label}}</label>
     <div class="ds4-core-value__value">
         <input class="ds4-core-value__value-input" type="number"
             name="data.{{core-value-variant}}s.{{core-value-key}}.base"
-            id="data.{{core-value-variant}}s.{{core-value-key}}.base" value='{{core-value-data.base}}'
+            id="data.{{core-value-variant}}s.{{core-value-key}}.base-{{actor-id}}" value='{{core-value-data.base}}'
             data-dtype="Number" title="{{core-value-label}} {{localize 'DS4.TooltipBaseValue'}}" />
         <span>+</span>
         <input class="ds4-core-value__value-input" type="number"
             name="data.{{core-value-variant}}s.{{core-value-key}}.mod"
-            id="data.{{core-value-variant}}s.{{core-value-key}}.mod" value='{{core-value-data.mod}}' data-dtype="Number"
-            title="{{core-value-label}} {{localize 'DS4.TooltipModifier'}}" />
+            id="data.{{core-value-variant}}s.{{core-value-key}}.mod-{{actor-id}}" value='{{core-value-data.mod}}'
+            data-dtype="Number" title="{{core-value-label}} {{localize 'DS4.TooltipModifier'}}" />
         <span class="ds4-core-value__value-arrow">➞</span>
         <span class="ds4-core-value__value-total"
             title="{{core-value-label}}: {{core-value-data.tooltip}}">{{core-value-data.total}}</span>
diff --git a/src/templates/sheets/actor/components/core-values.hbs b/src/templates/sheets/actor/components/core-values.hbs
index e476ce04..68aab3d2 100644
--- a/src/templates/sheets/actor/components/core-values.hbs
+++ b/src/templates/sheets/actor/components/core-values.hbs
@@ -9,11 +9,11 @@ SPDX-License-Identifier: MIT
     {{#each config.i18n.attributes as |attribute-label attribute-key|}}
     {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=attribute-label
     core-value-key=attribute-key core-value-data=(lookup ../data.data.attributes
-    attribute-key) core-value-variant="attribute"}}
+    attribute-key) core-value-variant="attribute" actor-id=../data._id}}
     {{/each}}
     {{#each config.i18n.traits as |trait-label trait-key|}}
     {{> systems/ds4/templates/sheets/actor/components/core-value.hbs core-value-label=trait-label
     core-value-key=trait-key
-    core-value-data=(lookup ../data.data.traits trait-key) core-value-variant="trait"}}
+    core-value-data=(lookup ../data.data.traits trait-key) core-value-variant="trait" actor-id=../data._id}}
     {{/each}}
 </div>
diff --git a/src/templates/sheets/actor/components/creature-properties.hbs b/src/templates/sheets/actor/components/creature-properties.hbs
new file mode 100644
index 00000000..416a1adc
--- /dev/null
+++ b/src/templates/sheets/actor/components/creature-properties.hbs
@@ -0,0 +1,52 @@
+{{!--
+SPDX-FileCopyrightText: 2021 Johannes Loher
+SPDX-FileCopyrightText: 2021 Oliver Rümpelein
+SPDX-FileCopyrightText: 2021 Gesina Schwalbe
+
+SPDX-License-Identifier: MIT
+--}}
+
+<div class="ds4-actor-properties">
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.creatureType-{{data._id}}">{{config.i18n.creatureBaseInfo.creatureType}}</label>
+        <select class="ds4-actor-properties__property-select" id="data.baseInfo.creatureType-{{data._id}}"
+            name="data.baseInfo.creatureType" data-type="String">
+            {{#select data.data.baseInfo.creatureType}}
+            {{#each config.i18n.creatureTypes as |value key|}}
+            <option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.loot-{{data._id}}">{{config.i18n.creatureBaseInfo.loot}}</label>
+        <input type="text" id="data.baseInfo.loot-{{data._id}}" name="data.baseInfo.loot"
+            value="{{data.data.baseInfo.loot}}" data-dtype="String" />
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.foeFactor-{{data._id}}">{{config.i18n.creatureBaseInfo.foeFactor}}</label>
+        <input type="text" id="data.baseInfo.foeFactor-{{data._id}}" name="data.baseInfo.foeFactor"
+            value="{{data.data.baseInfo.foeFactor}}" data-dtype="Number" />
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.sizeCategory-{{data._id}}">{{config.i18n.creatureBaseInfo.sizeCategory}}</label>
+        <select class="ds4-actor-properties__property-select" id="data.baseInfo.sizeCategory-{{data._id}}"
+            name="data.baseInfo.sizeCategory" data-type="String">
+            {{#select data.data.baseInfo.sizeCategory}}
+            {{#each config.i18n.creatureSizeCategories as |value key|}}
+            <option value="{{key}}">{{value}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+    </div>
+    <div class="ds4-actor-properties__property">
+        <label class="ds4-actor-properties__property-label"
+            for="data.baseInfo.experiencePoints-{{data._id}}">{{config.i18n.creatureBaseInfo.experiencePoints}}</label>
+        <input type="text" id="data.baseInfo.experiencePoints-{{data._id}}" name="data.baseInfo.experiencePoints"
+            value="{{data.data.baseInfo.experiencePoints}}" data-dtype="Number" />
+    </div>
+</div>
diff --git a/src/templates/sheets/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs
index 1b034bc2..12e78d61 100644
--- a/src/templates/sheets/actor/creature-sheet.hbs
+++ b/src/templates/sheets/actor/creature-sheet.hbs
@@ -6,67 +6,21 @@ SPDX-FileCopyrightText: 2021 Gesina Schwalbe
 SPDX-License-Identifier: MIT
 --}}
 
-<form class="{{cssClass}} flexcol" autocomplete="off">
-    {{!-- Sheet Header --}}
-    <header class="sheet-header">
-        <img class="profile-img" src="{{data.img}}" data-edit="img" title="{{data.name}}" height="100" width="100" />
-        <div class="header-fields flexrow">
-            <h1 class="charname">
-                <label for="name" class="hidden">Name</label>
-                <input name="name" type="text" id="name" value="{{data.name}}" placeholder="Name" />
-            </h1>
-            {{> systems/ds4/templates/sheets/actor/components/character-progression.hbs}}
+<form class="{{cssClass}} ds4-sheet" autocomplete="off">
+    {{!-- Header --}}
+    {{#> systems/ds4/templates/sheets/actor/components/actor-header.hbs}}
+    {{> systems/ds4/templates/sheets/actor/components/creature-properties.hbs}}
+    {{/systems/ds4/templates/sheets/actor/components/actor-header.hbs}}
 
-            <div class="flexrow basic-properties">
-                <div class="basic-property">
-                    <label>{{config.i18n.creatureBaseInfo.creatureType}}</label>
-                    <select name="data.baseInfo.creatureType" data-type="String">
-                        {{#select data.data.baseInfo.creatureType}}
-                        {{#each config.i18n.creatureTypes as |value key|}}
-                        <option value="{{key}}">{{value}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.loot">{{config.i18n.creatureBaseInfo.loot}}</label>
-                    <input type="text" name="data.baseInfo.loot" value="{{data.data.baseInfo.loot}}"
-                        data-dtype="String" />
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.foeFactor">{{config.i18n.creatureBaseInfo.foeFactor}}</label>
-                    <input type="text" name="data.baseInfo.foeFactor" value="{{data.data.baseInfo.foeFactor}}"
-                        data-dtype="Number" />
-                </div>
-                <div class="basic-property">
-                    <label>{{config.i18n.creatureBaseInfo.sizeCategory}}</label>
-                    <select name="data.baseInfo.sizeCategory" data-type="String">
-                        {{#select data.data.baseInfo.sizeCategory}}
-                        {{#each config.i18n.creatureSizeCategories as |value key|}}
-                        <option value="{{key}}">{{value}}</option>
-                        {{/each}}
-                        {{/select}}
-                    </select>
-                </div>
-                <div class="basic-property">
-                    <label class="basic-property-label"
-                        for="data.baseInfo.experiencePoints">{{config.i18n.creatureBaseInfo.experiencePoints}}</label>
-                    <input type="text" name="data.baseInfo.experiencePoints"
-                        value="{{data.data.baseInfo.experiencePoints}}" data-dtype="Number" />
-                </div>
-            </div>
-        </div>
-    </header>
 
     {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="values">{{localize 'DS4.HeadingValues'}}</a>
-        <a class="item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
-        <a class="item" data-tab="special-creature-abilities">{{localize 'DS4.HeadingSpecialCreatureAbilities'}}</a>
-        <a class="item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
-        <a class="item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
+    <nav class="ds4-sheet-tab-nav sheet-tabs tabs" data-group="primary">
+        <a class="ds4-sheet-tab-nav__item item" data-tab="values">{{localize 'DS4.HeadingValues'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="special-creature-abilities">{{localize
+            'DS4.HeadingSpecialCreatureAbilities'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
     </nav>
 
     {{!-- Sheet Body --}}
diff --git a/src/templates/sheets/actor/tabs/description.hbs b/src/templates/sheets/actor/tabs/description.hbs
index a46a2ee6..375748be 100644
--- a/src/templates/sheets/actor/tabs/description.hbs
+++ b/src/templates/sheets/actor/tabs/description.hbs
@@ -5,6 +5,6 @@ SPDX-License-Identifier: MIT
 --}}
 
 <div class="tab description" data-group="primary" data-tab="description">
-    {{editor content=data.baseInfo.description target="data.baseInfo.description" button=true owner=owner
+    {{editor content=data.data.baseInfo.description target="data.baseInfo.description" button=true owner=owner
     editable=editable}}
 </div>
diff --git a/src/templates/sheets/item/components/body.hbs b/src/templates/sheets/item/components/body.hbs
index 8779e25a..1fced58f 100644
--- a/src/templates/sheets/item/components/body.hbs
+++ b/src/templates/sheets/item/components/body.hbs
@@ -8,11 +8,11 @@ SPDX-License-Identifier: MIT
 {{!-- Template for the common body (navigation & body sections) of all items. --}}
 
 {{!-- Sheet Tab Navigation --}}
-<nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="description">{{localize "DS4.HeadingDescription"}}</a>
-    <a class="item" data-tab="effects">{{localize "DS4.HeadingEffects"}}</a>
+<nav class="ds4-sheet-tab-nav sheet-tabs tabs" data-group="primary">
+    <a class="ds4-sheet-tab-nav__item item" data-tab="description">{{localize "DS4.HeadingDescription"}}</a>
+    <a class="ds4-sheet-tab-nav__item item" data-tab="effects">{{localize "DS4.HeadingEffects"}}</a>
     {{#if isPhysical}}
-    <a class="item" data-tab="details">{{localize "DS4.HeadingDetails"}}</a>
+    <a class="ds4-sheet-tab-nav__item item" data-tab="details">{{localize "DS4.HeadingDetails"}}</a>
     {{/if}}
 </nav>