diff --git a/source/style/Character-sheet.less b/source/style/Character-sheet.less
index dd4dda2..68c3dcc 100644
--- a/source/style/Character-sheet.less
+++ b/source/style/Character-sheet.less
@@ -11,38 +11,41 @@
 
 	.flexcolumn {
 		flex-wrap: wrap;
+		flex-direction: column;
 	}
 
 	.flexcolumn-1 {
-		flex: 100%;
+		flex-basis: 100%;
 		flex-wrap: wrap;
 	}
 
 	.flexcolumn-2 {
-		flex: 50%;
+		flex-basis: 50%;
 		flex-wrap: wrap;
 	}
 
 	.flexcolumn-3 {
-		flex: 33%;
+		flex-basis: 33%;
 		flex-wrap: wrap;
 	}
 
 	.flexcolumn-4 {
-		flex: 25%;
+		flex-basis: 25%;
 		flex-wrap: wrap;
 	}
 
 	.flexcolumn-5 {
-		flex: 20%;
+		flex-basis: 20%;
 		flex-wrap: wrap;
 	}
 
 	.flexpart {
 		gap: 0;
 		padding: 0;
-		margin: 5px;
+		margin: 2px;
 		background-color: beige;
+		border-collapse: separate;
+		border-radius: 10px;
 		border: 2px solid black;
 	}
 
@@ -65,10 +68,15 @@
 
 	h3 {
 		padding: 0.5rem 0.5rem 0.5rem 0.5rem;
+		margin-top: 0.5rem;
+		margin-bottom: 0;
 		text-align: left;
 		font-weight: bold;
-		background-color: dimgray;
-		color: white;
+		background-color: #eeede0;
+		color: black;
+		border-collapse: separate;
+		border: 2px solid black;
+		border-radius: 10px;
 	}
 
 	.profile-img {
@@ -250,7 +258,8 @@
 		padding: 1px;
 		//align-items: stretch;
 
-		input {
+		input,
+		.max-value {
 			flex: 0 0 2rem;
 			text-align: center;
 			height: 100%;
diff --git a/templates/sheets/character/base_values.hbs b/templates/sheets/character/base_values.hbs
index 6ac423c..9aa2fd6 100644
--- a/templates/sheets/character/base_values.hbs
+++ b/templates/sheets/character/base_values.hbs
@@ -67,6 +67,12 @@
 						<td>{{localize "midgard5.movementRange"}}</td>
 						<td><input name="data.movement" type="text" value="{{data.movement}}" data-dtype="Number" /></td>
 					</tr>
+					<tr>
+						<td>{{localize "midgard5.actor-lp-short"}}</td>
+						<td><input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" /></td>
+						<td>{{localize "midgard5.actor-ap-short"}}</td>
+						<td><input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" /></td>
+					</tr>
 					<tr>
 						<td>{{localize "midgard5.brawl"}}</td>
 						<td class="fixed-value">{{data.calc.stats.brawl.value}}</td>
diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs
index a6705fb..fc2447d 100644
--- a/templates/sheets/character/combat.hbs
+++ b/templates/sheets/character/combat.hbs
@@ -114,33 +114,7 @@
 		</div>
 	</div>
 
-	<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>
-				<tr height = 10px></tr>
-				<tr>
-					<td>{{localize "midgard5.movementRange"}}</td>
-					<td class="fixed-value">{{data.calc.stats.movement.value}}</td>
-					<td>&nbsp;</td>
-					<td class="fixed-value">&nbsp;</td>
-				</tr>
-					<td>{{localize "midgard5.defense"}}</td>
-					<td class="fixed-value">{{data.calc.stats.defense.value}}</td>
-					<td>{{localize "midgard5.defenseBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.defenseBonus.value}}</td>
-				</tr>
-				<tr>
-					<td>{{localize "midgard5.damageBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.damageBonus.value}}</td>
-					<td>{{localize "midgard5.attackBonus"}}</td>
-					<td class="fixed-value">{{data.calc.stats.attackBonus.value}}</td>
-				</tr>
-			</table>
-		</div>
-	</div>
-
-	<div class="flexcolumn-3">
+	<div class="flexcolumn-2">
 		<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>
diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs
index d5ef84b..c5c0d24 100644
--- a/templates/sheets/character/gear.hbs
+++ b/templates/sheets/character/gear.hbs
@@ -1,6 +1,6 @@
+<h3>{{localize "midgard5.wealthAndContainers"}}</h3>
 <div class="flexbox">
 	<div class="flexcolumn-2">
-
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/commodities/currency/coins-assorted-mix-copper-silver-gold.webp" class="flexpart-icon">{{localize "midgard5.currency"}}</div>
 			<table>
@@ -29,51 +29,33 @@
 				</tbody>
 			</table>
 		</div>
+	</div>
 
+	<div class="flexcolumn-2">
 		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/containers/chest/chest-simple-box-brown.webp" class="flexpart-icon">{{localize "TYPES.Item.container"}}</div>
+			<div class="flexpart-header"><img src="icons/containers/bags/pack-leather-strapped-tan.webp" class="flexpart-icon">Lasten in Kilogramm</div>
 			<table>
 				<thead class="theader">
 					<tr>
-						<th class="title">{{localize "TYPES.Item.container"}}</th>
-						<th class="title center">{{localize "midgard5.item-value"}}</th>
-						<th class="title center">{{localize "midgard5.item-weight"}}</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>
-						<td><a class="title add-container"><i class="fa-regular fa-plus"></i></a></th>
+						<th class="title" style="text-align: center">{{localize "midgard5.load"}}</th>
+						<th class="title" style="text-align: center">{{localize "midgard5.heavy-load"}}</th>
+						<th class="title" style="text-align: center">{{localize "midgard5.load-max"}}</th>
+						<th class="title" style="text-align: center">{{localize "midgard5.thrust-load"}}</th>
+						<th class="title" style="text-align: center">{{localize "midgard5.encumbrance"}}</th>
 					</tr>
 				</thead>
-				<tbody>
+				<tfoot>
 					<tr height = 10px></tr>
-					{{#each data.calc.gear.containers as |item itemId|}}
-						<tr data-item="{{itemId}}">
-							<td class="padding">
-								<span class="edit-item">{{item.label}}</span>
-							</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
-								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
-								{{/unless}}
-							</td>
-							<td style="text-align: start">
-								{{#unless (or (eq item.weight "") (eq item.equipped?))}}
-								<span class="spell-process">{{item.weight}} kg</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>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
-							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
-						</tr>
-					{{/each}}
-				</tbody>
+					<tr>
+						<td class="fixed-value"><input type="number" name="data.info.load" value="{{data.calc.stats.load}}"></td>
+						<td class="fixed-value"><input type="number" name="data.info.heavyLoad" value="{{data.calc.stats.heavyLoad}}"></td>
+						<td class="fixed-value"><input type="number" name="data.info.loadMax" value="{{data.calc.stats.loadMax}}"></td>
+						<td class="fixed-value"><input type="number" name="data.info.thrustLoad" value="{{data.calc.stats.thrustLoad}}"></td>
+						<td class="fixed-value"><input type="number" name="data.info.encumbrance" value="{{data.calc.stats.encumbrance}}"></td>
+					</tr>
+				</tfoot>
 			</table>
-		</div>
+		</div>	
 	</div>
 </div>
 
@@ -230,6 +212,53 @@
 	<label for="data.info.showAllItems" style="font-size: normal; font-weight: normal; font-style: italic; float: right;">{{localize "midgard5.showAll"}}&nbsp;</label>
 </h3>
 <div class="flexbox">
+	<div class="flexcolumn-2">
+		<div class="flexpart">
+			<div class="flexpart-header"><img src="icons/containers/chest/chest-simple-box-brown.webp" class="flexpart-icon">{{localize "TYPES.Item.container"}}</div>
+			<table>
+				<thead class="theader">
+					<tr>
+						<th class="title">{{localize "TYPES.Item.container"}}</th>
+						<th class="title center">{{localize "midgard5.item-value"}}</th>
+						<th class="title center">{{localize "midgard5.item-weight"}}</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>
+						<td><a class="title add-container"><i class="fa-regular fa-plus"></i></a></th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr height = 10px></tr>
+					{{#each data.calc.gear.containers as |item itemId|}}
+						<tr data-item="{{itemId}}">
+							<td class="padding">
+								<span class="edit-item">{{item.label}}</span>
+							</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.value 0) (eq item.currency ""))}}
+								<span class="spell-process">{{item.value}} {{localize (m5concat "midgard5.currency-" item.currency)}}</span>
+								{{/unless}}
+							</td>
+							<td style="text-align: start">
+								{{#unless (or (eq item.weight "") (eq item.equipped?))}}
+								<span class="spell-process">{{item.weight}} kg</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>{{#if item.rollExist}}<button class="roll-button roll-consumable-item"></button>{{/if}}</td>
+							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
+						</tr>
+					{{/each}}
+				</tbody>
+			</table>
+		</div>
+	</div>
+
 	<div class="flexcolumn-2">
 		<div class="flexpart">
 			<div class="flexpart-header"><img src="icons/tools/hand/scale-balances-merchant-brown.webp" class="flexpart-icon">{{localize "midgard5.gear"}}</div>
@@ -288,7 +317,8 @@
 
 	<div class="flexcolumn-2">
 		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/weapons/swords/sword-guard-engraved-worn.webp" class="flexpart-icon">{{localize "midgard5.weapons"}}</div>
+			<div class="flexpart-header">
+				<img src="icons/weapons/swords/sword-guard-engraved-worn.webp" class="flexpart-icon">{{localize "midgard5.weapons"}}</div>
 			<table>
 				<thead>
 					<tr>
@@ -302,6 +332,7 @@
 				</thead>
 				<tbody>
 					{{#each data.calc.gear.weapons as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
 						<tr data-item="{{itemId}}">
 							<td class="padding edit-item">{{item.label}}</td>
 							<td style="text-align: start">
@@ -323,6 +354,7 @@
 							</td>
 							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
+					{{/if}}	
 					{{/each}}
 				</tbody>
 			</table>
@@ -344,6 +376,7 @@
 				</thead>
 				<tbody>
 					{{#each data.calc.gear.defensiveWeapons as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
 						<tr data-item="{{itemId}}">
 							<td class="padding edit-item">{{item.label}}</td>
 							<td style="text-align: start">
@@ -365,6 +398,7 @@
 							</td>
 							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
+					{{/if}}	
 					{{/each}}
 				</tbody>
 			</table>
@@ -386,6 +420,7 @@
 				</thead>
 				<tbody>
 					{{#each data.calc.gear.armor as |item itemId|}}
+					{{#if (or ../data.info.showAllItems (eq item.containerId ""))}}	
 						<tr data-item="{{itemId}}">
 							<td class="padding edit-item">{{item.label}}</td>
 							<td style="text-align: start">
@@ -407,36 +442,10 @@
 							</td>
 							<td><a class="item-delete" title="Delete Item"><i class="fas fa-trash"></i></a></td>
 						</tr>
+					{{/if}}	
 					{{/each}}
 				</tbody>
 			</table>
 		</div>
 	</div>
-
-	<div class="flexcolumn-2">
-		<div class="flexpart">
-			<div class="flexpart-header"><img src="icons/containers/bags/pack-leather-strapped-tan.webp" class="flexpart-icon">Lasten in Kilogramm</div>
-			<table>
-				<thead class="theader">
-					<tr>
-						<th class="title" style="text-align: center">{{localize "midgard5.load"}}</th>
-						<th class="title" style="text-align: center">{{localize "midgard5.heavy-load"}}</th>
-						<th class="title" style="text-align: center">{{localize "midgard5.load-max"}}</th>
-						<th class="title" style="text-align: center">{{localize "midgard5.thrust-load"}}</th>
-						<th class="title" style="text-align: center">{{localize "midgard5.encumbrance"}}</th>
-					</tr>
-				</thead>
-				<tfoot>
-					<tr height = 10px></tr>
-					<tr>
-						<td class="fixed-value"><input type="number" name="data.info.load" value="{{data.calc.stats.load}}"></td>
-						<td class="fixed-value"><input type="number" name="data.info.heavyLoad" value="{{data.calc.stats.heavyLoad}}"></td>
-						<td class="fixed-value"><input type="number" name="data.info.loadMax" value="{{data.calc.stats.loadMax}}"></td>
-						<td class="fixed-value"><input type="number" name="data.info.thrustLoad" value="{{data.calc.stats.thrustLoad}}"></td>
-						<td class="fixed-value"><input type="number" name="data.info.encumbrance" value="{{data.calc.stats.encumbrance}}"></td>
-					</tr>
-				</tfoot>
-			</table>
-		</div>	
-	</div>
 </div>
\ No newline at end of file
diff --git a/templates/sheets/character/main.hbs b/templates/sheets/character/main.hbs
index 7ca7632..1039fc3 100644
--- a/templates/sheets/character/main.hbs
+++ b/templates/sheets/character/main.hbs
@@ -89,7 +89,7 @@
 									<div class="lp-bar-item-empty update-lp" data-value="{{this}}"></div>
 								{{/if}}
 							{{/times}}
-							<input name="data.lp.max" type="text" value="{{data.lp.max}}" data-dtype="Number" />
+							<div class="max-value">{{data.lp.max}}</div>
 						</div>
 					</td>
 				</tr>
@@ -105,7 +105,7 @@
 									<div class="ap-bar-item-empty update-ap" data-value="{{this}}"></div>
 								{{/if}}
 							{{/times}}
-							<input name="data.ap.max" type="text" value="{{data.ap.max}}" data-dtype="Number" />
+							<div class="max-value">{{data.ap.max}}</div>
 						</div>
 					</td>
 				</tr>