diff --git a/templates/sheets/npc/main.hbs b/templates/sheets/npc/main.hbs
index aab7074..7347f25 100644
--- a/templates/sheets/npc/main.hbs
+++ b/templates/sheets/npc/main.hbs
@@ -16,7 +16,12 @@
 				<tr>
 					<td >{{localize "midgard5.class"}}</td>
 					<td >
-						<input name="data.info.npc-class" type="text" value="{{data.info.npc-class}}" data-dtype="String"  />
+						{{#each data.info.class as |class id|}}
+						<div class="chip" data-item-id="{{id}}">
+						<a class="edit-item" name="data.info.class" type="text" disabled="true" value=""  data-dtype="String">{{class}}</a>
+						<span><a class="closebtn item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></span>
+						</div>
+						{{/each}}
 					</td>
 					<td >{{localize "midgard5.level"}}</td>
 					<td>{{data.calc.level}}</td>
@@ -110,6 +115,9 @@
 	<nav class="sheet-navigation tabs" data-group="primary">
 		<a class="item active" data-tab="combat">{{ localize "midgard5.combat" }}</a>
 		<a class="item" data-tab="properties">{{ localize "midgard5.attributes" }}</a>
+		{{#if actor.system.info.magicUsing }}
+			<a class="item" data-tab="spells">{{ localize "midgard5.spells" }}</a>
+		{{/if}}
 		<a class="item" data-tab="description">{{ localize "midgard5.description" }}</a>
 	</nav>
 
@@ -121,6 +129,9 @@
 		<div class="tab properties flexcol" data-group="primary" data-tab="properties">
 			{{> "systems/midgard5/templates/sheets/npc/properties.hbs"}}
 		</div>
+		<div class="tab spells flexcol" data-group="primary" data-tab="spells">
+			{{> "systems/midgard5/templates/sheets/character/spells.hbs"}}
+		</div>
 		<div class="tab description flexcol" data-group="primary" data-tab="description">
 			{{> "systems/midgard5/templates/sheets/npc/description.hbs"}}
 		</div>