diff --git a/Runecairn/runecairn-preview.png b/Runecairn/runecairn-preview.png
index 47c79ce483..3b28b8fccd 100644
Binary files a/Runecairn/runecairn-preview.png and b/Runecairn/runecairn-preview.png differ
diff --git a/Runecairn/runecairn-sheet.html b/Runecairn/runecairn-sheet.html
index 6d4bc78cdf..bb687e4199 100644
--- a/Runecairn/runecairn-sheet.html
+++ b/Runecairn/runecairn-sheet.html
@@ -1,52 +1,16 @@
 <span class="title"><img style="max-height: 50px;" src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Runecairn/runecairn_roll20_logo.png"></span>
-    <div class="stats-column-wide">        
+
+    <div class="stats-wide">        
 		<div class="flex-container">
             <div class="stat-title ability-title" data-i18n="name-u"></div>
             <div class="stat-inputs-name flex-container">
                 <input class="stat-input-name" type="text" name="attr_name" />
             </div>
-		<div class="horizontal-separator"></div>
-            <div class="stat-title ability-title" data-i18n="vigour-u"></div>
-            <div class="stat-inputs-30 flex-container">
-                <input class="stat-input" type="text" name="attr_vigour" />
-            </div>
-		<div class="horizontal-separator"></div>
-            <div class="stat-title ability-title" data-i18n="speed-u"></div>
-            <div class="stat-inputs-30 flex-container">
-                <input class="stat-input" type="text" name="attr_speed" />
-            </div>					
-		<div class="horizontal-separator"></div>
-            <div class="stat-title ability-title" data-i18n="souls-u"></div>
-            <div class="stat-inputs-45 flex-container">
-                <input class="stat-input-45" type="text" name="attr_souls" />
-            </div>
         </div>
+	</div>
 		<div class="vertical-separator"></div>
 <div class="flex-container">	
     <div class="stats-column">
-        <div class="flex-container">
-            <div class="stat-title ability-title-170" data-i18n="base-hit-points-u"></div>
-            <div class="stat-inputs-30 flex-container">
-				<input class="stat-input list-input-souls" type="text" name="attr_base_hp"  />
-            </div>
-        </div>		
-		<div class="vertical-separator"></div>		
-        <div class="flex-container">
-            <div class="stat-title ability-title-130" data-i18n="hit-points-u"></div>
-            <div class="stat-inputs flex-container">
-                <input class="stat-input" type="text" name="attr_ability_hit_points" />
-                <div class="stat-input-separator"></div>
-                <input class="stat-input" type="text" name="attr_total_hp" readonly />
-            </div>
-        </div>
-		<div class="vertical-separator"></div>
-        <div class="flex-container">
-            <div class="stat-title ability-title-170" data-i18n="defence-u"></div>
-            <div class="stat-inputs-30 flex-container">
-				<input class="stat-input list-input-souls" type="text" name="attr_ability_defence" readonly />
-            </div>
-        </div>		
-        <div class="vertical-separator"></div>
         <div class="flex-container">
             <button class="custom-roll-button" type="roll"
                 value="&{template:test-under} {{rollname=Save - Strength}} {{result=[[1d20]]}} {{target=[[@{ability_strength}]]}}"
@@ -98,15 +62,17 @@
                 <input class="stat-input" type="text" name="attr_ability_spirit_max" />
             </div>
         </div>
-		<div class="vertical-separator"></div>		
-        <div class="flex-container">
-            <div class="stat-title ability-title-130" data-i18n="inventory-u"></div>
-            <div class="stat-inputs flex-container">
-                <input class="stat-input" type="text" name="attr_current_inventory" value="( @{key_item_bulk_1} + @{key_item_bulk_2} + @{weapon1_bulk_1} + @{weapon1_bulk_2} + @{weapon2_bulk_1} + @{weapon2_bulk_2} +  @{armour1_bulk_1} + @{armour1_bulk_2} + @{armour2_bulk_1} + @{armour2_bulk_2} + @{armour3_bulk_1} + @{armour3_bulk_2} + @{item1_bulk_1} + @{item1_bulk_2} + @{item2_bulk_1} + @{item2_bulk_2} + @{item3_bulk_1} + @{item3_bulk_2} + @{item4_bulk_1} + @{item4_bulk_2} + @{item5_bulk_1} + @{item5_bulk_2} + @{item6_bulk_1} + @{item6_bulk_2} + @{item7_bulk_1} + @{item7_bulk_2} + @{item8_bulk_1} + @{item8_bulk_2} + @{item9_bulk_1} + @{item9_bulk_2} + @{item10_bulk_1} + @{item10_bulk_2} + @{fatigue_bulk_1} + @{fatigue_bulk_2} + @{fatigue_bulk_3} + @{fatigue_bulk_4} + @{fatigue_bulk_5} + @{fatigue_bulk_6} + @{fatigue_bulk_7} + @{fatigue_bulk_8} + @{fatigue_bulk_9} + @{fatigue_bulk_10} )" disabled readonly />
-				<div class="stat-input-separator"></div>
-                <input class="stat-input" type="text" name="attr_ability_inventory_max" />
-            </div>
+		<div class="vertical-separator"></div>
+        <div class="list-title">
+            <div class="grid-100-percent" data-i18n="status-u"></div>		
         </div>
+		<div class="stat-inputs-block flex-container checkbox-fix">	
+			<div class="vertical-separator"></div>		
+			<div class="stat-title-inverted grid-30-percent" data-i18n="deprived-u"></div>		
+			<input type="checkbox" class="grid-10-percent" name="attr_deprived" value="1">	
+			<div class="stat-title-inverted grid-30-percent" data-i18n="cursed-u"></div>	
+			<input type="checkbox" class="grid-10-percent" name="attr_cursed" value="1">
+		</div>		
 		<div class="vertical-separator"></div>
         <div class="list-title">
             <div class="grid-100-percent" data-i18n="fatigue-u"></div>		
@@ -125,40 +91,109 @@
 				<input type="checkbox" class="grid-10-percent" name="attr_fatigue_bulk_9" value="1">
 				<input type="checkbox" class="grid-10-percent" name="attr_fatigue_bulk_10" value="1">
 				<div class="vertical-separator"></div>
-			</div>
-		<div class="vertical-separator"></div>
-        <div class="list-title">
-            <div class="grid-100-percent" data-i18n="mead-u"></div>		
+			</div>		
+		<div class="vertical-separator"></div>	
+        <div class="list-space"></div>		
+<!-- Inventory -->		
+        <div class="flex-container">
+            <div class="stat-title ability-title-130" data-i18n="inventory-u"></div>
+            <div class="stat-inputs flex-container">
+                <input class="stat-input" type="text" name="attr_current_inventory" value="( @{key_item_bulk_1} + @{key_item_bulk_2} + @{weapon1_bulk_1} + @{weapon1_bulk_2} + @{weapon2_bulk_1} + @{weapon2_bulk_2} + @{armour1_bulk_1} + @{armour1_bulk_2} + @{shield_bulk_1} + @{shield_bulk_2} + @{item1_bulk_1} + @{item1_bulk_2} + @{item2_bulk_1} + @{item2_bulk_2} + @{item3_bulk_1} + @{item3_bulk_2} + @{item4_bulk_1} + @{item4_bulk_2} + @{item5_bulk_1} + @{item5_bulk_2} + @{item6_bulk_1} + @{item6_bulk_2} + @{item7_bulk_1} + @{item7_bulk_2} + @{item8_bulk_1} + @{item8_bulk_2} + @{item9_bulk_1} + @{item9_bulk_2} + @{item10_bulk_1} + @{item10_bulk_2} + @{fatigue_bulk_1} + @{fatigue_bulk_2} + @{fatigue_bulk_3} + @{fatigue_bulk_4} + @{fatigue_bulk_5} + @{fatigue_bulk_6} + @{fatigue_bulk_7} + @{fatigue_bulk_8} + @{fatigue_bulk_9} + @{fatigue_bulk_10} )" disabled readonly />
+				<div class="stat-input-separator"></div>
+                <input class="stat-input" type="text" name="attr_ability_inventory_max" />
+            </div>		
         </div>
-			<div class="stat-inputs-block list-input-center-aligned">
-				<div class="vertical-separator"></div>			
-				<input type="checkbox" class="grid-10-percent" name="attr_mead_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_mead_2" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_mead_3" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_mead_4" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_mead_5" value="1">
-				<div class="vertical-separator"></div>
-			</div>
-		<div class="vertical-separator"></div>
-        <div class="list-title">
-            <div class="grid-100-percent" data-i18n="status-u"></div>		
-        </div>
-		<div class="stat-inputs-block flex-container checkbox-fix">	
-			<div class="vertical-separator"></div>		
-			<div class="stat-title-inverted grid-30-percent" data-i18n="deprived-u"></div>		
-			<input type="checkbox" class="grid-10-percent" name="attr_deprived" value="1">	
-			<div class="stat-title-inverted grid-30-percent" data-i18n="cursed-u"></div>	
-			<input type="checkbox" class="grid-10-percent" name="attr_cursed" value="1">
-		</div>
+			
     </div>
-    <div class="horizontal-separator"></div>
+<div class="horizontal-separator"></div>
+<!-- Column 2 -->
     <div class="stats-wide">
-        <!-- Weapons -->
+<!-- HP -->
+        <div class="flex-container">
+            <div class="stat-title ability-title" data-i18n="hit-points-u"></div>
+            <div class="stat-inputs flex-container">
+                <input class="stat-input" type="text" name="attr_ability_hit_points" />
+                <div class="stat-input-separator"></div>
+                <input class="stat-input" type="text" name="attr_total_hp" readonly />
+            </div>
+		<div class="horizontal-separator"></div>
+            <div class="stat-title ability-title" data-i18n="speed-u"></div>
+            <div class="stat-inputs-30 flex-container">
+                <input class="stat-input" type="text" name="attr_speed" />
+            </div>
+		<div class="horizontal-separator"></div>
+			<div "class=flex-container">
+            <div class="stat-title ability-title" data-i18n="souls-u"></div>
+            <div class="stat-inputs-45 flex-container">
+                <input class="stat-input-45" type="text" name="attr_souls" />
+            </div>	
+			</div>													
+        </div>
+		<div class="vertical-separator"></div>		
+        <div class="flex-container">		
+            <div class="stat-title ability-title" data-i18n="vigour-u"></div>
+            <div class="stat-inputs-30 flex-container">
+                <input class="stat-input" type="text" name="attr_vigour" />
+            </div>
+		<div class="horizontal-separator"></div>			
+        <div class="flex-container">
+            <div class="stat-title ability-title" data-i18n="vitality-u"></div>
+            <div class="stat-inputs-30 flex-container">
+				<input class="stat-input list-input-souls" type="text" name="attr_vitality"  />
+            </div>
+        </div>
+		<div class="horizontal-separator"></div>			
+            <div class="stat-title ability-title" data-i18n="defence-u"></div>
+            <div class="stat-inputs-30 flex-container">
+				<input class="stat-input list-input-souls" type="text" name="attr_ability_defence" readonly />
+        </div>			
+	</div>
+        <!-- Shield -->
+		<div class="vertical-separator"></div>			
+        <div class="list-title">
+            <div class="grid-60-percent" data-i18n="shield-u"></div>
+            <div class="grid-20-percent list-input-right-aligned" data-i18n="bonus-u"></div>
+            <div class="grid-20-percent" data-i18n="slots-u"></div>					
+        </div>		
+            <div class="list-row">
+                <input type="text" class="list-input grid-70-percent" name="attr_shield" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_shield_bonus" />
+				<input type="checkbox" class="grid-10-percent" name="attr_shield_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_shield_bulk_2" value="1">				
+            </div>		
+        <!-- Armour -->
+		<div class="vertical-separator"></div>			
+        <div class="list-title">
+            <div class="grid-60-percent" data-i18n="armour-u"></div>
+            <div class="grid-20-percent list-input-right-aligned" data-i18n="bonus-u"></div>
+            <div class="grid-20-percent" data-i18n="slots-u"></div>					
+        </div>		
+            <div class="list-row">
+                <input type="text" class="list-input grid-70-percent" name="attr_armour1" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_armour_bonus1" />
+				<input type="checkbox" class="grid-10-percent" name="attr_armour1_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_armour1_bulk_2" value="1">				
+            </div>	
+        <!-- Key Item -->
+		<div class="vertical-separator"></div>		
+        <div class="list-title">
+            <div class="grid-80-percent" data-i18n="key-item-u"></div>
+            <div class="grid-20-percent">
+                <div class="list-input-center-aligned" data-i18n="slots-u"></div>
+            </div>			
+        </div>	
+				<div class="list-row">
+                <input type="text" class="list-input list-input-inline-half grid-80-percent" name="attr_key_item" />			
+				<input type="checkbox" class="grid-10-percent" name="attr_key_item_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_key_item_bulk_2" value="1">
+				 </div>
+		<div class="vertical-separator"></div>		
+        <!-- Weapons -->				
         <div class="list-title">
             <div class="grid-60-percent" data-i18n="weapon-u"></div>
             <div class="grid-20-percent" data-i18n="damage-u"></div>
             <div class="grid-20-percent" data-i18n="slots-u"></div>	
-        </div>
+        </div>			
 		<div class="vertical-separator"></div>
 			<div class="flex-container">
 				<button class="custom-roll-button" type="roll"
@@ -186,116 +221,109 @@
 				<input type="checkbox" class="grid-10-percent"  name="attr_weapon2_bulk_1" value="1">
 				<input type="checkbox" class="grid-10-percent"  name="attr_weapon2_bulk_2" value="1">
 				</div>
-			</div>
-		<div class="vertical-separator"></div>	
-        <!-- Armour -->
-        <div class="list-title">
-            <div class="grid-70-percent" data-i18n="armour-u"></div>
-            <div class="grid-10-percent">
-                <div data-i18n="armour-bonus-u"></div>
-            </div>
-        </div>		
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_armour1" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_armour_bonus1" />
-				<input type="checkbox" class="grid-10-percent" name="attr_armour1_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_armour1_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_armour2" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_armour_bonus2" />
-				<input type="checkbox" class="grid-10-percent" name="attr_armour2_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_armour2_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_armour3" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_armour_bonus3"  />
-				<input type="checkbox" class="grid-10-percent" name="attr_armour3_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_armour3_bulk_2" value="1">				
-            </div>		
-		<div class="vertical-separator"></div>			
-		<!-- Items 1 -->
-        <div class="list-title">
-            <div class="grid-70-percent" data-i18n="item-u"></div>
-            <div class="grid-10-percent">
-                <div data-i18n="quantity-u"></div>
-            </div>
+			</div>				
+    </div>
+    <div class="horizontal-separator"></div>
+    <div class="stats-column">
+<!-- Column 3 -->
+<!-- Mead -->			
+        <div class="flex-container">
+            <div class="stat-title mead-title" data-i18n="mead-u"></div>		
         </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
+			<div class="stat-inputs-mead list-input-center-aligned">
+				<div class="vertical-separator"></div>						
+				<div class="mead-list"><input type="checkbox" name="attr_mead_1" value="1"></div>
+				<div class="vertical-separator"></div>						
+				<div class="mead-list"><input type="checkbox" name="attr_mead_2" value="1"></div>
+				<div class="vertical-separator"></div>						
+				<div class="mead-list"><input type="checkbox" name="attr_mead_3" value="1"></div>
+				<div class="vertical-separator"></div>						
+				<div class="mead-list"><input type="checkbox" name="attr_mead_4" value="1"></div>
+				<div class="vertical-separator"></div>						
+				<div class="mead-list"><input type="checkbox" name="attr_mead_5" value="1"></div>
+				<div class="vertical-separator"></div>
+			</div>	
+    </div>
+</div>
+<!-- Row 2 -->
+<div class="flex-container">
+	<div class="stats-wide">
+<!-- Items 1 -->
+		<div class="vertical-separator"></div>			
+        <div class="list-title">
+            <div class="grid-60-percent" data-i18n="item-u"></div>
+            <div class="grid-20-percent list-input-right-aligned" data-i18n="quantity-u"></div>
+            <div class="grid-20-percent" data-i18n="slots-u"></div>			
+        </div>
+            <div class="list-inv">
                 <input type="text" class="list-input grid-70-percent" name="attr_item1" />
                 <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty1" />
 				<input type="checkbox" class="grid-10-percent" name="attr_item1_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item1_bulk_2" value="1">				
+				<input type="checkbox" class="grid-10-percent" name="attr_item1_bulk_2" value="1">
             </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
+            <div class="list-inv">
                 <input type="text" class="list-input grid-70-percent" name="attr_item2" />
                 <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty2" />
 				<input type="checkbox" class="grid-10-percent" name="attr_item2_bulk_1" value="1">
 				<input type="checkbox" class="grid-10-percent" name="attr_item2_bulk_2" value="1">				
             </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
+            <div class="list-inv">
                 <input type="text" class="list-input grid-70-percent" name="attr_item3" />
                 <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty3" />
 				<input type="checkbox" class="grid-10-percent" name="attr_item3_bulk_1" value="1">
 				<input type="checkbox" class="grid-10-percent" name="attr_item3_bulk_2" value="1">				
             </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
+            <div class="list-inv">
                 <input type="text" class="list-input grid-70-percent" name="attr_item4" />
                 <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty4" />
 				<input type="checkbox" class="grid-10-percent" name="attr_item4_bulk_1" value="1">
 				<input type="checkbox" class="grid-10-percent" name="attr_item4_bulk_2" value="1">				
             </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
+            <div class="list-inv">
                 <input type="text" class="list-input grid-70-percent" name="attr_item5" />
                 <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty5" />
 				<input type="checkbox" class="grid-10-percent" name="attr_item5_bulk_1" value="1">
 				<input type="checkbox" class="grid-10-percent" name="attr_item5_bulk_2" value="1">				
             </div>
-		        <!-- Notes -->
-		<div class="vertical-separator"></div>        
-		<div class="list-title">
-            <div class="grid-100-percent" data-i18n="notes-u"></div>
-        </div>
-        <fieldset class="repeating_arcanas">		
-            <div class="list-textarea-row">
-                <textarea class="list-textarea grid-100-percent" name="attr_notes" rows="2"></textarea>
+            <div class="list-inv">
+                <input type="text" class="list-input grid-70-percent" name="attr_item6" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty6" />
+				<input type="checkbox" class="grid-10-percent" name="attr_item6_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_item6_bulk_2" value="1">				
             </div>
-		</fieldset>				
-    </div>
-    <div class="horizontal-separator"></div>
-    <div class="stats-wide">
-        <!-- Key Items -->
-        <div class="list-title">
-            <div class="grid-80-percent" data-i18n="key-item-u"></div>
-            <div class="grid-10-percent">
-                <div class="list-input-right-aligned" data-i18n="slots-u"></div>
-            </div>			
-        </div>	
-		<div class="vertical-separator"></div>	
-				<div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_key_item" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_key_item_hp"  />				
-				<input type="checkbox" class="grid-10-percent" name="attr_key_item_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_key_item_bulk_2" value="1">				
-				 </div>
-		<div class="vertical-separator"></div>			
-        <!-- Skills/Spells -->
-        <div class="list-title">
-            <div class="grid-70-percent" data-i18n="skills-spells-u"></div>
-            <div class="grid-10-percent">
-                <div data-i18n="damage-u"></div>
+            <div class="list-inv">
+                <input type="text" class="list-input grid-70-percent" name="attr_item7" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty7" />
+				<input type="checkbox" class="grid-10-percent" name="attr_item7_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_item7_bulk_2" value="1">				
             </div>
-            <div class="grid-10-percent">
-                <div data-i18n="fatigue-u"></div>
-            </div>			
+            <div class="list-inv">
+                <input type="text" class="list-input grid-70-percent" name="attr_item8" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty8" />
+				<input type="checkbox" class="grid-10-percent" name="attr_item8_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_item8_bulk_2" value="1">				
+            </div>
+            <div class="list-inv">
+                <input type="text" class="list-input grid-70-percent" name="attr_item9" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty9" />
+				<input type="checkbox" class="grid-10-percent" name="attr_item9_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_item9_bulk_2" value="1">				
+            </div>
+            <div class="list-inv">
+                <input type="text" class="list-input grid-70-percent" name="attr_item10" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty10" />
+				<input type="checkbox" class="grid-10-percent" name="attr_item10_bulk_1" value="1">
+				<input type="checkbox" class="grid-10-percent" name="attr_item10_bulk_2" value="1">				
+            </div>
+		</div>	
+<div class="horizontal-separator"></div>			
+<!-- Skills/Spells -->
+	<div class="stats-wide">
+	<div class="vertical-separator"></div>		
+        <div class="list-title">
+            <div class="grid-60-percent" data-i18n="skills-spells-u"></div>
+            <div class="grid-20-percent list-input-right-aligned" data-i18n="damage-u"></div>
+            <div class="grid-20-percent" data-i18n="fatigue-u"></div>			
         </div>
 		<div class="vertical-separator"></div>
 		<div class="flex-container">
@@ -348,53 +376,32 @@
                  name="attr_skill_dmg4" />
 				<input type="checkbox" class="grid-10-percent" name="attr_skill4_fatigue" value="1">				 
 				 </div>				 
+        </div>		
+        <div class="vertical-separator"></div>		
+		<div class="flex-container">
+				<button class="custom-roll-button" type="roll"
+                value="&{template:test-damage} {{rollname=@{name}: @{skill5}}} {{result=[[@{skill_dmg5}]]}}"
+                name="roll_skill5"></button>
+				<div class="horizontal-separator"></div>
+				<div class="list-row">
+                <input type="text" class="list-input grid-70-percent" name="attr_skill5" />
+                <input type="text" class="list-input-inline list-input-center-aligned grid-20-percent"
+                 name="attr_skill_dmg5" />
+				<input type="checkbox" class="grid-10-percent" name="attr_skill5_fatigue" value="1">				 
+				 </div>				 
         </div>
-        <div class="vertical-separator"></div>			
-		<!-- Items 2 -->
-        <div class="list-title">
-            <div class="grid-70-percent" data-i18n="item-u"></div>
-            <div class="grid-10-percent">
-                <div data-i18n="quantity-u"></div>
+	<!-- Notes -->    
+        <div class="vertical-separator"></div>		
+		<div class="list-title">
+            <div class="grid-100-percent" data-i18n="notes-u"></div>
+        </div>
+        <fieldset class="repeating_arcanas">		
+            <div class="list-textarea-row">
+                <textarea class="list-textarea grid-100-percent" name="attr_notes" rows="2"></textarea>
             </div>
-        </div>			
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_item6" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty6" />
-				<input type="checkbox" class="grid-10-percent" name="attr_item6_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item6_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_item7" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty7" />
-				<input type="checkbox" class="grid-10-percent" name="attr_item7_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item7_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_item8" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty8" />
-				<input type="checkbox" class="grid-10-percent" name="attr_item8_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item8_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_item9" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty9" />
-				<input type="checkbox" class="grid-10-percent" name="attr_item9_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item9_bulk_2" value="1">				
-            </div>
-		<div class="vertical-separator"></div>
-            <div class="list-row">
-                <input type="text" class="list-input grid-70-percent" name="attr_item10" />
-                <input type="text" class="list-input-inline list-input-center-aligned grid-10-percent" name="attr_item_qty10" />
-				<input type="checkbox" class="grid-10-percent" name="attr_item10_bulk_1" value="1">
-				<input type="checkbox" class="grid-10-percent" name="attr_item10_bulk_2" value="1">				
-            </div>			
-    </div>
+		</fieldset>			
+	</div>	
 </div>
-
 <rolltemplate class="sheet-rolltemplate-test-under">
     <div class="sheet-template-container">
         <div class="sheet-template-header">{{rollname}}</div>
@@ -428,12 +435,11 @@
 </rolltemplate>
 
 <script type="text/worker">
-on("sheet:opened change:armour_bonus1 change:armour_bonus2 change:armour_bonus3", function() {
-    getAttrs(["ARMOUR_BONUS1", "ARMOUR_BONUS2", "ARMOUR_BONUS3"], function(values) {
+on("sheet:opened change:armour_bonus1 change:shield_bonus", function() {
+    getAttrs(["ARMOUR_BONUS1", "SHIELD_BONUS"], function(values) {
 		let armour_bonus1 = parseInt(values.ARMOUR_BONUS1)||0;
-		let armour_bonus2 = parseInt(values.ARMOUR_BONUS2)||0;
-		let armour_bonus3 = parseInt(values.ARMOUR_BONUS3)||0;
-		let def = armour_bonus1 + armour_bonus2 + armour_bonus3;
+		let shield_bonus = parseInt(values.SHIELD_BONUS)||0;
+		let def = armour_bonus1 + shield_bonus;
         setAttrs({
             ability_defence: def
         });
@@ -442,12 +448,11 @@ on("sheet:opened change:armour_bonus1 change:armour_bonus2 change:armour_bonus3"
 </script>
 
 <script type="text/worker">
-on("sheet:opened change:key_item_hp change:base_hp change:vigour", function() {
-    getAttrs(["KEY_ITEM_HP", "BASE_HP", "VIGOUR"], function(values) {
-		let key_item_hp = parseInt(values.KEY_ITEM_HP)||0;
-		let base_hp = parseInt(values.BASE_HP)||0;
+on("sheet:opened change:vitality change:vigour", function() {
+    getAttrs(["VITALITY", "VIGOUR"], function(values) {
+		let vitality = parseInt(values.VITALITY)||0;
 		let vigour = parseInt(values.VIGOUR)||0;
-		let thp = key_item_hp + base_hp + vigour;
+		let thp = vitality + vigour;
         setAttrs({
             total_hp: thp
         });
diff --git a/Runecairn/runecairn-style.css b/Runecairn/runecairn-style.css
index e23f35c5ed..8760d756e5 100644
--- a/Runecairn/runecairn-style.css
+++ b/Runecairn/runecairn-style.css
@@ -51,6 +51,10 @@ button[type="roll"] {
     width: 200px;
 }
 
+.sheet-stats-medium {
+    width: 300px;
+}
+
 .sheet-stats-wide {
     width: 400px;
 }
@@ -78,6 +82,14 @@ button[type="roll"] {
     text-align: left;
 }
 
+.sheet-mead-title {
+    width: 40px;
+}
+
+.sheet-mead-list {
+    width: 58px;
+}
+
 .sheet-ability-title {
     width: 80px;
 }
@@ -103,6 +115,13 @@ button[type="roll"] {
 	vertical-align: middle;
 }
 
+.sheet-stat-inputs-mead {
+    background-color: white;
+    border: 1px solid black;
+	vertical-align: middle;
+	width: 58px;
+}
+
 .sheet-stat-inputs-name {
     background-color: white;
     border: 1px solid black;
@@ -174,6 +193,12 @@ button[type="roll"] {
     height: 24px !important;
 }
 
+.sheet-list-space {
+    border: none;
+    border-radius: 0px;
+    height: 32px !important;
+}
+
 .sheet-list-textarea {
     border: none;
     border-radius: 0px;
@@ -200,6 +225,14 @@ button[type="roll"] {
     font-size: 0px;
 }
 
+.sheet-list-inv {
+    border-top: 0px;
+	border-bottom: 1px solid black;
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+    font-size: 0px;
+}
+
 .sheet-list-input {
     background-color: white;
     padding-bottom: 0px;
@@ -215,6 +248,14 @@ button[type="roll"] {
 	background-color: white;
 }
 
+.sheet-list-input-inline-half {
+	border-radius: 0px;
+    border-top: 0px;
+    border-bottom: 0px;
+	border-right: 1px dotted grey;
+	background-color: white;
+}
+
 .sheet-list-input-field {
     background-color: white;
     padding-bottom: 0px;
@@ -255,6 +296,10 @@ button[type="roll"] {
     width: 50%;
 }
 
+.sheet-grid-30-percent {
+    width: 30%;
+}
+
 .sheet-grid-20-percent {
     width: 20%;
 }
diff --git a/Runecairn/runecairn_roll20_logo.png b/Runecairn/runecairn_roll20_logo.png
index 2d6b77091a..81bc9cd19b 100644
Binary files a/Runecairn/runecairn_roll20_logo.png and b/Runecairn/runecairn_roll20_logo.png differ
diff --git a/Runecairn/translation.json b/Runecairn/translation.json
index 5554d5c549..e78940c0aa 100644
--- a/Runecairn/translation.json
+++ b/Runecairn/translation.json
@@ -1,29 +1,30 @@
 {
-    "name-u": "Name",
-    "souls-u": "Souls",	
-    "speed-u": "Speed",		
-    "vigour-u": "Vigour",		
-	"base-hit-points-u": "Base HP",	
+	"name-u": "Name",
+	"souls-u": "Souls",
+	"speed-u": "Speed",
+	"vigour-u": "Vigour",
+	"vitality-u": "Vitality",	
 	"hit-points-u": "HP",
-    "dexterity-u": "Dexterity",
-    "strength-u": "Strength",
-    "wits-u": "Wits",
+	"dexterity-u": "Dexterity",
+	"strength-u": "Strength",
+	"wits-u": "Wits",
 	"spirit-u": "Spirit",
-    "defence-u": "Defence",		
-    "inventory-u": "Inventory",	
-    "fatigue-u": "Fatigue",	
-    "deprived-u": "Deprived",	
-    "cursed-u": "Cursed",		
-    "mead-u": "Mead",
+	"defence-u": "Defence",
+	"inventory-u": "Inventory",
+	"fatigue-u": "Fatigue",
+	"deprived-u": "Deprived",
+	"cursed-u": "Cursed",
+	"mead-u": "Mead",
 	"status-u": "Status",
-    "key-item-u": "Key Item",		
-    "slots-u": "Slots",		
-    "weapon-u": "Weapon",
-    "damage-u": "Dmg",
-    "armour-u": "Armour",
-    "armour-bonus-u": "Bonus",	
-    "item-u": "Item",
-    "quantity-u": "Qty.",
-    "notes-u": "Notes",
-    "skills-spells-u": "Skills/Spells"	
-}
+	"key-item-u": "Key Item",
+	"slots-u": "Slots",
+	"weapon-u": "Weapon",
+	"damage-u": "Dmg",
+	"shield-u": "Shield",	
+	"armour-u": "Armour",
+	"bonus-u": "Bonus",
+	"item-u": "Item",
+	"quantity-u": "Qty.",
+	"notes-u": "Notes",
+	"skills-spells-u": "Skills/Spells"
+}
\ No newline at end of file