diff --git a/src/ItemSheets/Bewaffnung.hbs b/src/ItemSheets/Bewaffnung.hbs
index 440c834..3b42630 100644
--- a/src/ItemSheets/Bewaffnung.hbs
+++ b/src/ItemSheets/Bewaffnung.hbs
@@ -32,7 +32,7 @@
     </div>
 {{/inline}}
 
-<form class="item-sheet {{ cssClass }}" autocomplete="off">
+<div class="Bewaffnung {{ cssClass }}" autocomplete="off">
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" {{#if editable}}data-edit="img"{{/if}}>
         <div class="col">
@@ -43,163 +43,130 @@
             </div>
         </div>
     </div>
-    <nav class="tabs" data-group="primary">
-        <div class="row noflex">
-            <a data-tab="tab1">{{localize "DSA41.bewaffnung.nahkampfwaffe.label"}}</a>
+    <nav class="tabs">
+        <div class="row noflex active" data-group="primary" data-tab="tab1">
+            <a data-group="primary" data-tab="tab1" data-action="tab">{{localize "DSA41.bewaffnung.nahkampfwaffe.label"}}</a>
             {{>editable-checkbox name="system.nahkampfwaffe.aktiv" value=item.system.nahkampfwaffe.aktiv}}
         </div>
-        <div class="row noflex">
-            <a data-tab="tab2">{{localize "DSA41.bewaffnung.parierwaffe.label"}}</a>
+        <div class="row noflex" data-group="primary" data-tab="tab2">
+            <a data-group="primary" data-tab="tab2" data-action="tab">{{localize "DSA41.bewaffnung.parierwaffe.label"}}</a>
             {{>editable-checkbox name="system.parierwaffe.aktiv" value=item.system.parierwaffe.aktiv}}
         </div>
-        <div class="row noflex">
-            <a data-tab="tab3">{{localize "DSA41.bewaffnung.schild.label"}}</a>
+        <div class="row noflex" data-group="primary" data-tab="tab3">
+            <a data-group="primary" data-tab="tab3" data-action="tab">{{localize "DSA41.bewaffnung.schild.label"}}</a>
             {{>editable-checkbox name="system.schild.aktiv" value=item.system.schild.aktiv}}
         </div>
-        <div class="row noflex">
-            <a data-tab="tab4">{{localize "DSA41.bewaffnung.fernkampfwaffe.label"}}</a>
+        <div class="row noflex" data-group="primary" data-tab="tab4">
+            <a data-group="primary" data-tab="tab4" data-action="tab">{{localize "DSA41.bewaffnung.fernkampfwaffe.label"}}</a>
             {{>editable-checkbox name="system.fernkampfwaffe.aktiv" value=item.system.fernkampfwaffe.aktiv}}
         </div>
     </nav>
     
-    <section class="content">
-        <div class="tab" data-group="primary" data-tab="tab1">
-            <table>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.trefferpunkte"}}</td>
-                    <td class="center">
-                        <div class="row">
-                            {{>editable-input type="text"   name="system.nahkampfwaffe.basis"            value=item.system.nahkampfwaffe.basis            placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.basis")}}
-                            {{>editable-input type="number" name="system.nahkampfwaffe.schwellenwert"    value=item.system.nahkampfwaffe.schwellenwert    placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schwellenwert")}}
-                            {{>editable-input type="number" name="system.nahkampfwaffe.schadensschritte" value=item.system.nahkampfwaffe.schadensschritte placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schadensschritte")}}
-                        </div>
-                    </td>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.modifikator"}}</td>
-                    <td>
-                        <div class="row">
-                            {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_attacke" value=item.system.nahkampfwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.attacke")}}
-                            {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_parade"  value=item.system.nahkampfwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.parade")}}
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.initiative"}}</td>
-                    <td>{{>editable-input type="number" name="system.nahkampfwaffe.initiative" value=item.system.nahkampfwaffe.initiative}}</td>
-                    <td>{{localize "DSA41.bewaffnung.bruchfaktor"}}</td>
-                    <td>{{>editable-input type="number" name="system.nahkampfwaffe.bruchfaktor" value=item.system.nahkampfwaffe.bruchfaktor}}</td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.distanzklasse"}}</td>
-                    <td>{{>editable-input type="text" name="system.nahkampfwaffe.distanzklasse" value=item.system.nahkampfwaffe.distanzklasse}}</td>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.kampftalente"}}</td>
-                    <td>{{>editable-input type="text" name="system.nahkampfwaffe.kampftalente" value=item.system.nahkampfwaffe.kampftalente}}</td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.laenge"}}</td>
-                    <td>{{>editable-input type="number" name="system.nahkampfwaffe.laenge" value=item.system.nahkampfwaffe.laenge}}</td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.zweihaendig"}}</td>
-                    <td>{{>editable-checkbox name="system.nahkampfwaffe.zweihaendig" value=item.system.nahkampfwaffe.zweihaendig}}</td>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.werfbar"}}</td>
-                    <td>{{>editable-checkbox name="system.nahkampfwaffe.werfbar" value=item.system.nahkampfwaffe.werfbar}}</td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.improvisiert"}}</td>
-                    <td>{{>editable-checkbox name="system.nahkampfwaffe.improvisiert" value=item.system.nahkampfwaffe.improvisiert}}</td>
-                    <td>{{localize "DSA41.bewaffnung.nahkampfwaffe.priviligiert"}}</td>
-                    <td>{{>editable-checkbox name="system.nahkampfwaffe.priviligiert" value=item.system.nahkampfwaffe.priviligiert}}</td>
-                </tr>
-            </table>
-        </div>
+    <div class="tab active" data-group="primary" data-tab="tab1">
+        <div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.trefferpunkte"}}</span>
+            <div class="grid3 center">
+                {{>editable-input type="text"   name="system.nahkampfwaffe.basis"            value=item.system.nahkampfwaffe.basis            placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.basis")}}
+                {{>editable-input type="number" name="system.nahkampfwaffe.schwellenwert"    value=item.system.nahkampfwaffe.schwellenwert    placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schwellenwert")}}
+                {{>editable-input type="number" name="system.nahkampfwaffe.schadensschritte" value=item.system.nahkampfwaffe.schadensschritte placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.schadensschritte")}}
+            </div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.modifikator"}}</span>
+            <div class="grid2">
+                {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_attacke" value=item.system.nahkampfwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.attacke")}}
+                {{>editable-input type="number" name="system.nahkampfwaffe.modifikator_parade"  value=item.system.nahkampfwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.nahkampfwaffe.parade")}}
+            </div>
 
-        <div class="tab" data-group="primary" data-tab="tab2">
-            <table>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.parierwaffe.initiative"}}</td>
-                    <td>{{>editable-input type="number" name="system.parierwaffe.initiative" value=item.system.parierwaffe.initiative}}</td>
-                    <td>{{localize "DSA41.bewaffnung.parierwaffe.modifikator"}}</td>
-                    <td>
-                        <div class="row">
-                            {{>editable-input type="number" name="system.parierwaffe.modifikator_attacke" value=item.system.parierwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.parierwaffe.attacke")}}
-                            {{>editable-input type="number" name="system.parierwaffe.modifikator_parade"  value=item.system.parierwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.parierwaffe.parade")}}
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.bruchfaktor"}}</td>
-                    <td>{{>editable-input type="number" name="system.parierwaffe.bruchfaktor" value=item.system.parierwaffe.bruchfaktor}}</td>
-                </tr>
-            </table>
-        </div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.initiative"}}</span>
+            <div>{{>editable-input type="number" name="system.nahkampfwaffe.initiative" value=item.system.nahkampfwaffe.initiative}}</div>
+            <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
+            <div>{{>editable-input type="number" name="system.nahkampfwaffe.bruchfaktor" value=item.system.nahkampfwaffe.bruchfaktor}}</div>
 
-        <div class="tab" data-group="primary" data-tab="tab3">
-            <table>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.schild.groesse.label"}}</td>
-                    <td>
-                        <select name="system.schild.groesse">
-                            <option value="klein"      {{#if (eq item.system.schild.groesse "klein")}}      selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.klein"}}</option>
-                            <option value="gross"      {{#if (eq item.system.schild.groesse "gross")}}      selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.gross"}}</option>
-                            <option value="sehr_gross" {{#if (eq item.system.schild.groesse "sehr_gross")}} selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.sehr_gross"}}</option>
-                        </select>
-                    </td>
-                    <td>{{localize "DSA41.bewaffnung.schild.modifikator"}}</td>
-                    <td>
-                        <div class="row">
-                            {{>editable-input type="number" name="system.schild.modifikator_attacke" value=item.system.schild.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.schild.attacke")}}
-                            {{>editable-input type="number" name="system.schild.modifikator_parade"  value=item.system.schild.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.schild.parade")}}
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.schild.initiative"}}</td>
-                    <td>{{>editable-input type="number" name="system.schild.initiative" value=item.system.schild.initiative}}</td>
-                    <td>{{localize "DSA41.bewaffnung.bruchfaktor"}}</td>
-                    <td>{{>editable-input type="number" name="system.schild.bruchfaktor" value=item.system.schild.bruchfaktor}}</td>
-                </tr>
-            </table>
-        </div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.distanzklasse"}}</span>
+            <div>{{>editable-input type="text" name="system.nahkampfwaffe.distanzklasse" value=item.system.nahkampfwaffe.distanzklasse}}</div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.kampftalente"}}</span>
+            <div>{{>editable-input type="text" name="system.nahkampfwaffe.kampftalente" value=item.system.nahkampfwaffe.kampftalente}}</div>
 
-        <div class="tab" data-group="primary" data-tab="tab4">
-            <table>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.trefferpunkte"}}</td>
-                    <td class="center">{{>editable-input type="text" name="system.fernkampfwaffe.basis" value=item.system.fernkampfwaffe.basis}}</td>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.laden"}}</td>
-                    <td>{{>editable-input type="number" name="system.fernkampfwaffe.laden" value=item.system.fernkampfwaffe.laden}}</td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.reichweiten"}}</td>
-                    <td colspan="3">
-                        <div class="row">
-                            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite1" value=item.system.fernkampfwaffe.reichweite1}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite2" value=item.system.fernkampfwaffe.reichweite2}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite3" value=item.system.fernkampfwaffe.reichweite3}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite4" value=item.system.fernkampfwaffe.reichweite4}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.reichweite5" value=item.system.fernkampfwaffe.reichweite5}}
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.modifikator"}}</td>
-                    <td colspan="3">
-                        <div class="row">
-                            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator1" value=item.system.fernkampfwaffe.modifikator1}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator2" value=item.system.fernkampfwaffe.modifikator2}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator3" value=item.system.fernkampfwaffe.modifikator3}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator4" value=item.system.fernkampfwaffe.modifikator4}}
-                            {{>editable-input type="number" name="system.fernkampfwaffe.modifikator5" value=item.system.fernkampfwaffe.modifikator5}}
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionskosten"}}</td>
-                    <td>{{>editable-input type="number" name="system.fernkampfwaffe.munitionskosten" value=item.system.fernkampfwaffe.munitionskosten}}</td>
-                    <td>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionsgewicht"}}</td>
-                    <td>{{>editable-input type="number" name="system.fernkampfwaffe.munitionsgewicht" value=item.system.fernkampfwaffe.munitionsgewicht}}</td>
-                </tr>
-            </table>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.laenge"}}</span>
+            <div>{{>editable-input type="number" name="system.nahkampfwaffe.laenge" value=item.system.nahkampfwaffe.laenge}}</div>
+            <div class="colspan2"></div>
+
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.zweihaendig"}}</span>
+            <div>{{>editable-checkbox name="system.nahkampfwaffe.zweihaendig" value=item.system.nahkampfwaffe.zweihaendig}}</div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.werfbar"}}</span>
+            <div>{{>editable-checkbox name="system.nahkampfwaffe.werfbar" value=item.system.nahkampfwaffe.werfbar}}</div>
+
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.improvisiert"}}</span>
+            <div>{{>editable-checkbox name="system.nahkampfwaffe.improvisiert" value=item.system.nahkampfwaffe.improvisiert}}</div>
+            <span>{{localize "DSA41.bewaffnung.nahkampfwaffe.priviligiert"}}</span>
+            <div>{{>editable-checkbox name="system.nahkampfwaffe.priviligiert" value=item.system.nahkampfwaffe.priviligiert}}</div>
         </div>
-    </section>
-</form>
\ No newline at end of file
+    </div>
+
+    <div class="tab" data-group="primary" data-tab="tab2">
+        <div>
+            <span>{{localize "DSA41.bewaffnung.parierwaffe.initiative"}}</span>
+            <div>{{>editable-input type="number" name="system.parierwaffe.initiative" value=item.system.parierwaffe.initiative}}</div>
+            <span>{{localize "DSA41.bewaffnung.parierwaffe.modifikator"}}</span>
+            <div class="grid2">
+                {{>editable-input type="number" name="system.parierwaffe.modifikator_attacke" value=item.system.parierwaffe.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.parierwaffe.attacke")}}
+                {{>editable-input type="number" name="system.parierwaffe.modifikator_parade"  value=item.system.parierwaffe.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.parierwaffe.parade")}}
+            </div>
+            
+            <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
+            <div>{{>editable-input type="number" name="system.parierwaffe.bruchfaktor" value=item.system.parierwaffe.bruchfaktor}}</div>
+        </div>
+    </div>
+
+    <div class="tab" data-group="primary" data-tab="tab3">
+        <div>
+            <span>{{localize "DSA41.bewaffnung.schild.groesse.label"}}</span>
+            <select name="system.schild.groesse">
+                <option value="klein"      {{#if (eq item.system.schild.groesse "klein")}}      selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.klein"}}</option>
+                <option value="gross"      {{#if (eq item.system.schild.groesse "gross")}}      selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.gross"}}</option>
+                <option value="sehr_gross" {{#if (eq item.system.schild.groesse "sehr_gross")}} selected {{/if}}>{{localize "DSA41.bewaffnung.schild.groesse.sehr_gross"}}</option>
+            </select>
+            <span>{{localize "DSA41.bewaffnung.schild.modifikator"}}</span>
+            <div class="grid2">
+                {{>editable-input type="number" name="system.schild.modifikator_attacke" value=item.system.schild.modifikator_attacke placeholder=(localize "DSA41.bewaffnung.schild.attacke")}}
+                {{>editable-input type="number" name="system.schild.modifikator_parade"  value=item.system.schild.modifikator_parade  placeholder=(localize "DSA41.bewaffnung.schild.parade")}}
+            </div>
+            
+            <span>{{localize "DSA41.bewaffnung.schild.initiative"}}</span>
+            <div>{{>editable-input type="number" name="system.schild.initiative" value=item.system.schild.initiative}}</div>
+            <span>{{localize "DSA41.bewaffnung.bruchfaktor"}}</span>
+            <div>{{>editable-input type="number" name="system.schild.bruchfaktor" value=item.system.schild.bruchfaktor}}</div>
+        </div>
+    </div>
+
+    <div class="tab" data-group="primary" data-tab="tab4">
+        <div>
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.trefferpunkte"}}</span>
+            <div class="center">{{>editable-input type="text" name="system.fernkampfwaffe.basis" value=item.system.fernkampfwaffe.basis}}</div>
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.laden"}}</span>
+            <div>{{>editable-input type="number" name="system.fernkampfwaffe.laden" value=item.system.fernkampfwaffe.laden}}</div>
+
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionskosten"}}</span>
+            <div>{{>editable-input type="number" name="system.fernkampfwaffe.munitionskosten" value=item.system.fernkampfwaffe.munitionskosten}}</div>
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.munitionsgewicht"}}</span>
+            <div>{{>editable-input type="number" name="system.fernkampfwaffe.munitionsgewicht" value=item.system.fernkampfwaffe.munitionsgewicht}}</div>
+
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.reichweiten"}}</span>
+            <div class="colspan3 grid5">
+                {{>editable-input type="number" name="system.fernkampfwaffe.reichweite1" value=item.system.fernkampfwaffe.reichweite1}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.reichweite2" value=item.system.fernkampfwaffe.reichweite2}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.reichweite3" value=item.system.fernkampfwaffe.reichweite3}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.reichweite4" value=item.system.fernkampfwaffe.reichweite4}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.reichweite5" value=item.system.fernkampfwaffe.reichweite5}}
+            </div>
+
+            <span>{{localize "DSA41.bewaffnung.fernkampfwaffe.modifikator"}}</span>
+            <div class="row colspan3 grid5">
+                {{>editable-input type="number" name="system.fernkampfwaffe.modifikator1" value=item.system.fernkampfwaffe.modifikator1}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.modifikator2" value=item.system.fernkampfwaffe.modifikator2}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.modifikator3" value=item.system.fernkampfwaffe.modifikator3}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.modifikator4" value=item.system.fernkampfwaffe.modifikator4}}
+                {{>editable-input type="number" name="system.fernkampfwaffe.modifikator5" value=item.system.fernkampfwaffe.modifikator5}}
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/ItemSheets/Gegenstand.hbs b/src/ItemSheets/Gegenstand.hbs
index dd8177d..8a78cb9 100644
--- a/src/ItemSheets/Gegenstand.hbs
+++ b/src/ItemSheets/Gegenstand.hbs
@@ -15,7 +15,7 @@
     </div>
 {{/inline}}
 
-<form class="item-sheet {{ cssClass }}" autocomplete="off">
+<div class="item-sheet {{ cssClass }}" autocomplete="off">
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" {{#if editable}}data-edit="img"{{/if}}>
         <div class="col">
@@ -26,4 +26,4 @@
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/ItemSheets/Ruestung.hbs b/src/ItemSheets/Ruestung.hbs
index f4e1bb6..67cd2ca 100644
--- a/src/ItemSheets/Ruestung.hbs
+++ b/src/ItemSheets/Ruestung.hbs
@@ -15,7 +15,7 @@
     </div>
 {{/inline}}
 
-<form class="item-sheet {{ cssClass }}" autocomplete="off">
+<div class="item-sheet {{ cssClass }}" autocomplete="off">
     <div class="row">
         <img class="item-image" src="{{ item.img }}" title="{{ item.name }}" {{#if editable}}data-edit="img"{{/if}}>
         <div class="col">
@@ -26,39 +26,31 @@
             </div>
         </div>
     </div>
-    <div class="row">
-        <table>
-            <tr>
-                <td>{{localize "DSA41.ruestungen.kopf"}}</td>
-                <td>{{>editable-input type="number" name="system.kopf" value=item.system.kopf}}</td>
-                <td>{{localize "DSA41.ruestungen.brust"}}</td>
-                <td>{{>editable-input type="number" name="system.brust" value=item.system.brust}}</td>
-            </tr>
-            <tr>
-                <td>{{localize "DSA41.ruestungen.ruecken"}}</td>
-                <td>{{>editable-input type="number" name="system.ruecken" value=item.system.ruecken}}</td>
-                <td>{{localize "DSA41.ruestungen.bauch"}}</td>
-                <td>{{>editable-input type="number" name="system.bauch" value=item.system.bauch}}</td>
-            </tr>
-            <tr>
-                <td>{{localize "DSA41.ruestungen.linker_arm"}}</td>
-                <td>{{>editable-input type="number" name="system.linker_arm" value=item.system.linker_arm}}</td>
-                <td>{{localize "DSA41.ruestungen.rechter_arm"}}</td>
-                <td>{{>editable-input type="number" name="system.rechter_arm" value=item.system.rechter_arm}}</td>
-            </tr>
-            <tr>
-                <td>{{localize "DSA41.ruestungen.linkes_bein"}}</td>
-                <td>{{>editable-input type="number" name="system.linkes_bein" value=item.system.linkes_bein}}</td>
-                <td>{{localize "DSA41.ruestungen.rechtes_bein"}}</td>
-                <td>{{>editable-input type="number" name="system.rechtes_bein" value=item.system.rechtes_bein}}</td>
-            </tr>
 
-            <tr>
-                <td>{{localize "DSA41.ruestungen.gesamt_ruestungsschutz"}}</td>
-                <td>{{>editable-input type="number" name="system.gesamt_ruestungsschutz" value=item.system.gesamt_ruestungsschutz}}</td>
-                <td>{{localize "DSA41.ruestungen.gesamt_behinderung"}}</td>
-                <td>{{>editable-input type="number" name="system.gesamt_behinderung" value=item.system.gesamt_behinderung}}</td>
-            </tr>
-        </table>
+    <div class="Ruestung">
+        <span>{{localize "DSA41.ruestungen.kopf"}}</span>
+        <div>{{>editable-input type="number" name="system.kopf" value=item.system.kopf}}</div>
+        <span>{{localize "DSA41.ruestungen.brust"}}</span>
+        <div>{{>editable-input type="number" name="system.brust" value=item.system.brust}}</div>
+        
+        <span>{{localize "DSA41.ruestungen.ruecken"}}</span>
+        <div>{{>editable-input type="number" name="system.ruecken" value=item.system.ruecken}}</div>
+        <span>{{localize "DSA41.ruestungen.bauch"}}</span>
+        <div>{{>editable-input type="number" name="system.bauch" value=item.system.bauch}}</div>
+        
+        <span>{{localize "DSA41.ruestungen.linker_arm"}}</span>
+        <div>{{>editable-input type="number" name="system.linker_arm" value=item.system.linker_arm}}</div>
+        <span>{{localize "DSA41.ruestungen.rechter_arm"}}</span>
+        <div>{{>editable-input type="number" name="system.rechter_arm" value=item.system.rechter_arm}}</div>
+        
+        <span>{{localize "DSA41.ruestungen.linkes_bein"}}</span>
+        <div>{{>editable-input type="number" name="system.linkes_bein" value=item.system.linkes_bein}}</div>
+        <span>{{localize "DSA41.ruestungen.rechtes_bein"}}</span>
+        <div>{{>editable-input type="number" name="system.rechtes_bein" value=item.system.rechtes_bein}}</div>
+        
+        <span>{{localize "DSA41.ruestungen.gesamt_ruestungsschutz"}}</span>
+        <div>{{>editable-input type="number" name="system.gesamt_ruestungsschutz" value=item.system.gesamt_ruestungsschutz}}</div>
+        <span>{{localize "DSA41.ruestungen.gesamt_behinderung"}}</span>
+        <div>{{>editable-input type="number" name="system.gesamt_behinderung" value=item.system.gesamt_behinderung}}</div>
     </div>
-</form>
\ No newline at end of file
+</div>
diff --git a/src/main.css b/src/main.css
index ed8c131..7b289cc 100644
--- a/src/main.css
+++ b/src/main.css
@@ -1,3 +1,8 @@
+.tabs > [data-tab] > * {
+    pointer-events: auto;
+}
+
+
 .row {
     display: flex;
     flex-direction: row;
@@ -27,7 +32,6 @@
 .center {
     text-align:      center;
     justify-content: center;
-    justify-self:    center;
     align-content:   center;
 }
 
@@ -35,6 +39,26 @@
     display: none;
 }
 
+.grid2 {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.grid3 {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr));
+}
+
+.grid4 {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+}
+
+.grid5 {
+    display: grid;
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+}
+
 .subgrid {
     display: grid;
     grid-template-rows: subgrid;
@@ -187,32 +211,25 @@
 }
 
 .actor-sheet .tabs,
-.item-sheet  .tabs {
-    padding: 6px;
-    margin-top: 6px;
+.DSA41 .tabs {
+    padding:       .5rem;
+    margin-top:    .5rem;
+    margin-bottom: .5rem;
     border-top:    1px solid;
     border-bottom: 1px solid;
 }
 
-.actor-sheet .tabs a,
-.item-sheet  .tabs a {
-    line-height: 18px;
+.DSA41 .tabs > * {
+    align-items: center;
 }
 
-.actor-sheet .tabs a.active,
-.item-sheet  .tabs a.active {
+.DSA41 .tabs .active {
     text-decoration: underline;
-}
-
-.item-sheet .tabs input[type="checkbox"] {
-    width: 12px;
-    height: 12px;
-}
+} 
 
 .actor-sheet .kampf .ruestungen {
     display: grid;
     grid-template-columns: 2fr repeat(8, 1fr) repeat(2, 1.5fr);
-
 }
 
 .actor-sheet .kampf .ruestungen > * {
@@ -231,6 +248,21 @@
     border: none;
 }
 
+.DSA41 .Bewaffnung .tab > * {
+    display: grid;
+    grid-template-columns: minmax(0, max-content) minmax(0, 1fr) minmax(0, max-content) minmax(0, 1fr);
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.DSA41 .Ruestung {
+    display: grid;
+    grid-template-columns: minmax(0, max-content) minmax(0, 1fr) minmax(0, max-content) minmax(0, 1fr);
+    align-items: center;
+    gap: 0.5rem;
+    margin-top: 0.5rem;
+}
+
 #tooltip:has(> .dsa41-tooltip) {
     /* background-color: #678ec3; */
 }
diff --git a/src/main.mjs b/src/main.mjs
index 352911f..514c1f2 100644
--- a/src/main.mjs
+++ b/src/main.mjs
@@ -1,3 +1,9 @@
+const { TypeDataModel } = foundry.abstract;
+const { SchemaField, NumberField, StringField, BooleanField } = foundry.data.fields;
+const { ItemSheetV2 } = foundry.applications.sheets;
+const { HandlebarsApplicationMixin } = foundry.applications.api;
+const { OperatorTerm, NumericTerm } = foundry.dice.terms;
+
 Hooks.once("init", function() {
     CONFIG.Combat.initiative.formula = "1d6 + @computed.ini_basiswert[INI-Basiswert]";
 
@@ -17,7 +23,7 @@ Hooks.once("init", function() {
     });
 
     DocumentSheetConfig.unregisterSheet(Item, "core", ItemSheet);
-    DocumentSheetConfig.registerSheet(Item, "dsa41", DSA41_ItemSheet, { 
+    DocumentSheetConfig.registerSheet(Item, "dsa41", DSA41_ItemSheetV2, { 
         makeDefault: true, 
         types: [
             "Gegenstand",
@@ -43,12 +49,12 @@ function get_minified_formula(formula, data) {
     for (let i = 0; i < terms.length; i++) {
         const term = terms[i];
         
-        if (is_combinable && term instanceof foundry.dice.terms.NumericTerm) {
+        if (is_combinable && term instanceof NumericTerm) {
             for (let j = i + 1; j < terms.length - 1; j += 2) {
                 let operator = terms[j];
                 let next     = terms[j + 1];
 
-                if (!(operator instanceof foundry.dice.terms.OperatorTerm && next instanceof foundry.dice.terms.NumericTerm))
+                if (!(operator instanceof OperatorTerm && next instanceof NumericTerm))
                     break;
                 
                 switch (operator.operator) {
@@ -69,7 +75,7 @@ function get_minified_formula(formula, data) {
 
             is_combinable = false;
         } else {
-            if (term instanceof foundry.dice.terms.OperatorTerm && (term.operator == "+" || term.operator == "-")) {
+            if (term instanceof OperatorTerm && (term.operator == "+" || term.operator == "-")) {
                 is_combinable = true;
             } else {
                 is_combinable = false;
@@ -83,9 +89,7 @@ function get_minified_formula(formula, data) {
     return Roll.getFormula(output);
 }
 
-const { SchemaField, NumberField, StringField, BooleanField } = foundry.data.fields;
-
-class AttributeField extends foundry.data.fields.SchemaField {
+class AttributeField extends SchemaField {
     constructor() {
         return super({
             initial:     new NumberField({ integer: true, initial: 8, min: 0 }),
@@ -95,7 +99,7 @@ class AttributeField extends foundry.data.fields.SchemaField {
     }
 }
 
-class CombatTalentField extends foundry.data.fields.SchemaField {
+class CombatTalentField extends SchemaField {
     constructor() {
         return super({
             talentwert: new NumberField({ integer: true, initial: 0 }),
@@ -109,7 +113,7 @@ class DSA41_CharacterDocument extends Actor {
 
 }
 
-class DSA41_CharacterData extends foundry.abstract.TypeDataModel {
+class DSA41_CharacterData extends TypeDataModel {
     static defineSchema() {
         return {
             race:       new StringField(),
@@ -420,7 +424,7 @@ class DSA41_CharacterData extends foundry.abstract.TypeDataModel {
     }
 }
 
-class DSA41_GegenstandData extends foundry.abstract.TypeDataModel {
+class DSA41_GegenstandData extends TypeDataModel {
     static defineSchema() {
         return {
             gewicht: new NumberField({ integer: false, initial: 0, min: 0 }),
@@ -429,7 +433,7 @@ class DSA41_GegenstandData extends foundry.abstract.TypeDataModel {
     }
 }
 
-class DSA41_RuestungData extends foundry.abstract.TypeDataModel {
+class DSA41_RuestungData extends TypeDataModel {
     static defineSchema() {
         return {
             gewicht: new NumberField({ integer: false, initial: 0, min: 0 }),
@@ -450,7 +454,7 @@ class DSA41_RuestungData extends foundry.abstract.TypeDataModel {
     }
 }
 
-class DSA41_BewaffnungData extends foundry.abstract.TypeDataModel {
+class DSA41_BewaffnungData extends TypeDataModel {
     static defineSchema() {
         return {
             gewicht: new NumberField({ integer: false, initial: 0, min: 0 }),
@@ -533,12 +537,9 @@ class DSA41_ActorSheet extends ActorSheet {
     static get defaultOptions() {
         return foundry.utils.mergeObject(super.defaultOptions, {
             tabs: [{ navSelector: ".tabs", contentSelector: ".content", initial: "tab1" }],
+            template: "systems/dsa-4th-edition/src/ActorSheet.hbs",
         });
     }
-    
-    get template() {
-        return "systems/dsa-4th-edition/src/ActorSheet.hbs";
-    }
 
     async getData() {
         let data = super.getData();
@@ -599,14 +600,29 @@ class DSA41_ActorSheet extends ActorSheet {
     }
 }
 
-class DSA41_ItemSheet extends ItemSheet {
-    static get defaultOptions() {
-        return foundry.utils.mergeObject(super.defaultOptions, {
-            tabs: [{ navSelector: ".tabs", contentSelector: ".content", initial: "tab1" }],
-        });
+class DSA41_ItemSheetV2 extends HandlebarsApplicationMixin(ItemSheetV2) {
+    static DEFAULT_OPTIONS = {
+        classes: [ "DSA41" ],
+        position: { width: "480", height: "480" },
+        window: { resizable: true },
+        form: { submitOnChange: true },
+    };
+
+    static PARTS = {
+        Bewaffnung: { template: "systems/dsa-4th-edition/src/ItemSheets/Bewaffnung.hbs" },
+        Gegenstand: { template: "systems/dsa-4th-edition/src/ItemSheets/Gegenstand.hbs" },
+        Ruestung:   { template: "systems/dsa-4th-edition/src/ItemSheets/Ruestung.hbs" },
+    };
+
+    _configureRenderOptions(options) {
+        super._configureRenderOptions(options);
+        options.parts = [ this.options.document.type ];
     }
 
-    get template() {
-        return "systems/dsa-4th-edition/src/ItemSheets/" + this.item.type + ".hbs";
+    _prepareContext(options) {
+        return {
+            editable: true,
+            item: this.options.document,
+        };
     }
 }