diff --git a/src/scss/global/_flex.scss b/src/scss/global/_flex.scss
index ca8ae406..271c64b3 100644
--- a/src/scss/global/_flex.scss
+++ b/src/scss/global/_flex.scss
@@ -32,6 +32,10 @@
     }
 }
 
+.flexnowrap {
+    flex-wrap: nowrap;
+}
+
 .flexcol {
     display: flex;
     flex-direction: column;
diff --git a/src/templates/actor/partials/items.hbs b/src/templates/actor/partials/items.hbs
index 28f8be43..792891f4 100644
--- a/src/templates/actor/partials/items.hbs
+++ b/src/templates/actor/partials/items.hbs
@@ -1,130 +1,154 @@
 {{!-- TODO: For items list: only show header, if list is not empty --}}
-{{!-- TODO: Reduce code duplications --}}
-{{!-- TODO: Change from flex layout to grid layout --}}
-{{!-- Tab with overview and quick-actions on owned items --}}
+
+
+{{!-- ======================================================================== --}}
+{{!-- INLINE PARTIAL DEFINITIONS --}}
+{{!-- ======================================================================== --}}
+
+{{!--
+!-- Render an "add" button for a given data type.
+!--
+!-- @param datType: hand over the dataType to the partial as hash parameter
+--}}
+{{#*inline "addButton"}}
+    <div class="item-controls">
+        <a class="item-control item-create" title="Create item" data-type="{{dataType}}" {{!-- SPECIFIC --}}>
+            <i class="fas fa-plus"></i>
+            {{localize 'DS4.UserInteractionAddItem'}}</a>
+    </div>
+{{/inline}}
+{{!--
+!-- Render a group of an "edit" and a "delete" button for the current item.
+!-- The current item is defined by the data-item-id HTML property of the parent li element.
+--}}
+{{#*inline "itemControlButtons"}}
+    <div class="item-controls">
+        <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+        <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+    </div>
+{{/inline}}
+
+
+{{!--
+!-- Render a header row for a given data type.
+!-- It is a flexbox with a child for each column head.
+!-- An "equipped" heading is rendered except for the case dataType==='equipment'.
+!-- The partial assumes a variable dataType to be given in the context.
+!-- If the partial is called with a partial block, the partial block
+!-- content is inserted before the description heading.
+
+!-- @param datType: hand over the dataType to the partial as hash parameter
+!-- @param partial-block: hand over custom children of the flexbox in the partial block.
+--}}
+{{#*inline "listHeader" }}
+    <li class="item flexrow item-header">
+        {{!-- equipped --}}
+        {{#if (ne dataType 'equipment')}}
+            <div title="{{localize 'DS4.ItemEquipped'}}" class="flex05">E</div>
+        {{/if}}
+        {{!-- image --}}
+        <div class="item-image" class="flex05"></div>
+        {{!-- amount --}}
+        <div class="item-num-val" title="{{localize 'DS4.Quantity'}}" class="flex05">#</div>
+        {{!-- name --}}
+        <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
+        {{!-- item type specifics --}}
+        {{> @partial-block }}
+        {{!-- description --}}
+        <div class="flex4">{{localize 'DS4.Description'}}</div>
+        {{!-- add button --}}
+        {{> addButton dataType=dataType }}
+    </li>
+{{/inline}}
+
+{{!--
+!-- Render a list row from a given item.
+!-- It is a flexbox with a child for each item value of interest.
+!-- An equipped checkbox is rendered if item.data.data.equipped is defined.
+!-- The partial assumes a variable item to be given in the context.
+!-- If the partial is called with a partial block, the partial block 
+!-- content is inserted before the description.
+
+!-- @param item: hand over the item to the partial as hash parameter
+!-- @param partial-block: hand over custom children of the flexbox in the partial block.
+--}}
+{{#*inline "listEntry"}}
+    <li class="item flexrow" data-item-id="{{item._id}}">
+        {{!-- equipped --}}
+        {{#if (ne item.data.data.equipped undefined)}}
+            {{#if item.data.data.equipped}}<i class="fas fa-check-square flex05"></i>
+            {{else}}<i class="far fa-square flex05"></i>
+            {{/if}}
+        {{/if}}
+        <div class="flexrow flexnowrap flex15">
+            {{!-- image --}}
+            <div class="item-image">
+                <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
+            </div>
+            {{!-- amount --}}
+            <div class="item-num-val">{{item.data.data.quantity}}</div>
+        </div>
+        {{!-- name --}}
+        <h4 class="item-name flex3">{{item.name}}</h4>
+        {{!-- item type specifics --}}
+        {{> @partial-block}}
+        {{!-- description --}}
+        <div class="flex4 item-description">{{{item.data.data.description}}}</div>
+        {{!-- control buttons --}}
+        {{> itemControlButtons}}
+    </li>
+{{/inline}}
+
+
+{{!-- ======================================================================== --}}
+
+
 <div class="tab items" data-group="primary" data-tab="items">
 
     {{!-- WEAPONS --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeWeapon'}}</h4> {{!-- SPECIFIC --}}
+    <h4 class="items-list-title">{{localize 'DS4.ItemTypeWeapon'}}</h4>
     <ol class="items-list">
-        <li class="item flexrow item-header">
-            <div class="flexrow flex15">
-                <div title="{{localize 'DS4.ItemEquipped'}}">E</div> {{!-- equipped --}} {{!-- SPECIFIC --}}
-                <div class="item-image"></div>
-                <div class="item-num-val" title="{{localize 'DS4.Quantity'}}">#</div> {{!-- amount --}}
+        {{#> listHeader dataType='weapon'}}
+            <div title="{{localize 'DS4.AttackType'}}" class="flex05">{{localize 'DS4.AttackTypeAbbr'}}</div>
+            <div class="item-num-val flex05" title="{{localize 'DS4.WeaponBonus'}}">
+                {{localize 'DS4.WeaponBonusAbbr'}}
             </div>
-            <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
-            <div title="{{localize 'DS4.AttackType'}}">{{localize 'DS4.AttackTypeAbbr'}}</div> {{!-- SPECIFIC --}}
-            <div class="flexrow flex15">
-                <div class="item-num-val" title="{{localize 'DS4.WeaponBonus'}}">{{localize 'DS4.WeaponBonusAbbr'}}
-                </div> {{!-- SPECIFIC --}}
-                <div class="item-num-val" title="{{localize 'DS4.OpponentDefense'}}">{{localize
-                    'DS4.OpponentDefenseAbbr'}}</div> {{!-- SPECIFIC --}}
+            <div class="item-num-val flex05" title="{{localize 'DS4.OpponentDefense'}}">
+                {{localize 'DS4.OpponentDefenseAbbr'}}
             </div>
-            <div class="flex4">{{localize 'DS4.Description'}}</div>
-            {{!-- add button --}}
-            <div class="item-controls"> {{!-- SPECIFIC --}}
-                <a class="item-control item-create" title="Create item" data-type="weapon" {{!-- SPECIFIC --}}>
-                    <i class="fas fa-plus"></i>
-                    {{localize 'DS4.UserInteractionAddItem'}}</a>
-            </div>
-        </li>
-        {{#each itemsByType.weapon as |item id|}} {{!-- SPECIFIC --}}
-        {{#with item.data.data as |itemData|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="flexrow flex15">
-                {{!-- equipped? --}}
-                {{#if itemData.equipped}}<i class="fas fa-check-square"></i>
-                {{else}}<i class="far fa-square"></i>
-                {{/if}} {{!--SPECIFIC --}}
-                {{!-- image --}}
-                <div class="item-image">
-                    <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
+        {{/listHeader}}
+        {{#each itemsByType.weapon as |item id|}}
+            {{#> listEntry item=item}}
+                <div class="flex05">
+                    <img src="{{lookup ../../config.attackTypesIcons  item.data.data.attackType}}"
+                        title="{{lookup ../../config.attackTypes  item.data.data.attackType}}" width="24" height="24" />
                 </div>
-                {{!-- amount --}}
-                <div class="item-num-val">{{itemData.quantity}}</div>
-            </div>
-            {{!-- name --}}
-            <h4 class="item-name flex3">{{item.name}}</h4>
-            {{!-- item specifics --}}
-            <div>
-                <img src="{{lookup ../../config.attackTypesIcons itemData.attackType}}"
-                    title="{{lookup ../../config.attackTypes itemData.attackType}}" width="24" height="24" />
-            </div> {{!-- SPECIFIC --}}
-            <div class="flexrow flex15">
-                <div class="item-num-val">{{itemData.weaponBonus}}</div> {{!-- SPECIFIC --}}
-                <div class="item-num-val">{{itemData.opponentDefense}}</div> {{!-- SPECIFIC --}}
-            </div>
-            {{!-- description --}}
-            <div class="flex4 item-description">{{{itemData.description}}}</div>
-            {{!-- edit & delete buttons --}}
-            <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-        {{/with}}
+                <div class="item-num-val flex05">{{ item.data.data.weaponBonus}}</div>
+                <div class="item-num-val flex05">{{ item.data.data.opponentDefense}}</div>
+            {{/listEntry}}
         {{/each}}
     </ol>
 
     {{!-- ARMOR --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeArmor'}}</h4> {{!-- SPECIFIC --}}
+    <h4 class="items-list-title">{{localize 'DS4.ItemTypeArmor'}}</h4>
     <ol class="items-list">
-        <li class="item flexrow item-header">
-            <div class="flexrow flex15">
-                <div title="{{localize 'DS4.ItemEquipped'}}">E</div> {{!-- equipped --}} {{!-- SPECIFIC --}}
-                <div class="item-image"></div>
-                <div class="item-num-val" title="{{localize 'DS4.Quantity'}}">#</div> {{!-- amount --}}
-            </div>
-            <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
-            <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div> {{!--
-            SPECIFIC --}}
-            <div title="{{localize 'DS4.ArmorType'}}">{{localize 'DS4.ArmorTypeAbbr'}}</div> {{!-- SPECIFIC --}}
+        {{#> listHeader dataType='armor'}}
+            <div title="{{localize 'DS4.ArmorMaterialType'}}">{{localize 'DS4.ArmorMaterialTypeAbbr'}}</div>
+            <div title="{{localize 'DS4.ArmorType'}}">{{localize 'DS4.ArmorTypeAbbr'}}</div>
             <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
                 {{localize 'DS4.ArmorValueAbbr'}}
-            </div> {{!-- SPECIFIC --}}
-            <div class="flex3">{{localize 'DS4.Description'}}</div>
-            {{!-- add button --}}
-            <div class="item-controls"> {{!-- SPECIFIC --}}
-                <a class="item-control item-create" title="Create item" data-type="armor" {{!-- SPECIFIC --}}>
-                    <i class="fas fa-plus"></i>
-                    {{localize 'DS4.UserInteractionAddItem'}}</a>
             </div>
-        </li>
-        {{#each itemsByType.armor as |item id|}} {{!-- SPECIFIC --}}
-        {{#with item.data.data as |itemData|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="flexrow flex15">
-                {{!-- equipped? --}}
-                {{#if itemData.equipped}}<i class="fas fa-check-square"></i>
-                {{else}}<i class="far fa-square"></i>
-                {{/if}} {{!--SPECIFIC --}}
-                {{!-- image --}}
-                <div class="item-image">
-                    <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
+        {{/listHeader}}
+        {{#each itemsByType.armor as |item id|}}
+            {{#> listEntry item=item }}
+                <div title="{{lookup ../../config.armorMaterialTypes  item.data.data.armorMaterialType}}">
+                    {{lookup ../../config.armorMaterialTypesAbbr  item.data.data.armorMaterialType}}
                 </div>
-                {{!-- amount --}}
-                <div class="item-num-val">{{itemData.quantity}}</div>
-            </div>
-            {{!-- name --}}
-            <h4 class="item-name flex3">{{item.name}}</h4>
-            {{!-- item specifics --}}
-            <div title="{{lookup ../../config.armorMaterialTypes itemData.armorMaterialType}}">
-                {{lookup ../../config.armorMaterialTypesAbbr itemData.armorMaterialType}}
-            </div> {{!-- SPECIFIC --}}
-            <div title="{{lookup ../../config.armorTypes itemData.armorType}}">
-                {{lookup ../../config.armorTypesAbbr itemData.armorType}}
-            </div> {{!-- SPECIFIC --}}
-            <div class="flex05 item-num-val">{{itemData.armorValue}}</div> {{!-- SPECIFIC --}}
-            {{!-- description --}}
-            <div class="flex3 item-description">{{{itemData.description}}}</div>
-            {{!-- edit & delete buttons --}}
-            <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-        {{/with}}
+                <div title="{{lookup ../../config.armorTypes  item.data.data.armorType}}">
+                    {{lookup ../../config.armorTypesAbbr  item.data.data.armorType}}
+                </div>
+                <div class="flex05 item-num-val">{{ item.data.data.armorValue}}</div>
+            {{/listEntry}}
         {{/each}}
     </ol>
 
@@ -132,146 +156,41 @@
     {{!-- SHIELD --}}
     <h4 class="items-list-title">{{localize 'DS4.ItemTypeShield'}}</h4> {{!-- SPECIFIC --}}
     <ol class="items-list">
-        <li class="item flexrow item-header">
-            <div class="flexrow flex15">
-                <div title="{{localize 'DS4.ItemEquipped'}}">E</div> {{!-- equipped --}} {{!-- SPECIFIC --}}
-                <div class="item-image"></div>
-                <div class="item-num-val" title="{{localize 'DS4.Quantity'}}">#</div> {{!-- amount --}}
+        {{#> listHeader dataType='shield' }}
+            <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">
+                {{localize 'DS4.ArmorValueAbbr'}}
             </div>
-            <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
-            <div class="flex05 item-num-val" title="{{localize 'DS4.ArmorValue'}}">{{localize 'DS4.ArmorValueAbbr'}}
-            </div> {{!-- SPECIFIC --}}
-            <div class="flex4">{{localize 'DS4.Description'}}</div>
-            {{!-- add button --}}
-            <div class="item-controls"> {{!-- SPECIFIC --}}
-                <a class="item-control item-create" title="Create item" data-type="shield" {{!-- SPECIFIC --}}>
-                    <i class="fas fa-plus"></i>
-                    {{localize 'DS4.UserInteractionAddItem'}}</a>
-            </div>
-        </li>
-        {{#each itemsByType.shield as |item id|}} {{!-- SPECIFIC --}}
-        {{#with item.data.data as |itemData|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="flexrow flex15">
-                {{!-- equipped? --}}
-                {{#if itemData.equipped}}<i class="fas fa-check-square"></i>
-                {{else}}<i class="far fa-square"></i>
-                {{/if}} {{!--SPECIFIC --}}
-                {{!-- image --}}
-                <div class="item-image">
-                    <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
-                </div>
-                {{!-- amount --}}
-                <div class="item-num-val">{{itemData.quantity}}</div>
-            </div>
-            {{!-- name --}}
-            <h4 class="item-name flex3">{{item.name}}</h4>
-            {{!-- item specifics --}}
-            <div class="flex05 item-num-val">{{itemData.armorValue}}</div> {{!-- SPECIFIC --}}
-            {{!-- description --}}
-            <div class="flex4 item-description">{{{itemData.description}}}</div>
-            {{!-- edit & delete buttons --}}
-            <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-        {{/with}}
+        {{/listHeader}}
+        {{#each itemsByType.shield as |item id|}}
+            {{#> listEntry item=item }}
+                <div class="flex05 item-num-val">{{item.data.data.armorValue}}</div> {{!-- SPECIFIC --}}
+            {{/listEntry}}
         {{/each}}
     </ol>
 
     {{!-- TRINKET --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeTrinket'}}</h4> {{!-- SPECIFIC --}}
+    <h4 class="items-list-title">{{localize 'DS4.ItemTypeTrinket'}}</h4>
     <ol class="items-list">
-        <li class="item flexrow item-header">
-            <div class="flexrow flex15">
-                <div title="{{localize 'DS4.ItemEquipped'}}">E</div> {{!-- equipped --}} {{!-- SPECIFIC --}}
-                <div class="item-image"></div>
-                <div class="item-num-val" title="{{localize 'DS4.Quantity'}}">#</div> {{!-- amount --}}
-            </div>
-            <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
-            <div class="flex2">{{localize 'DS4.StorageLocation'}}</div> {{!-- SPECIFIC --}}
-            <div class="flex4">{{localize 'DS4.Description'}}</div>
-            {{!-- add button --}}
-            <div class="item-controls"> {{!-- SPECIFIC --}}
-                <a class="item-control item-create" title="Create item" data-type="trinket" {{!-- SPECIFIC --}}>
-                    <i class="fas fa-plus"></i>
-                    {{localize 'DS4.UserInteractionAddItem'}}</a>
-            </div>
-        </li>
-        {{#each itemsByType.trinket as |item id|}} {{!-- SPECIFIC --}}
-        {{#with item.data.data as |itemData|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="flexrow flex15">
-                {{!-- equipped? --}}
-                {{#if itemData.equipped}}<i class="fas fa-check-square"></i>
-                {{else}}<i class="far fa-square"></i>
-                {{/if}} {{!--SPECIFIC --}}
-                {{!-- image --}}
-                <div class="item-image">
-                    <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
-                </div>
-                {{!-- amount --}}
-                <div class="item-num-val">{{itemData.quantity}}</div>
-            </div>
-            {{!-- name --}}
-            <h4 class="item-name flex3">{{item.name}}</h4>
-            {{!-- storage location --}}
-            <div class="flex2">{{{itemData.storageLocation}}}</div> {{!-- SPECIFIC --}}
-            {{!-- description --}}
-            <div class="flex4 item-description">{{{itemData.description}}}</div>
-            {{!-- edit & delete buttons --}}
-            <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-        {{/with}}
+        {{#> listHeader dataType='trinket'}}
+            <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
+        {{/listHeader}}
+        {{#each itemsByType.trinket as |item id|}}
+            {{#> listEntry item=item }}
+                <div class="flex2">{{{item.data.data.storageLocation}}}</div>
+            {{/listEntry}}
         {{/each}}
     </ol>
 
     {{!-- EQUIPMENT --}}
-    <h4 class="items-list-title">{{localize 'DS4.ItemTypeEquipment'}}</h4> {{!-- SPECIFIC --}}
+    <h4 class="items-list-title">{{localize 'DS4.ItemTypeEquipment'}}</h4>
     <ol class="items-list">
-        <li class="item flexrow item-header">
-            <div class="flexrow flex15">
-                <div class="item-image"></div>
-                <div class="item-num-val" title="{{localize 'DS4.Quantity'}}">#</div> {{!-- amount --}}
-            </div>
-            <div class="item-name flex3">{{localize 'DS4.ItemName'}}</div>
-            <div class="flex2">{{localize 'DS4.StorageLocation'}}</div> {{!-- SPECIFIC --}}
-            <div class="flex4">{{localize 'DS4.Description'}}</div>
-            {{!-- add button --}}
-            <div class="item-controls"> {{!-- SPECIFIC --}}
-                <a class="item-control item-create" title="Create item" data-type="equipment" {{!-- SPECIFIC --}}>
-                    <i class="fas fa-plus"></i>
-                    {{localize 'DS4.UserInteractionAddItem'}}</a>
-            </div>
-        </li>
-        {{#each itemsByType.equipment as |item id|}} {{!-- SPECIFIC --}}
-        {{#with item.data.data as |itemData|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="flexrow flex15">
-                {{!-- image --}}
-                <div class="item-image">
-                    <img src="{{item.img}}" title="{{item.name}}" width="24" height="24" />
-                </div>
-                {{!-- amount --}}
-                <div class="item-num-val">{{itemData.quantity}}</div>
-            </div>
-            {{!-- name --}}
-            <h4 class="item-name flex3">{{item.name}}</h4>
-            {{!-- storage location --}}
-            <div class="flex2">{{{itemData.storageLocation}}}</div> {{!-- SPECIFIC --}}
-            {{!-- description --}}
-            <div class="flex4 item-description">{{{itemData.description}}}</div>
-            {{!-- edit & delete buttons --}}
-            <div class="item-controls">
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
-        </li>
-        {{/with}}
+        {{#> listHeader dataType='equipment'}}
+            <div class="flex2">{{localize 'DS4.StorageLocation'}}</div>
+        {{/listHeader}}
+        {{#each itemsByType.equipment as |item id|}}
+            {{#> listEntry item=item }}
+                <div class="flex2">{{{item.data.data.storageLocation}}}</div>
+            {{/listEntry}}
         {{/each}}
     </ol>
 </div>
\ No newline at end of file