diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js
index 146e247..688cae3 100644
--- a/module/actor/actor-sheet.js
+++ b/module/actor/actor-sheet.js
@@ -61,9 +61,7 @@ export default class DeltaGreenActorSheet extends ActorSheet {
     const data = super.getData();
 
     // Prepare items.
-    //if (this.actor.type === "agent") {
     this._prepareCharacterItems(data);
-    //}
 
     // Make it easy for the sheet handlebars to understand how to sort the skills.
     data.sortSkillsSetting = game.settings.get("deltagreen", "sortSkills");
diff --git a/templates/actor/equipment-partial.html b/templates/actor/equipment-partial.html
index 9d8b137..67c07f0 100644
--- a/templates/actor/equipment-partial.html
+++ b/templates/actor/equipment-partial.html
@@ -1,4 +1,4 @@
-
+{{!-- EQUIPMENT/ATTACKS/ABILITES SECTION USED ON ALL ACTOR SHEETS --}}
 {{!-- WEAPONS/ATTACKS --}}
 <div>
                         
@@ -9,8 +9,12 @@
     <ol class="items-list">
       
       <li class="item flexrow item-header">
-        <div class="item-image"></div>
-        <span class="">{{localize 'DG.Gear.Name'}} <a><i class="weapon-browse fas fa-search"></i></a></span>
+        <div class="item-image"></div>        
+        <span class="">
+            <a><i class="fa-solid fa-arrow-down-a-z"></i></a>
+            {{localize 'DG.Gear.Name'}} 
+            <a><i class="weapon-browse fas fa-search"></i></a>
+        </span>
         <span class="centered-item-property">{{localize 'DG.Gear.DamageOrLethality'}}</span>
         <span class="centered-item-property">{{localize 'DG.Gear.ArmorPiercing'}}</span>
         <div class="item-controls">
diff --git a/templates/actor/vehicle-sheet.html b/templates/actor/vehicle-sheet.html
index 57d186c..8512c35 100644
--- a/templates/actor/vehicle-sheet.html
+++ b/templates/actor/vehicle-sheet.html
@@ -77,33 +77,32 @@
               </div>
             </li>
   
-            {{#each actor.items as |item id|}}
-              {{#if_eq item.type 'armor'}}
-  
-                <li class="item flexrow" data-item-id="{{item.id}}">
-                  <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                  <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
-                  <span class="centered-item-property">{{item.system.protection}}</span>
-                  
-                  <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
-                    {{#if item.system.equipped}}
-                      <span class="fas fa-check"></span>
-                    {{else}}
-                      <span class="fas fa-times"></span>
-                    {{/if}}
-                  </span>
-  
-                  <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>
-  
-              {{/if_eq}}
+            {{#each actor.armor as |item id|}}
+              
+              <li class="item flexrow" data-item-id="{{item._id}}">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
+                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
+                <span class="centered-item-property">{{item.system.protection}}</span>
+                
+                <span class="equipped-item centered-item-property" data-id="{{item._id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}">
+                  {{#if item.system.equipped}}
+                    <span class="fas fa-check"></span>
+                  {{else}}
+                    <span class="fas fa-times"></span>
+                  {{/if}}
+                </span>
+
+                <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>
+                
             {{/each}}
   
           </ol>
         </div>
+
         <div>
   
           <div class="horizontal-bar-section-divider">
@@ -121,37 +120,38 @@
               </div>
             </li>
   
-            {{#each actor.items as |item id|}}
-              {{#if_eq item.type 'gear'}}
+            {{#each actor.gear as |item id|}}              
   
-                <li class="item flexrow" data-item-id="{{item.id}}">
-                  <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
+              <li class="item flexrow" data-item-id="{{item._id}}">
+
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
+                
+                <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
+
+                <span></span> <!-- This is just here to get things to align nicely with the other sections-->
+                
+                <span class="equipped-item centered-item-property" data-id="{{item._id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
                   
-                  <h4 style="word-wrap: break-word;" class="item-name">{{item.name}}</h4>
+                  {{#if item.system.equipped}}
+                    <span class="fas fa-check"></span>
+                  {{else}}
+                    <span class="fas fa-times"></span>
+                  {{/if}}
+                
+                </span>
+
+                <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>
   
-                  <span></span> <!-- This is just here to get things to align nicely with the other sections-->
-                  
-                  <span class="equipped-item centered-item-property" data-id="{{item.id}}" title="{{localize 'DG.Tooltip.ToggleEquippedState'}}" >
-                    
-                    {{#if item.system.equipped}}
-                      <span class="fas fa-check"></span>
-                    {{else}}
-                      <span class="fas fa-times"></span>
-                    {{/if}}
-                  
-                  </span>
-  
-                  <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>
-  
-              {{/if_eq}}
             {{/each}}
   
           </ol>
+
         </div>
+
       </div>
   
         {{!-- About Tab --}}
@@ -160,6 +160,7 @@
         </div>
   
     </section>
+
   </form>
   
   
\ No newline at end of file