diff --git a/templates/actors/parts/actor-inventory.html b/templates/actors/parts/actor-inventory.html
index f9b81c02..c9073429 100644
--- a/templates/actors/parts/actor-inventory.html
+++ b/templates/actors/parts/actor-inventory.html
@@ -1,6 +1,6 @@
-<div class="inventory-filters">
+<div class="inventory-filters flexrow">
 
-    {{#if isCharacter}}
+    {{#unless isNPC}}
     <ol class="currency flexrow">
         <h3>
             {{localize "SW5E.Currency"}}
@@ -11,15 +11,16 @@
         <input type="text" name="data.currency.{{k}}" value="{{v}}" data-dtype="Number"/>
         {{/each}}
     </ol>
-    {{/if}}
+    {{/unless}}
 
+    {{#unless isVehicle}}
     <ul class="filter-list flexrow" data-filter="inventory">
-        <li class="filter-title">{{localize "SW5E.Filter"}}</li>
         <li class="filter-item" data-filter="action">{{localize "SW5E.Action"}}</li>
         <li class="filter-item" data-filter="bonus">{{localize "SW5E.BonusAction"}}</li>
         <li class="filter-item" data-filter="reaction">{{localize "SW5E.Reaction"}}</li>
         <li class="filter-item" data-filter="equipped">{{localize "SW5E.Equipped"}}</li>
     </ul>
+    {{/unless}}
 </div>
 
 <ol class="inventory-list">
@@ -27,16 +28,23 @@
     <li class="inventory-header flexrow">
         <h3 class="item-name flexrow">{{localize section.label}}</h3>
 
+        {{#if section.columns}}
+            {{#each section.columns}}
+                <div class="item-detail {{css}}">{{label}}</div>
+            {{/each}}
+        {{else}}
         {{#if ../isCharacter}}
         <div class="item-detail item-weight">{{localize "SW5E.Weight"}}</div>
         {{/if}}
 
         <div class="item-detail item-uses">{{localize "SW5E.Charges"}}</div>
         <div class="item-detail item-action">{{localize "SW5E.Usage"}}</div>
+        {{/if}}
 
         {{#if ../owner}}
         <div class="item-controls">
-            <a class="item-control item-create" title='{{localize "SW5E.ItemCreate"}}' {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
+            <a class="item-control item-create" title='{{localize "SW5E.ItemCreate"}}'
+                {{#each section.dataset as |v k|}}data-{{k}}="{{v}}"{{/each}}>
                 <i class="fas fa-plus"></i> {{localize "SW5E.Add"}}
             </a>
         </div>
@@ -45,16 +53,35 @@
 
     <ol class="item-list">
     {{#each section.items as |item iid|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
-            <div class="item-name flexrow rollable">
-                <div class="item-image" style="background-image: url({{item.img}})"></div>
+    <li class="item flexrow {{section.css}}"
+    data-item-id="{{#if section.editableName}}{{iid}}{{else}}{{item._id}}{{/if}}">
+    <div class="item-name flexrow rollable">
+        {{#if section.editableName}}
+        <input type="text" value="{{item.name}}">
+        {{else}}
+        <div class="item-image" style="background-image: url({{item.img}})"></div>
                 <h4>
                     {{item.name~}}
                     {{~#if item.isStack}} ({{item.data.quantity}}){{/if}}
                     {{~#if item.data.attuned}} <i class="fas fa-sun attuned" title={{localize "SW5E.Attuned"}}></i>{{/if}}
                 </h4>
+                {{/if}}
             </div>
 
+            {{#if section.columns}}
+                {{#each section.columns}}
+                    <div class="item-detail {{css}}">
+                        {{#with (getProperty item property)}}
+                            {{#if ../editable}}
+                                <input type="text" value="{{this}}" placeholder="&mdash;"
+                                       data-dtype="{{../editable}}" data-property="{{../property}}">
+                            {{else}}
+                                {{this}}
+                            {{/if}}
+                        {{/with}}
+                    </div>
+                {{/each}}
+            {{else}}
             {{#if ../../isCharacter}}
             <div class="item-detail item-weight">
                 {{#if item.totalWeight}}
@@ -77,11 +104,16 @@
                 {{item.labels.activation}}
                 {{/if}}
             </div>
+            {{/if}}
 
             {{#if ../../owner}}
             <div class="item-controls">
+                {{#unless @root.isVehicle}}
                 <a class="item-control item-toggle {{item.toggleClass}}" title='{{item.toggleTitle}}'><i class="fas fa-shield-alt"></i></a>
+                {{/unless}}
+                {{#unless section.editableName}}
                 <a class="item-control item-edit" title='{{localize "SW5E.ItemEdit"}}'><i class="fas fa-edit"></i></a>
+                {{/unless}}
                 <a class="item-control item-delete" title='{{localize "SW5E.ItemDelete"}}'><i class="fas fa-trash"></i></a>
             </div>
             {{/if}}
@@ -92,7 +124,7 @@
 </ol>
 
 
-{{#if isCharacter }}
+{{#unless isNPC}}
 {{#with data.attributes.encumbrance}}
 <div class="encumbrance {{#if encumbered}}encumbered{{/if}}">
     <span class="encumbrance-bar" style="width:{{pct}}%"></span>
@@ -103,4 +135,4 @@
     <i class="encumbrance-breakpoint encumbrance-66 arrow-down"></i>
 </div>
 {{/with}}
-{{/if}}
+{{/unless}}