diff --git a/compendium-browser.js b/compendium-browser.js
index 6c596fd..4bcb971 100644
--- a/compendium-browser.js
+++ b/compendium-browser.js
@@ -20,7 +20,8 @@
             0.4.1c  Needed to pass specific spellFilters, itemFilters etc.    
             0.4.1d: Fixed img observer on replaced spellData        
 11-Feb-2021 0.4.1e: Don't save the filter data (which is most of the memory) and remove the preload limit; instead just save the minimal amount of data     
-            0.4.1g: Generalize the spell list reload and confirm spells still working         
+            0.4.1g: Generalize the spell list reload and confirm spells still working   
+            0.4.1h: Add the partials for npc, feat, item and the backing code      
 */
 
 const CMPBrowser = {
@@ -46,11 +47,13 @@ class CompendiumBrowser extends Application {
         });  //Plug 
         await loadTemplates([
             "modules/compendium-browser/template/spell-browser.html",
-            "modules/compendium-browser/template/spell-browser-list.html",
-//FIXME: Add -list partials for rendering the data separately            
+            "modules/compendium-browser/template/spell-browser-list.html",       
             "modules/compendium-browser/template/npc-browser.html",
+            "modules/compendium-browser/template/npc-browser-list.html",
             "modules/compendium-browser/template/feat-browser.html",
+            "modules/compendium-browser/template/feat-browser-list.html",
             "modules/compendium-browser/template/item-browser.html",
+            "modules/compendium-browser/template/item-browser-list.html",
             "modules/compendium-browser/template/filter-container.html",
             "modules/compendium-browser/template/settings.html"
         ]);
@@ -775,7 +778,7 @@ class CompendiumBrowser extends Application {
         } else if (itemType === 'npc') {
             items = html.find("ul#CBNPCs");
         } else if (itemType === 'feat') {
-            items = html.find("ul#CBSpells");
+            items = html.find("ul#CBFeats");
         } else if (itemType === 'item') {
             items = html.find("ul#CBItems");
         }
diff --git a/template/feat-browser-list.html b/template/feat-browser-list.html
new file mode 100644
index 0000000..35fdf09
--- /dev/null
+++ b/template/feat-browser-list.html
@@ -0,0 +1,17 @@
+{{#each feats as |feat id|}}
+<li class="feat flexrow draggable" data-entry-compendium="{{feat.compendium}}" data-entry-id="{{id}}">
+    <div class="item-image">
+        <img class="" data-src="{{feat.img}}" title="{{feat.name}}" width="32" height="32" />
+    </div>
+    <div class="item-name">
+        <span class="item-edit"><a>{{feat.name}}</a></span>
+    </div>
+    <div class="feat-tags">
+        <span title="Class Requirement">{{feat.classRequirementString}}</span>
+
+    </div>
+    <div class="filter-tags">
+        <input type="hidden" name="class" value="{{feat.classRequirementString}}">
+    </div>
+</li>
+{{/each}}
\ No newline at end of file
diff --git a/template/feat-browser.html b/template/feat-browser.html
index 34d8b94..2b3b493 100644
--- a/template/feat-browser.html
+++ b/template/feat-browser.html
@@ -15,24 +15,8 @@
         </div>
         {{> "modules/compendium-browser/template/filter-container.html" filters=featFilters}}
     </div>
-    <ul>
-        {{#each feats as |feat id|}}
-        <li class="feat flexrow draggable" data-entry-compendium="{{feat.compendium}}" data-entry-id="{{feat._id}}">
-            <div class="item-image">
-                <img class="" data-src="{{feat.img}}" title="{{feat.name}}" width="32" height="32"/>
-            </div>  
-            <div class="item-name">
-                <span class="item-edit" ><a>{{feat.name}}</a></span>
-            </div>
-            <div class="feat-tags">
-                <span title="Class Requirement">{{feat.classRequirementString}}</span>
-            
-            </div>
-            <div class="filter-tags">
-                <input type="hidden" name="class" value="{{feat.classRequirementString}}">
-            </div>
-        </li>
-        {{/each}}
+    <ul id="CBFeats">
+        {{> "modules/compendium-browser/template/feat-browser-list.html" feats=feats}}
     </ul>
 
 </div>
\ No newline at end of file
diff --git a/template/item-browser-list.html b/template/item-browser-list.html
new file mode 100644
index 0000000..4565fe2
--- /dev/null
+++ b/template/item-browser-list.html
@@ -0,0 +1,16 @@
+{{#each items as |item id|}}
+<li class="item flexrow draggable" data-entry-compendium="{{item.compendium}}" data-entry-id="{{id}}">
+    <div class="item-image">
+        <img class="" data-src="{{item.img}}" title="{{item.name}}" width="32" height="32" />
+    </div>
+    <div class="item-name">
+        <span class="item-edit"><a>{{item.name}}</a></span>
+    </div>
+    <div class="item-tags">
+        <span title="Item Type">{{item.type}}</span>
+    </div>
+    <div class="filter-tags">
+        <input type="hidden" name="type" value="{{item.type}}">
+    </div>
+</li>
+{{/each}}
\ No newline at end of file
diff --git a/template/item-browser.html b/template/item-browser.html
index 603fb56..659af6d 100644
--- a/template/item-browser.html
+++ b/template/item-browser.html
@@ -15,23 +15,8 @@
         </div>
         {{> "modules/compendium-browser/template/filter-container.html" filters=itemFilters}}
     </div>
-    <ul>
-        {{#each items as |item id|}}
-        <li class="item flexrow draggable" data-entry-compendium="{{item.compendium}}" data-entry-id="{{item._id}}">
-            <div class="item-image">
-                <img class="" data-src="{{item.img}}" title="{{item.name}}" width="32" height="32"/>
-            </div>  
-            <div class="item-name">
-                <span class="item-edit" ><a>{{item.name}}</a></span>
-            </div>
-            <div class="item-tags">
-                <span title="Item Type">{{item.type}}</span>
-            </div>
-            <div class="filter-tags">
-                <input type="hidden" name="type" value="{{item.type}}">
-            </div>
-        </li>
-        {{/each}}
+    <ul id="CBItems">
+        {{> "modules/compendium-browser/template/item-browser-list.html" items=items}}
     </ul>
 
 </div>
\ No newline at end of file
diff --git a/template/npc-browser-list.html b/template/npc-browser-list.html
new file mode 100644
index 0000000..f88929f
--- /dev/null
+++ b/template/npc-browser-list.html
@@ -0,0 +1,21 @@
+{{#each npcs as |npc id|}}
+<li class="npc flexrow draggable" data-entry-compendium="{{npc.compendium}}" data-entry-id="{{id}}">
+    <div class="npc-image">
+        <img class="" data-src="{{npc.img}}" title="{{npc.name}}" width="32" height="32" />
+    </div>
+    <div class="npc-line">
+        <div class="npc-name">
+            <span class="item-edit"><a>{{npc.name}}</a></span>
+        </div>
+        <div class="npc-tags">
+            <span class="cr-display" title="Challange Rating">CR {{npc.displayCR}}</span>
+            <span class="size-display">{{npc.displaySize}}</span>
+            <span class="type">{{npc.data.details.type.value}}</span>
+        </div>
+        <div class="filter-tags">
+            <input type="hidden" name="order.cr" value="{{npc.data.details.cr}}">
+            <input type="hidden" name="order.size" value="{{npc.filterSize}}">
+        </div>
+    </div>
+</li>
+{{/each}}
\ No newline at end of file
diff --git a/template/npc-browser.html b/template/npc-browser.html
index dc0af5f..ab86f44 100644
--- a/template/npc-browser.html
+++ b/template/npc-browser.html
@@ -16,28 +16,8 @@
         </div>                
         {{> "modules/compendium-browser/template/filter-container.html" filters=npcFilters}}
     </div>
-    <ul>
-        {{#each npcs as |npc id|}}
-        <li class="npc flexrow draggable" data-entry-compendium="{{npc.compendium}}" data-entry-id="{{npc._id}}">
-            <div class="npc-image">
-                <img class="" data-src="{{npc.img}}" title="{{npc.name}}" width="32" height="32" />
-            </div>
-            <div class="npc-line">
-                <div class="npc-name">
-                    <span class="item-edit"><a>{{npc.name}}</a></span>
-                </div>
-                <div class="npc-tags">
-                    <span class="cr-display" title="Challange Rating">CR {{npc.displayCR}}</span>
-                    <span class="size-display">{{npc.displaySize}}</span>
-                    <span class="type">{{npc.data.details.type.value}}</span>
-                </div>
-                <div class="filter-tags">
-                    <input type="hidden" name="order.cr" value="{{npc.data.details.cr}}">
-                    <input type="hidden" name="order.size" value="{{npc.filterSize}}">
-                </div>
-            </div>
-        </li>
-        {{/each}}
+    <ul id="CBNPCs">
+        {{> "modules/compendium-browser/template/npc-browser-list.html" npcs=npcs}}
     </ul>
 
 </div>
\ No newline at end of file