diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs
index 4e832082..24652248 100644
--- a/src/module/sheets/characterSheet.mjs
+++ b/src/module/sheets/characterSheet.mjs
@@ -118,8 +118,10 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
         }
     }
 
-    static #openEmbeddedDocument(documentId) {
-        this.object.items.get(documentId).sheet.render(true)
+    static #openEmbeddedDocument(event) {
+        const dataset = event.target.parentElement.dataset
+        const id = dataset.itemId ?? dataset.id
+        this.document.items.get(id).sheet.render(true)
     }
 
     /**
diff --git a/src/module/sheets/groupSheet.mjs b/src/module/sheets/groupSheet.mjs
index 74fe6912..1f64a1e5 100644
--- a/src/module/sheets/groupSheet.mjs
+++ b/src/module/sheets/groupSheet.mjs
@@ -79,14 +79,17 @@ export class GroupSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
         return s
     }
 
-    static async #openEmbeddedDocument(evt) {
-        const {documentId} = evt.srcElement.dataset
-        this.document.items.get(documentId).sheet.render(true)
+
+    static #openEmbeddedDocument(event) {
+        const dataset = event.target.parentElement.dataset
+        const id = dataset.itemId ?? dataset.id
+        this.document.items.get(id).sheet.render(true)
     }
 
-    static async #openActorDocument(evt) {
-        const {id} = evt.srcElement.dataset
-        evt.stopPropagation()
+
+    static async #openActorDocument(event) {
+        const dataset = event.target.parentElement.dataset
+        const id = dataset.itemId ?? dataset.id
         game.actors.get(id).sheet.render(true)
     }
 
diff --git a/src/templates/actor/character/tab-liturgies.hbs b/src/templates/actor/character/tab-liturgies.hbs
index fdb869f5..6bc342d8 100644
--- a/src/templates/actor/character/tab-liturgies.hbs
+++ b/src/templates/actor/character/tab-liturgies.hbs
@@ -37,7 +37,7 @@
                             data-lkp="{{../lkp}}" data-deity="{{this.deity}}">
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
-                        <td class="clickable" data-id="{{this.id}}" data-operation="openActorSheet">
+                        <td class="clickable" data-id="{{this.id}}" data-action="openActorSheet">
                             {{this.name}}</td>
                         <td></td>
                     </tr>
@@ -56,7 +56,7 @@
                             data-lkp="{{../lkp}}" data-deity="{{this.deity}}">
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
-                        <td class="clickable" data-id="{{this.id}}" data-operation="openActorSheet">
+                        <td class="clickable" data-id="{{this.id}}" data-action="openActorSheet">
                             {{this.name}}</td>
                         <td></td>
                     </tr>
@@ -77,7 +77,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}
@@ -96,7 +96,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}
@@ -115,7 +115,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}{{/if}}
             {{#if this.countV}}
@@ -133,7 +133,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}
@@ -152,7 +152,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}{{#if this.countVII}}
@@ -170,7 +170,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}{{#if this.countVIII}}
@@ -188,7 +188,7 @@
                             {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                         </td>
                         <td class="clickable" data-id="{{this.id}}"
-                            data-operation="openActorSheet">{{this.name}}</td>
+                            data-action="openActorSheet">{{this.name}}</td>
                     </tr>
                 {{/each}}
             {{/if}}
diff --git a/src/templates/actor/character/tab-spells.hbs b/src/templates/actor/character/tab-spells.hbs
index ed6cda06..b8ea3278 100644
--- a/src/templates/actor/character/tab-spells.hbs
+++ b/src/templates/actor/character/tab-spells.hbs
@@ -32,7 +32,7 @@
                 <td class="spell rollable">
                     {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
                 </td>
-                <td class="clickable" data-id="{{this.id}}" data-operation="openActorSheet">
+                <td class="clickable" data-id="{{this.id}}" data-action="openActorSheet">
                     <span>{{this.name}}</span></td>
                 <td>{{this.eigenschaft1}}</td>
                 <td>{{this.eigenschaft2}}</td>
diff --git a/src/templates/actor/group/tab-inventory.hbs b/src/templates/actor/group/tab-inventory.hbs
index d238d631..e3a6eae2 100644
--- a/src/templates/actor/group/tab-inventory.hbs
+++ b/src/templates/actor/group/tab-inventory.hbs
@@ -2,27 +2,6 @@
          data-tab="{{tabs.inventory.id}}"
          data-group="{{tabs.inventory.group}}">
 
-    <table class="inventory-table">
-        <thead>
-        <tr>
-            <th colspan="2"></th>
-            <th>Anzahl</th>
-            <th>Gewicht</th>
+    {{> "systems/DSA_4-1/templates/ui/partial-equipment-button.hbs" inventoryItems}}
 
-        </tr>
-        </thead>
-        <tbody>
-
-        {{#each inventoryItems}}
-            <tr class="equipment" data-item-id="{{this.id}}" draggable="true">
-                <td class="icon"><img alt="" src="{{this.icon}}" width="16" height="16"></td>
-                <td class="name">{{this.name}}</td>
-                <td class="quantity">{{this.quantity}}</td>
-                <td class="weight">{{this.weight}}</td>
-            </tr>
-        {{/each}}
-        </tbody>
-    </table>
-
-    </div>
 </section>
diff --git a/src/templates/actor/group/tab-members.hbs b/src/templates/actor/group/tab-members.hbs
index 60da70cd..a89491c3 100644
--- a/src/templates/actor/group/tab-members.hbs
+++ b/src/templates/actor/group/tab-members.hbs
@@ -6,7 +6,7 @@
             {{#each this.characters}}
                 {{#if this.isVisible}}
                     <div class="character">
-                        <div class="header clickable" data-id="{{this.id}}" data-operation="openActorSheet">
+                        <div class="header clickable" data-id="{{this.id}}" data-action="openActorSheet">
                             <img class="profile-img" src="{{this.img}}" style="object-fit: cover;"
                                  title="{{this.name}}" alt="{{this.name}}"/>
                             <span class="name">{{this.name}}</span>
@@ -24,8 +24,7 @@
                     {{#each this.fields.head}}
                         <th>
                             <div class="character">
-                                <div class="header clickable" data-id="{{this.id}}"
-                                     data-operation="openActorSheet">
+                                <div class="header clickable" data-id="{{this.id}}" data-action="openActorDocument">
                                     <img class="profile-img" src="{{this.img}}" style="object-fit: cover;"
                                          title="{{this.name}}" alt="{{this.name}}"/>
                                     <span class="name">{{this.name}}</span>
diff --git a/src/templates/ui/partial-equipment-button.hbs b/src/templates/ui/partial-equipment-button.hbs
index 68121064..63c98791 100644
--- a/src/templates/ui/partial-equipment-button.hbs
+++ b/src/templates/ui/partial-equipment-button.hbs
@@ -11,7 +11,7 @@
 
 
     {{#each this}}
-        <tr class="equipment" data-item-id="{{this.id}}" draggable="true">
+        <tr class="equipment" data-item-id="{{this.id}}" draggable="true" data-action="openEmbeddedDocument">
             <td class="icon"><img alt="" src="{{this.icon}}" width="16" height="16"></td>
             <td class="name">{{this.name}}</td>
             <td class="quantity">{{this.quantity}}</td>