diff --git a/lang/en.json b/lang/en.json
index de1edb8e..47b8e11b 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -52,6 +52,7 @@
     "WITCHER.Armor.Reliable": "Rel.",
     "WITCHER.Armor.EncumbranceValue": "Encumbrance",
     "WITCHER.Armor.Resistances": "Resistances",
+    "WITCHER.Armor.Res": "Res",
     "WITCHER.Armor.Bludgeoning": "Bludgeoning",
     "WITCHER.Armor.Slashing": "Slashing",
     "WITCHER.Armor.Percing": "Percing",
diff --git a/scripts/TheWitcherTRPG.js b/scripts/TheWitcherTRPG.js
index d06f8ccc..0a6c5791 100644
--- a/scripts/TheWitcherTRPG.js
+++ b/scripts/TheWitcherTRPG.js
@@ -24,7 +24,8 @@ async function preloadHandlebarsTemplates(){
         "systems/TheWitcherTRPG/templates/partials/monster-inventory-tab.html",
         "systems/TheWitcherTRPG/templates/partials/monster-details-tab.html",
         "systems/TheWitcherTRPG/templates/partials/monster-spell-tab.html",
-        "systems/TheWitcherTRPG/templates/partials/skill-display.html"
+        "systems/TheWitcherTRPG/templates/partials/skill-display.html",
+        "systems/TheWitcherTRPG/templates/partials/item-header.html"
     ];
     return loadTemplates(templatePath); 
 }
diff --git a/styles/item-sheets.css b/styles/item-sheets.css
index 0475c8a2..f7adf1a3 100644
--- a/styles/item-sheets.css
+++ b/styles/item-sheets.css
@@ -1,22 +1,90 @@
-.item-collum {
+.item-header {
+    display: flex;
+}
+
+.item-header img{
+    height: 100px;
+    max-width: 200px;
+}
+
+.itemname {
+    margin-left: 5px;
+}
+
+.item-header-row {
+    display: table;
+    margin: 0 auto;
+}
+
+.item-header-first-collum {
+    width: 400px;
+}
+
+.item-header-second-collum {
     display: table-cell;
     text-align: center;
     width: 100px;
 }
 
+.item-header-second-collum input {
+    width: 75px;
+    height: 27px;
+}
+
+.item-header-second-collum label {
+    display: block;
+}
+
+.item-header-spell {
+    width: 33.33%;
+}
+
+.item-options {
+    display: flex;
+    width: 501px;
+    height: 54px;
+}
+
+.item-option-tickbox {
+    height: 27px;
+}
+
+.item-option-tickbox label {
+    float: left;
+    margin-top: 5px;
+}
+
+.item-option-tickbox input {
+    float: right;
+}
+
+.item-collum {
+    text-align: center;
+    width: 33.33%;
+}
+
+.item-collum label{
+    display: block;
+}
+
 .item-row {
-    display: table;
+    display: flex;
     text-align: center;
 }
 
-.item-collum input {
-    width: 75px;
-    height: 27px;
-    margin-right: 5px;
-    margin-left: 5px;
+.item-second-collum{
+    text-align: center;
+    width: 50%;
+}
+
+.item-second-collum label{
+    display: block;
+    width: 100%;
 }
 
-.item-selector select{
+.----item-collum input {
+    width: 75px;
+    height: 27px;
     margin-right: 5px;
     margin-left: 5px;
 }
\ No newline at end of file
diff --git a/templates/partials/item-header.html b/templates/partials/item-header.html
new file mode 100644
index 00000000..b0b7dfd3
--- /dev/null
+++ b/templates/partials/item-header.html
@@ -0,0 +1,76 @@
+<header class="item-header">
+    <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+    <div class="item-header-first-collum">
+        <h1 class="itemname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
+        <div class="item-header-row">
+            {{#unless data.isSpell}}
+                <div class="item-header-second-collum">
+                    <label>{{localize "WITCHER.Item.Quantity"}}</label>
+                    <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
+                </div>
+                <div class="item-header-second-collum">
+                    <label>{{localize "WITCHER.Item.Weight"}}</label>
+                    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
+                </div>
+                <div class="item-header-second-collum">
+                    {{#if data.isMutagen}}
+                            <label>{{localize "WITCHER.Type"}}</label>
+                            <select name="data.type" id="type-select">
+                            {{#select data.type}}
+                            <option value="red">{{localize "WITCHER.Mutagen.Red"}}</option>
+                            <option value="green">{{localize "WITCHER.Mutagen.Green"}}</option>
+                            <option value="blue">{{localize "WITCHER.Mutagen.Blue"}}</option>
+                            {{/select}}
+                            </select>
+                    {{/if}}
+                    {{#unless data.isMutagen}}
+                            <label>{{localize "WITCHER.Item.Cost"}}</label>
+                            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+                    {{/unless}}
+                </div>
+            {{/unless}}
+            {{#if data.isSpell}}
+                <div class="item-header-second-collum item-header-spell">
+                    <label>{{localize "WITCHER.Spell.type"}}</label>
+                    <select name="data.class" id="profession-select">
+                    {{#select data.class}}
+                        <option value="Spells">{{localize "WITCHER.Spell.Spells"}}</option>
+                        <option value="Invocations">{{localize "WITCHER.Spell.Invocations"}}</option>
+                        <option value="Witcher">{{localize "WITCHER.Spell.Witcher"}}</option>
+                        <option value="Rituals">{{localize "WITCHER.Spell.Rituals"}}</option>
+                        <option value="Hexes">{{localize "WITCHER.Spell.Hexes"}}</option>
+                    {{/select}}
+                    </select>
+                </div>
+                <div class="item-header-second-collum item-header-spell">
+                    {{#if (eq data.class "Hexes")}}
+                    <label>{{localize "WITCHER.Spell.Danger"}}</label>
+                    <select name="data.danger" id="level-select">
+                        {{#select data.danger}}
+                        <option value="Low">{{localize "WITCHER.Spell.DangerLow"}}</option>
+                        <option value="Medium">{{localize "WITCHER.Spell.DangerMedium"}}</option>
+                        <option value="High">{{localize "WITCHER.Spell.DangerHigh"}}</option>
+                        {{/select}}
+                    </select>
+                    {{/if}}
+                    {{#unless (eq data.class "Hexes")}}
+                    <label>{{localize "WITCHER.Actor.Profession.Level"}}</label>
+                    <select name="data.level" id="level-select">
+                        {{#select data.level}}
+                        <option value="novice">{{localize "WITCHER.Spell.Novice"}}</option>
+                        <option value="journeyman">{{localize "WITCHER.Spell.Journeyman"}}</option>
+                        <option value="master">{{localize "WITCHER.Spell.Master"}}</option>
+                        {{/select}}
+                    </select>
+                    {{/unless}}
+                </div>
+                <div class="item-header-second-collum item-header-spell">
+                    {{#unless (eq data.staminaIsVar true)}}
+                        <label>{{localize "WITCHER.Spell.StaCost"}}</label>
+                        <input class="sta-input" name="data.stamina" type="text" value="{{data.stamina}}"/>
+                     {{/unless}}
+                </div>
+            {{/if}}
+        </div>
+    </div>
+</header>
diff --git a/templates/sheets/alchemical-sheet.html b/templates/sheets/alchemical-sheet.html
index 12b6bcf4..3d226721 100644
--- a/templates/sheets/alchemical-sheet.html
+++ b/templates/sheets/alchemical-sheet.html
@@ -1,23 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Cost"}}</label>
-            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-        </div>
-    </div>
-    </header>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
 
     {{!-- Attributes Tab --}}
     <table>
diff --git a/templates/sheets/armor-sheet.html b/templates/sheets/armor-sheet.html
index de44ca7f..b3b8e8d5 100644
--- a/templates/sheets/armor-sheet.html
+++ b/templates/sheets/armor-sheet.html
@@ -1,28 +1,23 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-        <div class="item-row">
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Quantity"}}</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
+        <div class="item-collum">
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Armor.Bludgeoning" }} {{localize "WITCHER.Armor.Res"}}</label>
+                <input type="checkbox" name="data.bludgeoning" {{checked data.bludgeoning}}/>
             </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Weight"}}</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-            </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Cost"}}</label>
-                <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+        </div>
+        <div class="item-collum">
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Armor.Slashing"}} {{localize "WITCHER.Armor.Res"}}</label>
+                <input type="checkbox" name="data.slashing" {{checked data.slashing}} />
             </div>
         </div>
-    <div>
-        <div>
-            <label>{{localize "WITCHER.Armor.Resistances"}}:</label>
-            <label>{{localize "WITCHER.Armor.Bludgeoning"}}</label><input type="checkbox" name="data.bludgeoning" {{checked data.bludgeoning}}/>
-            <label>{{localize "WITCHER.Armor.Slashing"}}</label><input type="checkbox" name="data.slashing" {{checked data.slashing}} />
-            <label>{{localize "WITCHER.Armor.Percing"}}</label><input type="checkbox" name="data.percing" {{checked data.percing}} />
+        <div class="item-collum">
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Armor.Percing"}} {{localize "WITCHER.Armor.Res"}}</label>
+                <input type="checkbox" name="data.percing" {{checked data.percing}} />
+            </div>
         </div>
     </div>
         {{!-- Attributes Tab --}}
diff --git a/templates/sheets/component-sheet.html b/templates/sheets/component-sheet.html
index 7b3a6bdd..fb6cc339 100644
--- a/templates/sheets/component-sheet.html
+++ b/templates/sheets/component-sheet.html
@@ -1,22 +1,7 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Cost"}}</label>
-            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-        </div>
-        <div class="item-collum item-selector">
             <label>{{localize "WITCHER.Type"}}</label>
             <select name="data.type" id="type-select">
                 {{#select data.type}}
@@ -28,7 +13,7 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                 {{/select}}
             </select>
         </div>
-        <div class="item-collum item-selector">
+        <div class="item-collum">
             {{#if (eq data.type "substances")}}
                 <label>{{localize "WITCHER.Inventory.Substance"}}:</label>
                 <select name="data.substanceType" id="substanceType-select">
diff --git a/templates/sheets/diagrams-sheet.html b/templates/sheets/diagrams-sheet.html
index c36e4dad..1af7cd63 100644
--- a/templates/sheets/diagrams-sheet.html
+++ b/templates/sheets/diagrams-sheet.html
@@ -1,22 +1,13 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Diagram.Formulae"}} </label>
+                <input type="checkbox" name="data.isFormulae" {{checked data.isFormulae}}/>
+            </div>
         </div>
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Cost"}}</label>
-            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-        </div>
-        <div class="item-collum item-selector">
             <label>{{localize "WITCHER.Type"}}</label>
             <select name="data.type" id="type-select">
                 {{#select data.type}}
@@ -39,10 +30,6 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
                 {{/select}}
             </select>
         </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Diagram.Formulae"}} </label>
-            <input type="checkbox" name="data.isFormulae" {{checked data.isFormulae}}/>
-        </div>
     </div>
     <table>
         <tr> 
diff --git a/templates/sheets/enhancement-sheet.html b/templates/sheets/enhancement-sheet.html
index b78562c6..e0a4dec5 100644
--- a/templates/sheets/enhancement-sheet.html
+++ b/templates/sheets/enhancement-sheet.html
@@ -1,21 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Cost"}}</label>
-            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-        </div>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
         <div class="item-collum">
             <label>{{localize "WITCHER.Type"}}:</label>
             <select name="data.type" id="type-select">
diff --git a/templates/sheets/mount-sheet.html b/templates/sheets/mount-sheet.html
index bd03fdef..049e8544 100644
--- a/templates/sheets/mount-sheet.html
+++ b/templates/sheets/mount-sheet.html
@@ -1,22 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-        <div class="item-row">
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Quantity"}}</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-            </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Weight"}}</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-            </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Cost"}}</label>
-                <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-            </div>
-        </div>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     {{!-- Sheet Tab Navigation --}}
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="description">{{localize "WITCHER.Item.Description"}}</a>
diff --git a/templates/sheets/mutagen-sheet.html b/templates/sheets/mutagen-sheet.html
index 399bdef3..7622592a 100644
--- a/templates/sheets/mutagen-sheet.html
+++ b/templates/sheets/mutagen-sheet.html
@@ -1,28 +1,6 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-        </div>
-        <div class="item-collum item-selector">
-            <label>{{localize "WITCHER.Type"}}</label>
-            <select name="data.type" id="type-select">
-                {{#select data.type}}
-                <option value="red">{{localize "WITCHER.Mutagen.Red"}}</option>
-                <option value="green">{{localize "WITCHER.Mutagen.Green"}}</option>
-                <option value="blue">{{localize "WITCHER.Mutagen.Blue"}}</option>
-                {{/select}}
-            </select>
-        </div>
-    </div>
+    <input type="hidden" name="data.isMutagen" value="data.isMutagen"/>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
     <table>
         <tr>
             <th>{{localize "WITCHER.Mutagen.MutSource"}}</th>
diff --git a/templates/sheets/spell-sheet.html b/templates/sheets/spell-sheet.html
index 4af87606..e593713d 100644
--- a/templates/sheets/spell-sheet.html
+++ b/templates/sheets/spell-sheet.html
@@ -1,56 +1,14 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="spellname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
-        <div class="item-collum item-selector">
-            <label>{{localize "WITCHER.Spell.type"}}</label>
-            <select name="data.class" id="profession-select">
-                {{#select data.class}}
-                <option value="Spells">{{localize "WITCHER.Spell.Spells"}}</option>
-                <option value="Invocations">{{localize "WITCHER.Spell.Invocations"}}</option>
-                <option value="Witcher">{{localize "WITCHER.Spell.Witcher"}}</option>
-                <option value="Rituals">{{localize "WITCHER.Spell.Rituals"}}</option>
-                <option value="Hexes">{{localize "WITCHER.Spell.Hexes"}}</option>
-                {{/select}}
-            </select>
-        </div>
-        <div class="item-collum item-selector">
-            {{#if (eq data.class "Hexes")}}
-            <label>{{localize "WITCHER.Spell.Danger"}}</label>
-            <select name="data.danger" id="level-select">
-                {{#select data.danger}}
-                <option value="Low">{{localize "WITCHER.Spell.DangerLow"}}</option>
-                <option value="Medium">{{localize "WITCHER.Spell.DangerMedium"}}</option>
-                <option value="High">{{localize "WITCHER.Spell.DangerHigh"}}</option>
-                {{/select}}
-            </select>
-            {{/if}}
-            {{#unless (eq data.class "Hexes")}}
-            <label>{{localize "WITCHER.Actor.Profession.Level"}}</label>
-            <select name="data.level" id="level-select">
-                {{#select data.level}}
-                <option value="novice">{{localize "WITCHER.Spell.Novice"}}</option>
-                <option value="journeyman">{{localize "WITCHER.Spell.Journeyman"}}</option>
-                <option value="master">{{localize "WITCHER.Spell.Master"}}</option>
-                {{/select}}
-            </select>
-            {{/unless}}
-        </div>
+    <input type="hidden" name="data.isSpell" value="data.isSpell"/>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
         <div class="item-collum">
+            <div class="item-option-tickbox">
                 <label>{{localize "WITCHER.Spell.Variable"}}</label>
                 <input type="checkbox" name="data.staminaIsVar"  {{checked data.staminaIsVar}}/>
+            </div>
         </div>
         <div class="item-collum">
-            {{#unless (eq data.staminaIsVar true)}}
-                <label>{{localize "WITCHER.Spell.StaCost"}}</label>
-                <input class="sta-input" name="data.stamina" type="text" value="{{data.stamina}}"/>
-            {{/unless}}
-        </div>
-    </div>
-    <div class="item-row">
-        <div class="item-collum item-selector">
             {{#if (or (eq data.class "Spells") 
                       (eq data.class "Witcher"))}}
                 <label>{{localize "WITCHER.Spell.Element"}}</label>
@@ -75,7 +33,7 @@ <h1 class="spellname"><input name="name" type="text" value="{{item.name}}" place
                 </select>
             {{/if}}
         </div>
-        <div class="item-collum item-selector">
+        <div class="item-collum">
             {{#if (eq data.class "Witcher")}}
                 <label>{{localize "WITCHER.Spell.Type"}}</label>
                 <select name="data.domain">
@@ -89,7 +47,7 @@ <h1 class="spellname"><input name="name" type="text" value="{{item.name}}" place
     </div>
 
     <label>{{localize "WITCHER.Item.Effect"}}</label>
-    <textarea rows="10" name="data.effect">{{data.effect}}</textarea>
+<textarea rows="10" name="data.effect">{{data.effect}}</textarea>
         {{#unless (eq data.class "Hexes")}}
         <div class="flex">
             <label>{{localize "WITCHER.Spell.Duration"}}</label>
diff --git a/templates/sheets/valuable-sheet.html b/templates/sheets/valuable-sheet.html
index 0869b2bf..5ff8d5d8 100644
--- a/templates/sheets/valuable-sheet.html
+++ b/templates/sheets/valuable-sheet.html
@@ -1,57 +1,46 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-        <div class="item-row">
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Quantity"}}</label>
-                <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-            </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Weight"}}</label>
-                <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-            </div>
-            <div class="item-collum">
-                <label>{{localize "WITCHER.Item.Cost"}}</label>
-                <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-            </div>
-            <div class="item-collum item-selector">
-                <label>{{localize "WITCHER.Type"}}</label>
-                <select name="data.type" id="type-select">
-                    {{#select data.type}}
-                    <option value="toolkit">{{localize "WITCHER.Valueble.Toolkit"}}</option>
-                    <option value="genera">{{localize "WITCHER.Valueble.General"}}</option>
-                    <option value="containers">{{localize "WITCHER.Valueble.Containers"}}</option>
-                    <option value="food-drink">{{localize "WITCHER.Valueble.Food&Drinks"}}</option>
-                    <option value="clothing">{{localize "WITCHER.Valueble.Clothings"}}</option>
-                    <option value="service">{{localize "WITCHER.Valueble.Service"}}</option>
-                    <option value="lodging">{{localize "WITCHER.Valueble.Loging"}}</option>
-                    <option value="mount-accessories">{{localize "WITCHER.Valueble.MountAccessories"}}</option>
-                    {{/select}}
-                </select>
-            </div>
-            <div class="item-collum item-selector">
-                <th>{{localize "WITCHER.Item.Availability"}}</th>
-                <select name="data.avail" id="avail-select">
-                    {{#select data.avail}}
-                    {{#each config.Avalability as |name value|}}
-                            <option value="{{value}}">{{localize name}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
-            </div>
-            <div class="item-collum item-selector">
-                <th>{{localize "WITCHER.Valuable.Conceal"}}</th>
-                <select name="data.conceal" id="avail-select">
-                    {{#select data.conceal}}
-                    {{#each config.Concealment as |name value|}}
-                            <option value="{{value}}">{{localize name}}</option>
-                    {{/each}}
-                    {{/select}}
-                </select>
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
+        <div class="item-collum item-selector">
+            <label>{{localize "WITCHER.Type"}}</label>
+            <select name="data.type" id="type-select">
+                {{#select data.type}}
+                <option value="toolkit">{{localize "WITCHER.Valueble.Toolkit"}}</option>
+                <option value="genera">{{localize "WITCHER.Valueble.General"}}</option>
+                <option value="containers">{{localize "WITCHER.Valueble.Containers"}}</option>
+                <option value="food-drink">{{localize "WITCHER.Valueble.Food&Drinks"}}</option>
+                <option value="clothing">{{localize "WITCHER.Valueble.Clothings"}}</option>
+                <option value="service">{{localize "WITCHER.Valueble.Service"}}</option>
+                <option value="lodging">{{localize "WITCHER.Valueble.Loging"}}</option>
+                <option value="mount-accessories">{{localize "WITCHER.Valueble.MountAccessories"}}</option>
+                {{/select}}
+            </select>
+        </div>
+        <div class="item-collum">
+            <div class="item-row">
+                <div class="item-second-collum">
+                    <label>{{localize "WITCHER.Item.Availability"}}</label>
+                    <select name="data.avail" id="avail-select">
+                        {{#select data.avail}}
+                        {{#each config.Avalability as |name value|}}
+                                <option value="{{value}}">{{localize name}}</option>
+                        {{/each}}
+                        {{/select}}
+                    </select>
+                </div>
+                <div class="item-second-collum">
+                    <th>{{localize "WITCHER.Valuable.Conceal"}}</th>
+                    <select name="data.conceal" id="avail-select">
+                        {{#select data.conceal}}
+                        {{#each config.Concealment as |name value|}}
+                                <option value="{{value}}">{{localize name}}</option>
+                        {{/each}}
+                        {{/select}}
+                    </select>
+                </div>
             </div>
         </div>
+    </div>
     {{!-- effect Tab --}}
     <div class="description">
 <textarea rows=5 name="data.description">{{data.description}}</textarea>
diff --git a/templates/sheets/weapon-sheet.html b/templates/sheets/weapon-sheet.html
index ea8d56da..f3b0905d 100644
--- a/templates/sheets/weapon-sheet.html
+++ b/templates/sheets/weapon-sheet.html
@@ -1,22 +1,23 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
-        <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeholder="Name" /></h1>
-    </header>
-    <div class="item-row">
+    {{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}}
+    <div class="item-options">
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Quantity"}}</label>
-            <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Weapon.onlyDmg"}}</label>
+                <input type="checkbox" name="data.rollOnlyDmg" {{checked data.rollOnlyDmg}}/>
+            </div>
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Weapon.useAmmo"}}</label>
+                <input type="checkbox" name="data.usingAmmo" {{checked data.usingAmmo}}/>
+            </div>
         </div>
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Weight"}}</label>
-            <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
+            <div class="item-option-tickbox">
+                <label>{{localize "WITCHER.Weapon.isAmmunition"}}</label>
+                <input type="checkbox" name="data.isAmmo" {{checked data.isAmmo}}/>
+            </div>
         </div>
         <div class="item-collum">
-            <label>{{localize "WITCHER.Item.Cost"}}</label>
-            <input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
-        </div>
-        <div class="item-collum item-selector">
             {{#unless data.isAmmo}}
             <label>{{localize "WITCHER.Weapon.AttackSkill"}}:</label>
             <select name="data.attackSkill" id="hands-select">
@@ -34,14 +35,6 @@ <h1 class="charname"><input name="name" type="text" value="{{item.name}}" placeh
             {{/unless}}
         </div>
     </div>
-    <div>
-        <label>{{localize "WITCHER.Weapon.isAmmunition"}}</label>
-        <input type="checkbox" name="data.isAmmo" {{checked data.isAmmo}}/>
-        <label>{{localize "WITCHER.Weapon.onlyDmg"}}</label>
-        <input type="checkbox" name="data.rollOnlyDmg" {{checked data.rollOnlyDmg}}/>
-        <label>{{localize "WITCHER.Weapon.useAmmo"}}</label>
-        <input type="checkbox" name="data.usingAmmo" {{checked data.usingAmmo}}/>
-    </div>
     <table>
         <tr>
             <th>{{localize "WITCHER.Weapon.Type"}}</th>