diff --git a/templates/actor/appv2/group-gear.hbs b/templates/actor/appv2/group-gear.hbs
index 70a9ec6..21455c6 100644
--- a/templates/actor/appv2/group-gear.hbs
+++ b/templates/actor/appv2/group-gear.hbs
@@ -1,45 +1,50 @@
 <div class="tab gear sheet-part {{#if @root.tabs.gear.active}}active{{/if}}" data-group="sheet" data-tab="gear">
-  <div class="grid grid-2col">
-    <div>
-      <ol class="items-list">
-        <li class="item flexrow items-header">
-          <div class="item-name"  style="flex:4;">{{ localize 'IDENTITY.name'}}</div>
-          <div class="item-quantity">{{ localize 'VERMINE.qty'}}</div>
-          <div class="item-weight">{{ localize 'VERMINE.weight'}}</div>
+  <div class="weapons">
+    <h4>{{localize 'ITEMS.weapons'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
+  </div>
+  <div class="protections">
+    <h4>{{localize 'ITEMS.defenses'}}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
+  </div>
+  <div class="objects">
+    <h4>{{localize 'ITEMS.items'}}</h4>
+    <ol class="items-list">
+      <li class="item flexrow items-header">
+        <div class="item-name" style="flex:4;">{{ localize 'IDENTITY.name'}}</div>
+        <div class="item-quantity">{{ localize 'VERMINE.qty'}}</div>
+        <div class="item-weight">{{ localize 'VERMINE.weight'}}</div>
+        <div class="item-controls">
+          {{#if isEditMode}}
+          <a class="item-control item-create" data-action="create" data-type="item" title="Create item"><i class="fas fa-plus"></i></a>
+          {{/if}}
+        </div>
+      </li>
+      {{#each gear as |item id|}}
+        <li class="item flexrow flex-group-center" data-item-id="{{item._id}}">
+          <div class="item-name" style="flex:4;">
+            <div class="item-image">
+              <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
+            </div>
+            <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.name}}</a>
+          </div>
+          <div><a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.system.quantity}}</a></div>
+          <div><a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.system.weight}}</a></div>
           <div class="item-controls">
-            {{#if isEditMode}}
-            <a class="item-control item-create" data-action="create" data-type="item" title="Create item"><i class="fas fa-plus"></i></a>
+            {{#if @root.isEditMode}}
+            <a class="item-control item-delete" data-action="delete" data-item-id="{{item._id}}" title="Delete Item"><i class="fas fa-trash"></i></a>
             {{/if}}
           </div>
         </li>
-        {{#each gear as |item id|}}
-          <li class="item flexrow flex-group-center" data-item-id="{{item._id}}">
-            <div class="item-name" style="flex:4;">
-              <div class="item-image">
-                <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" data-roll-type="item"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></a>
-              </div>
-              <a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.name}}</a>
-            </div>
-            <div><a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.system.quantity}}</a></div>
-            <div><a class="item-control item-edit" data-action="edit" data-item-id="{{item._id}}" title="Edit Item">{{item.system.weight}}</a></div>
-            <div class="item-controls">
-              {{#if @root.isEditMode}}
-              <a class="item-control item-delete" data-action="delete" data-item-id="{{item._id}}" title="Delete Item"><i class="fas fa-trash"></i></a>
-              {{/if}}
-            </div>
-          </li>
-        {{/each}}
-      </ol>
-    </div>
-    <div>
-      <h4>{{ localize 'IDENTITY.notes'}}</h4>
-      {{formInput systemFields.equipment.fields.description enriched=enrichedEquipmentNotes value=system.equipment.description name="system.equipment.description" toggled=true}}
-    </div>
+      {{/each}}
+    </ol>
+  </div>
+  <div class="vehicles">
+    <h4>{{localize 'ITEMS.vehicles'}}</h4>
+    {{> "systems/vermine2047/templates/actor/group/group-vehicles.hbs"}}
+  </div>
+  <div class="equipment-notes">
+    <h4>{{ localize 'IDENTITY.notes'}}</h4>
+    {{formInput systemFields.equipment.fields.description enriched=enrichedEquipmentNotes value=system.equipment.description name="system.equipment.description" toggled=true}}
   </div>
-  <h4>{{localize 'ITEMS.weapons'}}</h4>
-  {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
-  <h4>{{localize 'ITEMS.defenses'}}</h4>
-  {{> "systems/vermine2047/templates/actor/parts/actor-defenses.hbs"}}
-  <h4>{{localize 'ITEMS.vehicles'}}</h4>
-  {{> "systems/vermine2047/templates/actor/group/group-vehicles.hbs"}}
 </div>