diff --git a/lang/de.json b/lang/de.json
index a12db20..21443eb 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -283,6 +283,7 @@
 		"rangedWeapon": "Schusswaffe",
 		"assignItemToCharacter": "Füge Gegenstand einem Charakter hinzu, um hier etwas auswählen zu können",
 		"showAll": "Alle anzeigen",
+		"showUnlearned": "Ungelernte Fertigkeiten",
 		"wealthAndWeight": "Vermögen und Lasten",
 		"itemsInContainers": "Gegenstände in Aufbewahrung",
 		"allItems": "Alle Gegenstände",
diff --git a/source/template.json b/source/template.json
index cc298e8..b337148 100644
--- a/source/template.json
+++ b/source/template.json
@@ -13,7 +13,6 @@
 					"npc-class": "",
 					"race": "",
 					"magicUsing": false,
-					"showAllItems": false,
 					"gender": "",
 					"weight": "",
 					"height": "",
@@ -26,7 +25,9 @@
 					"level": 1,
 					"gold": 0,
 					"silver": 0,
-					"copper": 0
+					"copper": 0,
+					"showAllItems": false,
+					"showUnlearned": false
 				}
 			},
 			"characterBars": {
diff --git a/templates/sheets/npc/combat.hbs b/templates/sheets/npc/combat.hbs
index 5802edb..91164f5 100644
--- a/templates/sheets/npc/combat.hbs
+++ b/templates/sheets/npc/combat.hbs
@@ -1,7 +1,7 @@
 
 <div class="flexbox">
 
-	<div class="flexcolumn-2">
+	<div class="flexcolumn-3">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/magic/time/arrows-circling-pink.webp" class="flexpart-icon">{{localize "midgard5.calculated-values"}}</div>
 			<table>
@@ -28,7 +28,7 @@
 		</div>
 	</div>
 
-	<div class="flexcolumn-2">
+	<div class="flexcolumn-3">
 		<div class="flexpart" style="padding: 0 0.5rem;">
 			<div class="flexpart-header">{{localize "midgard5.actionrank"}}</div>
 			<button class="wide-button join-combat">{{localize "midgard5.combat-join"}}</button>
@@ -37,7 +37,43 @@
 		</div>
 	</div>
 
-	<div class="flexcolumn-2">
+	<div class="flexcolumn-3">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/magic/life/cross-worn-green.webp" class="flexpart-icon">{{localize "TYPES.Item.effect"}}</div>
+			<table>
+				<thead>
+					<tr>
+						<th class="title"><img src="/icons/svg/eye.svg" class="table-icon"></th>
+						<th class="title">{{localize "TYPES.Item.effect"}}</th>
+						<td><a class="title add-effect"><i class="fa-regular fa-plus"></i></a></th>
+
+					</tr>
+				</thead>
+				<tbody class="items-list">
+					{{#each data.calc.gear.effects as |item itemId|}}
+						<tr data-item-id="{{itemId}}" class="items">
+							<td class="flexpart-img"><img src={{item.icon}} class="flexpart-icon"></td>
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+								{{#if item.equipped}}
+									<span class="spell-process">{{localize "midgard5.active"}}</span>
+									{{#unless (or (eq item.duration.unit "") (eq item.duration.unit "limitless"))}}
+										<span class="spell-process">{{item.duration.time}} {{localize (concat "midgard5.time-" item.duration.unit)}}</span>
+									{{/unless}}
+								{{/if}}
+							</td>
+							{{!--{{#unless (eq item.label "Belastung")}}--}}
+							<td class="fixed-value"><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+							{{!--{{/unless}}--}}
+						</tr>
+					{{/each}}
+				</tbody>
+			</table>		
+		</div>
+	</div>
+
+
+	<div class="flexcolumn-3">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/skills/melee/hand-grip-sword-white-brown.webp" class="flexpart-icon">{{localize "midgard5.attack"}}</div>
 			<table>
@@ -89,7 +125,7 @@
 		</div>
 	</div>
 
-	<div class="flexcolumn-2">
+	<div class="flexcolumn-3">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/skills/melee/shield-block-gray-orange.webp" class="flexpart-icon">{{localize "midgard5.defense"}}</div>
 			<table>
@@ -110,7 +146,6 @@
 					<td class="center">{{data.calc.stats.resistanceBody.value}}</td>
 					<td class="fixed-value"><button class="roll-button roll-resistanceBody-button"></button></td>
 				</tr>
-
 			</table>
 			<table>
 				<thead>
@@ -118,7 +153,6 @@
 						<th class="title"><img src="/icons/svg/eye.svg" class="table-icon"></th>
 						<th class="title">{{localize "TYPES.Item.defensiveWeapon"}}</th>
 						<th class="title">{{localize "midgard5.ew"}}</th>
-						<th class="title">{{localize "midgard5.defenseBonus-short"}}</th>
 						<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
 						<th><a class="title add-defensiveWeapon"><i class="fa-regular fa-plus"></i></a></th>
 					</tr>
@@ -129,7 +163,6 @@
 							<td class="flexpart-img"><img src={{item.icon}} class="flexpart-icon"></td>
 							<td class="padding edit-item">{{item.label}}</td>
 							<td class="fixed-value">{{item.calc.ew}}</td>
-							<td class="fixed-value">{{item.defenseBonus}}</td>
 							<td><button class="roll-button roll-weapon-button"></button></td>
 							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
@@ -161,38 +194,36 @@
 	</div>
 
 	{{#if actor.system.info.magicUsing }}
-	<div class="flexcolumn-2">
+	<div class="flexcolumn-3">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/magic/symbols/star-inverted-yellow.webp" class="flexpart-icon">{{localize "TYPES.Item.spell"}}</div>
+			<table>
+				<tr height = 10px></tr>
+				<tr>
+					<td class="padding highlight">{{localize "midgard5.spellCasting"}}</td>
+					<td class="center">{{data.calc.stats.spellCasting.value}}</td>
+					<td class="fixed-value"><button class="roll-button roll-defense-button"></button></td>
+				</tr>
+			</table>
 			<table>
 				<thead>
 					<tr>
+						<th class="title"><img src="/icons/svg/eye.svg" class="table-icon"></th>
 						<th class="title">{{localize "TYPES.Item.spell"}}</th>
-						<th class="title">{{localize "midgard5.spell-castDuration"}}</th>
-						<th class="title">{{localize "midgard5.actor-ap"}}</th>
 						<th class="title">{{localize "midgard5.ew"}}</th>
-						<th class="title center"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
 						<th class="title"><img src="/icons/svg/d20.svg" class="table-icon"></th>
+						<th><a class="title add-spell"><i class="fa-regular fa-plus"></i></a></th>
 					</tr>
 				</thead>
 				<tbody class="items-list">
 					{{#each data.calc.spells as |item itemId|}}
-						{{#if item.equipped}}
-						<tr data-item-id="{{itemId}}" class="item">
-							<td class="padding edit-item {{#if item.special}}highlight{{/if}}">{{item.label}}{{#if item.special}}(*){{/if}}</td>
-							<td class="fixed-value">{{item.castDuration}}</td>
-							<td class="fixed-value">{{item.ap}}</td>
-							<td class="fixed-value">{{item.calc.ew}}</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
-							<td><button class="roll-button roll-weapon-button"></button></td>
-						</tr>
-						{{/if}}	
+					<tr data-item-id="{{itemId}}" class="item">
+						<td class="flexpart-img"><img src={{item.icon}} class="flexpart-icon"></td>
+						<td class="padding edit-item {{#if item.special}}highlight{{/if}}">{{item.label}}{{#if item.special}}(*){{/if}}</td>
+						<td class="fixed-value">{{item.calc.ew}}</td>
+						<td><button class="roll-button roll-weapon-button"></button></td>
+						<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+					</tr>
 					{{/each}}
 				</tbody>
 			</table>
diff --git a/templates/sheets/npc/main.hbs b/templates/sheets/npc/main.hbs
index 39135f3..610f929 100644
--- a/templates/sheets/npc/main.hbs
+++ b/templates/sheets/npc/main.hbs
@@ -108,9 +108,6 @@
 	<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>
 
@@ -122,9 +119,6 @@
 		<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>
diff --git a/templates/sheets/npc/properties.hbs b/templates/sheets/npc/properties.hbs
index 56c10a8..08439b4 100644
--- a/templates/sheets/npc/properties.hbs
+++ b/templates/sheets/npc/properties.hbs
@@ -40,6 +40,8 @@
 
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/sundries/gaming/dice-pair-white-green.webp" class="flexpart-icon">{{localize "midgard5.skills"}}</div>
+			<input id="data.info.showUnlearned" class="checkbox" type="checkbox" name="data.info.showUnlearned" {{checked data.info.showUnlearned}} style="float: right;">
+			<label for="data.info.showUnlearned" style="font-size: small; font-weight: normal; font-style: italic; float: right;">{{localize "midgard5.showUnlearned"}}&nbsp;</label>
 			<table>
 				<thead>
 					<tr>
@@ -58,7 +60,7 @@
                             <td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
 					{{/each}}
-
+					{{#unless (not data.info.showUnlearned)}}					
 					{{#each data.skills.general as |skill key|}}
 						{{#unless (isSkillInList (localizeMidgard key) ../actor.system.calc.skills.general) }}
 							<tr data-skill="{{key}}">
@@ -69,6 +71,7 @@
 							</tr>
                         {{/unless}}
 					{{/each}}
+					{{/unless}}
 				</tbody>
 			</table>
 		</div>
@@ -83,7 +86,6 @@
 						<th class="title">{{localize "TYPES.Item.item"}}</th>
 						<th class="title center">{{localize "midgard5.item-quantity"}}</th>
 						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title"><img src="/systems/midgard5/assets/icons/icon/battle-gear.svg" class="table-icon"></th>
 						<td><a class="title add-item"><i class="fa-regular fa-plus"></i></a></th>
 					</tr>
 				</thead>
@@ -105,13 +107,6 @@
 								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
 								{{/unless}}
 							</td>
-							<td class="change-equipped">
-								{{#if item.equipped}}
-									<i class="fa-solid fa-circle-check"></i>
-								{{else}}
-									<i class="fa-regular fa-circle"></i>
-								{{/if}}
-							</td>
 							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
 					{{/each}}