diff --git a/Liminal/liminal.css b/Liminal/liminal.css
index 5e855ba6e5..9d29558a8d 100644
--- a/Liminal/liminal.css
+++ b/Liminal/liminal.css
@@ -1,27 +1,65 @@
 /* Set the min-width so that when the window is resized the look will stay consistant */
 
 .charsheet {
-	background-color: #8bb;
-	min-width: 825px;
+	/*background-color: #8bb;*/
+	background-color:#9EBFBB;
+    background-size: cover;
+	width:825px;
+	min-width:825px;
+	min-height:400px;
+	margin:0;
 	/*background-image: url('https://d1vzi28wh99zvq.cloudfront.net/images/4329/267203.jpg');*/
 }
 
 /* Universal styling applied to all elements of these types */
 
-h1 {
+.charsheet h1 {
 	font-size: 4em;
 	margin-bottom: 10px;
+	margin-top:-15px;
 	text-align: center;
 }
 
-h2 {
+.charsheet h2 {
 	font-size: 2em;
 	margin-bottom: 10px;
 	text-align: center;
+	width:100%;
+	/*background:#195154;*/
+	background: #277F84;
+	color:white;
+	font-family: mason-serif, sans-serif;
+}
+.charsheet h3 {
+	margin-bottom: 10px;
+	text-align: center;
+}
+
+.charsheet input, .charsheet textarea, .charsheet select {
+	background-color:#DAE7E5;
+}
+
+/* LAYOUT */
+
+.sheet-character {
+  display: grid;
+  grid-template-columns: 133px 133px 133px 133px 133px 133px;
+  grid-template-rows: auto;
+  gap: 5px;
+  grid-template-areas:
+    "basic basic basic drive drive drive"
+    "physical physical mental mental social social"
+	"explain explain explain explain explain explain"
+    "unspent unspent cap cap totalskill totalskill"
+    "traits traits traits other other other"
 }
 
 /* BASIC INFO */
 
+.sheet-basicinfo {
+	grid-area: basic;
+}
+
 .sheet-basicinfo label {
 	display: inline-block;
 	width: 80px;
@@ -37,22 +75,38 @@ h2 {
 	width: 300px;
 }
 
-.sheet-basicinfo textarea {
+.sheet-drive {
+	grid-area: drive;
+}
+
+.sheet-drive textarea {
 	display: inline-block;
 	width: 290px;
 	height:110px;
 }
-.sheet-basicinfo label.sheet-drive {
+.sheet-drive label {
+	display: inline-block;
+	width: 80px;
 	vertical-align:top;
 }
 
 /* SKILLS */
 
+.sheet-physical {
+	grid-area: physical;
+}
+.sheet-mental {
+	grid-area: mental;
+}
+.sheet-social {
+	grid-area: social;
+}
+
 .sheet-skills label {
 	margin-left:153px;
 	margin-bottom:0;
-	margin-top:-15px;
-	font-weight: normal;
+	margin-top:-5px;
+	font-weight: bold;
 	font-size:1em;
 }
 .sheet-skills input {
@@ -60,17 +114,9 @@ h2 {
 	width: 115px;
 }
 
-p.sheet-skill-explain {
-	margin-top:10px;
-}
-
-.ui-dialog .charsheet .sheet-skills .sheet-col {
-	margin-right:10px;
-	width: calc(33% - 9px);
-}
 	
 .charsheet .sheet-skills button[type=roll].sheet-skill-button {
-    width:94px;
+    width:100px;
 	margin:0;
 	height:22px;
 	text-align:left;
@@ -79,6 +125,26 @@ p.sheet-skill-explain {
     content: '';
 }
 
+
+
+p.sheet-skill-explain {
+	grid-area:explain;
+	margin-top:10px;
+}
+
+.sheet-unspent {
+	grid-area: unspent;
+	margin-bottom:10px;
+}
+.sheet-cap {
+	grid-area: cap;
+	margin-bottom:10px;
+}
+.sheet-totalskill {
+	grid-area: totalskill;
+	margin-bottom:10px;
+}
+
 .sheet-skillpoints label {
 	display: inline-block;
 	width: 150px;
@@ -96,35 +162,67 @@ textarea {
 	resize: vertical;
 }
 
+/* TRAITS */
+.sheet-traits {
+	grid-area:traits;
+}
+
+.sheet-traits input {
+	display: inline-block;
+	width: 340px;
+	font-weight:bold;
+}
+.sheet-traits textarea {
+	height:100px;
+	width:379px;
+}
+
+.sheet-attributes button[type=roll].sheet-2d6-dice::before {
+    font-family: 'dicefontd6';
+    content: 'ff ';
+}
+
+.sheet-attributes button[type=roll].sheet-d6-dice::before {
+    font-family: 'dicefontd6';
+    content: 'f ';
+}
+
+
+.sheet-other {
+	grid-area: other; 
+    display: flex;
+    flex-direction: column;
+}
 
 /* STATS */
-.sheet-stats h4 {
+.sheet-attributes h4 {
 	display: inline-block;
 	text-align: left;
 }
 
-.sheet-stats h4.sheet-first {
+.sheet-attributes h4.sheet-first {
 	margin-left: 120px;
 	margin-right: 15px;
 }
 
-.sheet-stats input {
-	/*margin-right: 8%;
-	width: 17%;*/
+.sheet-attributes input {
 	display: inline-block;
 }
 
-.sheet-stats label {
+.sheet-attributes label {
 	display: inline-block;
 	width: 110px;
 }
 
-.sheet-stats label.sheet-driveused {
+.sheet-attributes label.sheet-driveused {
 	display: inline-block;
 	width: 190px;
 }
 
 /* COMBAT */
+.sheet-combat {
+	margin-top:20px;
+}
 
 .sheet-combat label {
 	display: inline-block;
@@ -141,37 +239,38 @@ textarea {
 	width: 170px;
 }
 
-.sheet-combat label.sheet-unarmed {
-	width: 297px;
-	font-weight:normal;
-}
-
 .sheet-combat select {
 	display: inline-block;
 	width: 80px;
 }
 
-/* TRAITS */
-
-.sheet-traits input {
-	display: inline-block;
-	width: 340px;
-}
-.sheet-traits textarea {
-	height:60px;
-	width:379px;
-}
-
-.sheet-stats button[type=roll].sheet-2d6-dice::before {
+.sheet-combat button[type=roll].sheet-2d6-dice::before {
     font-family: 'dicefontd6';
     content: 'ff ';
 }
 
-.sheet-stats button[type=roll].sheet-d6-dice::before {
+.sheet-combat button[type=roll].sheet-d6-dice::before {
     font-family: 'dicefontd6';
     content: 'f ';
 }
 
+/* ADVANCEMENT */
+.sheet-advancement {
+	margin-top:20px;
+}
+
+.sheet-advancement input {
+	display: inline-block;
+}
+
+.sheet-advancement label {
+	display: inline-block;
+	width: 180px;
+}
+
+
+/* TABS */
+
 /*Configure the tab buttons*/
 .charsheet .sheet-character,
 .charsheet .sheet-crew ,
@@ -183,7 +282,7 @@ textarea {
 .charsheet .sheet-tabstoggle[value="character"] ~ div.sheet-character,
 .charsheet .sheet-tabstoggle[value="crew"] ~ div.sheet-crew ,
 .charsheet .sheet-tabstoggle[value="mods"] ~ div.sheet-mods {
-    display: block;
+    display: grid;
 }
 
 /* CREW AREA */
diff --git a/Liminal/liminal.html b/Liminal/liminal.html
index e9c7958819..5e68f30371 100644
--- a/Liminal/liminal.html
+++ b/Liminal/liminal.html
@@ -9,195 +9,197 @@
 <h3>A RPG about those caught between the ordinary and extraordinary.</h3>
 
 <div class="sheet-character">
-<div class="sheet-2colrow sheet-basicinfo">
-    <div class="sheet-col">
-    	<label>Name:</label><input type="text" name="attr_character_name" /><br />
-		<label>Concept:</label><input type="text" name="attr_concept" /><br />
-		<label>Crew:</label><input type="text" name="attr_crew" /><br />
-	    <label>Focus:</label><select name="attr_focus">
-			<option value="Tough">Tough</option>
-			<option value="Determined">Determined</option>
-			<option value="Magician">Magician</option>
-		</select>
 
-    </div>
-	<div class="sheet-col">
-		<label class="sheet-drive">Drive:</label><textarea name="attr_drive"  />
-	</div>
+<div class="sheet-basicinfo">
+	<label>Name:</label><input type="text" name="attr_character_name" /><br />
+	<label>Concept:</label><input type="text" name="attr_concept" /><br />
+	<label>Crew:</label><input type="text" name="attr_crew" /><br />
+	<label>Focus:</label><select name="attr_focus">
+		<option value="Tough">Tough</option>
+		<option value="Determined">Determined</option>
+		<option value="Magician">Magician</option>
+	</select>
+</div>
+<div class="sheet-drive">
+	<label>Drive:</label><textarea name="attr_drive"  />
 </div>
-<hr/>
-<div class="sheet-3colrow sheet-skills">
-	<div class="sheet-col">
-		<h2>Physical Skills</h2>
-		<label>Specialities</label>
-		
-        <button class="sheet-skill-button" type='roll' name='roll_athletics' value='&{template:default} {{name=@{character_name}}} {{Athletics=[[2d6 + @{athletics} + ?{Modifier|0}]]}}'>Athletics</button><input type="number" name='attr_athletics' min="0"></input><input type="text" name='attr_athleticsspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_awareness' value='&{template:default} {{name=@{character_name}}} {{Awareness=[[2d6 + @{awareness} + ?{Modifier|0}]]}}'>Awareness</button><input type="number" name='attr_awareness' min="0"></input><input type="text" name='attr_awarenessspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_melee' value='&{template:default} {{name=@{character_name}}} {{Melee=[[2d6 + @{melee} + ?{Modifier|0}]]}}'>Melee</button><input type="number" name='attr_melee' min="0"></input><input type="text" name='attr_meleespec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_shoot' value='&{template:default} {{name=@{character_name}}} {{Shoot=[[2d6 + @{shoot} + ?{Modifier|0}]]}}'>Shoot</button><input type="number" name='attr_shoot' min="0"></input><input type="text" name='attr_shootspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_stealth' value='&{template:default} {{name=@{character_name}}} {{Stealth=[[2d6 + @{stealth} + ?{Modifier|0}]]}}'>Stealth</button><input type="number" name='attr_stealth' min="0"></input><input type="text" name='attr_stealthspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_survival' value='&{template:default} {{name=@{character_name}}} {{Survival=[[2d6 + @{survival} + ?{Modifier|0}]]}}'>Survival</button><input type="number" name='attr_survival' min="0"></input><input type="text" name='attr_survivalspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_vehicles' value='&{template:default} {{name=@{character_name}}} {{Vehicles=[[2d6 + @{vehicles} + ?{Modifier|0}]]}}'>Vehicles</button><input type="number" name='attr_vehicles' min="0"></input><input type="text" name='attr_vehiclesspec'></input>
 
-	</div>
-
-	<div class="sheet-col">
-		<h2>Mental Skills</h2>
-		<label>Specialities</label>
-
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Art=[[2d6 + @{art} + ?{Modifier|0}]]}}'>Art</button><input type="number" name='attr_art' min="0"></input><input type="text" name='attr_artspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Business=[[2d6 + @{business} + ?{Modifier|0}]]}}'>Business</button><input type="number" name='attr_business' min="0"></input><input type="text" name='attr_businessspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Education=[[2d6 + @{education} + ?{Modifier|0}]]}}'>Education</button><input type="number" name='attr_education' min="0"></input><input type="text" name='attr_educationspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Lore=[[2d6 + @{lore} + ?{Modifier|0}]]}}'>Lore</button><input type="number" name='attr_lore' min="0"></input><input type="text" name='attr_lorespec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Medicine=[[2d6 + @{medicine} + ?{Modifier|0}]]}}'>Medicine</button><input type="number" name='attr_medicine' min="0"></input><input type="text" name='attr_medicinespec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Science=[[2d6 + @{science} + ?{Modifier|0}]]}}'>Science</button><input type="number" name='attr_science' min="0"></input><input type="text" name='attr_sciencespec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Technology=[[2d6 + @{technology} + ?{Modifier|0}]]}}'>Technology</button><input type="number" name='attr_technology' min="0"></input><input type="text" name='attr_technologyspec'></input>
-	</div>
-
-	<div class="sheet-col">
-
-		<h2>Social Skills</h2>
-		<label>Specialities</label>
-
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Charm=[[2d6 + @{charm} + ?{Modifier|0}]]}}'>Charm</button><input type="number" name='attr_charm' min="0"></input><input type="text" name='attr_charmspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Conviction=[[2d6 + @{conviction} + ?{Modifier|0}]]}}'>Conviction</button><input type="number" name='attr_conviction' min="0"></input><input type="text" name='attr_convictionspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Empathy=[[2d6 + @{empathy} + ?{Modifier|0}]]}}'>Empathy</button><input type="number" name='attr_empathy' min="0"></input><input type="text" name='attr_empathyspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{High Society=[[2d6 + @{highsociety} + ?{Modifier|0}]]}}'>High Society</button><input type="number" name='attr_highsociety' min="0"></input><input type="text" name='attr_highsocietyspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Rhetoric=[[2d6 + @{rhetoric} + ?{Modifier|0}]]}}'>Rhetoric</button><input type="number" name='attr_rhetoric' min="0"></input><input type="text" name='attr_rhetoricspec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Streetwise=[[2d6 + @{streetwise} + ?{Modifier|0}]]}}'>Streetwise</button><input type="number" name='attr_streetwise' min="0"></input><input type="text" name='attr_streetwisespec'></input>
-        <br />
-		
-        <button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Taunt=[[2d6 + @{taunt} + ?{Modifier|0}]]}}'>Taunt</button><input type="number" name='attr_taunt' min="0"></input><input type="text" name='attr_tauntspec'></input>
-	</div>
+<div class="sheet-skills sheet-physical">
+	<h2>Physical Skills</h2>
+	<label>Specialities</label>
+	
+	<button class="sheet-skill-button" type='roll' name='roll_athletics' value='&{template:default} {{name=@{character_name}}} {{Athletics=[[2d6 + @{athletics} + ?{Modifier|0}]]}}'>Athletics</button><input type="number" name='attr_athletics' min="0"></input><input type="text" name='attr_athleticsspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_awareness' value='&{template:default} {{name=@{character_name}}} {{Awareness=[[2d6 + @{awareness} + ?{Modifier|0}]]}}'>Awareness</button><input type="number" name='attr_awareness' min="0"></input><input type="text" name='attr_awarenessspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_melee' value='&{template:default} {{name=@{character_name}}} {{Melee=[[2d6 + @{melee} + ?{Modifier|0}]]}}'>Melee</button><input type="number" name='attr_melee' min="0"></input><input type="text" name='attr_meleespec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_shoot' value='&{template:default} {{name=@{character_name}}} {{Shoot=[[2d6 + @{shoot} + ?{Modifier|0}]]}}'>Shoot</button><input type="number" name='attr_shoot' min="0"></input><input type="text" name='attr_shootspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_stealth' value='&{template:default} {{name=@{character_name}}} {{Stealth=[[2d6 + @{stealth} + ?{Modifier|0}]]}}'>Stealth</button><input type="number" name='attr_stealth' min="0"></input><input type="text" name='attr_stealthspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_survival' value='&{template:default} {{name=@{character_name}}} {{Survival=[[2d6 + @{survival} + ?{Modifier|0}]]}}'>Survival</button><input type="number" name='attr_survival' min="0"></input><input type="text" name='attr_survivalspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_vehicles' value='&{template:default} {{name=@{character_name}}} {{Vehicles=[[2d6 + @{vehicles} + ?{Modifier|0}]]}}'>Vehicles</button><input type="number" name='attr_vehicles' min="0"></input><input type="text" name='attr_vehiclesspec'></input>
 
 </div>
 
+<div class="sheet-skills sheet-mental">
+	<h2>Mental Skills</h2>
+	<label>Specialities</label>
+
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Art=[[2d6 + @{art} + ?{Modifier|0}]]}}'>Art</button><input type="number" name='attr_art' min="0"></input><input type="text" name='attr_artspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Business=[[2d6 + @{business} + ?{Modifier|0}]]}}'>Business</button><input type="number" name='attr_business' min="0"></input><input type="text" name='attr_businessspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Education=[[2d6 + @{education} + ?{Modifier|0}]]}}'>Education</button><input type="number" name='attr_education' min="0"></input><input type="text" name='attr_educationspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Lore=[[2d6 + @{lore} + ?{Modifier|0}]]}}'>Lore</button><input type="number" name='attr_lore' min="0"></input><input type="text" name='attr_lorespec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Medicine=[[2d6 + @{medicine} + ?{Modifier|0}]]}}'>Medicine</button><input type="number" name='attr_medicine' min="0"></input><input type="text" name='attr_medicinespec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Science=[[2d6 + @{science} + ?{Modifier|0}]]}}'>Science</button><input type="number" name='attr_science' min="0"></input><input type="text" name='attr_sciencespec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Technology=[[2d6 + @{technology} + ?{Modifier|0}]]}}'>Technology</button><input type="number" name='attr_technology' min="0"></input><input type="text" name='attr_technologyspec'></input>
+</div>
+
+<div class="sheet-skills sheet-social">
+	<h2>Social Skills</h2>
+	<label>Specialities</label>
+
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Charm=[[2d6 + @{charm} + ?{Modifier|0}]]}}'>Charm</button><input type="number" name='attr_charm' min="0"></input><input type="text" name='attr_charmspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Conviction=[[2d6 + @{conviction} + ?{Modifier|0}]]}}'>Conviction</button><input type="number" name='attr_conviction' min="0"></input><input type="text" name='attr_convictionspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Empathy=[[2d6 + @{empathy} + ?{Modifier|0}]]}}'>Empathy</button><input type="number" name='attr_empathy' min="0"></input><input type="text" name='attr_empathyspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{High Society=[[2d6 + @{highsociety} + ?{Modifier|0}]]}}'>High Society</button><input type="number" name='attr_highsociety' min="0"></input><input type="text" name='attr_highsocietyspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Rhetoric=[[2d6 + @{rhetoric} + ?{Modifier|0}]]}}'>Rhetoric</button><input type="number" name='attr_rhetoric' min="0"></input><input type="text" name='attr_rhetoricspec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Streetwise=[[2d6 + @{streetwise} + ?{Modifier|0}]]}}'>Streetwise</button><input type="number" name='attr_streetwise' min="0"></input><input type="text" name='attr_streetwisespec'></input>
+	<br />
+	
+	<button class="sheet-skill-button" type='roll' name='roll_testattack' value='&{template:default} {{name=@{character_name}}} {{Taunt=[[2d6 + @{taunt} + ?{Modifier|0}]]}}'>Taunt</button><input type="number" name='attr_taunt' min="0"></input><input type="text" name='attr_tauntspec'></input>
+</div>
+
+
 <p class="sheet-skill-explain">Start with 17 Skill points. If you have a skill at 3 or higher you may spend 1 point for a Speciality.</p>
 
-<div class="sheet-3colrow sheet-skillpoints">
-	<div class="sheet-col">
-	    <label>Unspent skill points </label><input type="number" name='attr_skillpoints'></input>
-	</div>
-	<div class="sheet-col">
-	    <label>Skill cap </label><input type="number" name='attr_skillcap'></input>
-	</div>
-	<div class="sheet-col">
-	    <label>Total skill points </label><input type="number" name='attr_totalskillpoints'></input>
+
+<div class="sheet-skillpoints sheet-unspent">
+	<label>Unspent skill points </label><input type="number" name='attr_skillpoints'></input>
+</div>
+<div class="sheet-skillpoints sheet-cap">
+	<label>Skill cap </label><input type="number" name='attr_skillcap'></input>
+</div>
+<div class="sheet-skillpoints sheet-totalskill">
+	<label>Total skill points </label><input type="number" name='attr_totalskillpoints'></input>
+</div>
+
+<div class="sheet-traits">
+	<h2>Traits</h2>
+			
+	<fieldset class="repeating_traits">
+		<input type="text" name="attr_traitname" />
+		<input type="number" name="attr_traitcost" min="1" />
+		<textarea name="attr_traitdescription" />
+	</fieldset>
+
+	<h2 style="margin-top:20px;">Limitations</h2>
+			
+	<fieldset class="repeating_limitations">
+		<input type="text" name="attr_limitation" />
+	</fieldset>
+	<p class="sheet-skill-explain">Start with 5 Trait points. You can gain up to +2 points from Limitations.</p>
+	<div class="sheet-skillpoints">
+		<div class="sheet-col">
+			<label>Unspent trait points </label><input type="number" name='attr_traitpoints'></input>
+		</div>
+		<div class="sheet-col">
+			<label>Total trait points </label><input type="number" name='attr_totaltraitpoints'></input>
+		</div>
 	</div>
 </div>
 
-<hr />
-
-<div class="sheet-2colrow sheet-stats">
-	<div class="sheet-col">
-		<h2>Attributes</h2>
-		<h4 class="sheet-first">Current</h4><h4>Max</h4><br />
-		<label>Endurance</label><input type="number" name="attr_endurance" />/<input type="number" name="attr_endurance_max" /><br />
-		<label>Will</label><input type="number" name="attr_will" />/<input type="number" name="attr_will_max" /><br />
-		<label>Experience</label><input type="number" name="attr_experience" />
-		<br />
-		<br />		
-		<label class="sheet-driveused">Total advancements</label><input type="number" name="attr_totaladvancements" /><br />	
-		<label class="sheet-driveused">Unspent advancements</label><input type="number" name="attr_advancements" /><br />
-		<p class="sheet-skill-explain">Spend 1 advancement to buy a trait point, increase your skill cap, or buy a crew asset.</p>
-		
-		<label class="sheet-driveused">Drive used this session?</label><input type="checkbox" name="attr_driveused"></input>	
-        <button class="sheet-skill-button sheet-d6-dice" type='roll' name='roll_drive' value='&{template:default} {{name=@{character_name}}} {{Will points recovered=[[1d6]]}}'> Lean on your drive</button>
-		<br /><br />
-		<label class="sheet-driveused">Additional crew assets</label><input type="number" name="attr_crewassets" />
-	</div>
+<!-- Attributes and combat -->
+<div class="sheet-other">
+<div class="sheet-attributes">
+	<h2>Attributes</h2>
+	<h4 class="sheet-first">Current</h4><h4>Max</h4><br />
+	<label>Endurance</label><input type="number" name="attr_endurance" />/<input type="number" name="attr_endurance_max" /><br />
+	<label>Will</label><input type="number" name="attr_will" />/<input type="number" name="attr_will_max" /><br />
 	
-	<div class="sheet-col sheet-combat">
-		<h2>Combat</h2>
-		<label class="sheet-damagebonus">Melee damage bonus</label><input type="number" name="attr_meleebonus" /><br />
-		<label class="sheet-damagebonus">Shoot damage bonus</label><input type="number" name="attr_shootbonus" />
-		<br /><br />
-		<label>Select your token and then </label>
-		<button class="sheet-2d6-dice" type='roll' name='roll_initiative' value='&{template:default} {{name=@{character_name}}} {{Initiative=[[2d6 + @{awareness} + ?{Modifier|0} &{tracker}]]}}'>Roll Initiative</button>
-		
-		<hr />
-		<label>Weapons and Attacks</label><br />
-		<label class="sheet-unarmed">Unarmed</label><button class="sheet-d6-dice" type='roll' name='roll_unarmed' value='&{template:default} {{name=@{character_name}}} {{Weapon=Unarmed}} {{Damage=[[1d6 + @{meleebonus} + ?{Modifier|0}]]}}'></button>
-		<button class="sheet-2d6-dice" type='roll' name='roll_unarmed2' value='&{template:default} {{name=@{character_name}}} {{Weapon=Unarmed}} {{Damage=[[2d6 + @{meleebonus} + ?{Modifier|0}]]}}'></button>
-        <fieldset class="repeating_weapons">
-            <input type="text" name="attr_weaponname" />
-            <input type="number" name="attr_weapondamagebonus" />
-			<select name="attr_weapontype">
-				<option value="@{meleebonus}">Melee</option>
-				<option value="@{shootbonus}">Shoot</option>
-				<option value="0">Other</option>
-			</select>
-			<button class="sheet-d6-dice" type='roll' name='roll_weapon' value='&{template:default} {{name=@{character_name}}} {{Weapon=@{weaponname}}} {{Damage=[[1d6 + @{weapondamagebonus} + @{weapontype} + ?{Modifier|0}]]}}'></button>
-			<button class="sheet-2d6-dice" type='roll' name='roll_weapon2' value='&{template:default} {{name=@{character_name}}} {{Weapon=@{weaponname}}} {{Damage=[[2d6 + @{weapondamagebonus} + @{weapontype} + ?{Modifier|0}]]}}'></button>
-        </fieldset>
-	</div>
+	<label class="sheet-driveused">Drive used this session?</label><input type="checkbox" name="attr_driveused"></input><br />
+	<button class="sheet-skill-button sheet-d6-dice" type='roll' name='roll_drive' value='&{template:default} {{name=@{character_name}}} {{Will points recovered=[[1d6]]}}'> Lean on your drive</button>
+</div>
+<div class="sheet-combat">
+	<h2>Combat</h2>
+	<label class="sheet-damagebonus">Melee damage bonus</label><input type="number" name="attr_meleebonus" /><br />
+	<label class="sheet-damagebonus">Shoot damage bonus</label><input type="number" name="attr_shootbonus" />
+	<label class="sheet-damagebonus">Initiative bonus</label><input type="number" name="attr_initiativebonus" />
+	
+	<button class="sheet-2d6-dice" type='roll' name='roll_initiative' value='&{template:default} {{name=@{character_name}}} {{Initiative=[[2d6 + @{awareness} + @{initiativebonus} + ?{Modifier|0}]]}}'>Roll Initiative</button>
+	
+	<hr />
+	<label>Weapons and Attacks</label><br />
+	<div style="display:inline-block;width:170px;">Name</div>
+	<div style="display:inline-block;width:50px;">Weapon damage</div>
+	<div style="display:inline-block;width:80px;">Attack type</div>
+	<div style="display:inline-block;width:30px;">Roll 1d6</div>
+	<div style="display:inline-block;width:30px;">Roll 2d6</div>
+	<br />
+	<input type="text" disabled="true" value="Unarmed" />
+	<input type="number" value="0" disabled="true" />
+	<select disabled="true">
+		<option value="@{meleebonus}">Melee</option>
+	</select>
+	<button class="sheet-d6-dice" type='roll' name='roll_unarmed' value='&{template:default} {{name=@{character_name}}} {{Weapon=Unarmed}} {{Damage=[[1d6 + @{meleebonus} + ?{Modifier|0}]]}}'></button>
+	<button class="sheet-2d6-dice" type='roll' name='roll_unarmed2' value='&{template:default} {{name=@{character_name}}} {{Weapon=Unarmed}} {{Damage=[[2d6 + @{meleebonus} + ?{Modifier|0}]]}}'></button>
+	
+	<fieldset class="repeating_weapons">
+		<input type="text" name="attr_weaponname" />
+		<input type="number" name="attr_weapondamagebonus" />
+		<select name="attr_weapontype">
+			<option value="@{meleebonus}">Melee</option>
+			<option value="@{shootbonus}">Shoot</option>
+			<option value="0">Other</option>
+		</select>
+		<button class="sheet-d6-dice" type='roll' name='roll_weapon' value='&{template:default} {{name=@{character_name}}} {{Weapon=@{weaponname}}} {{Damage=[[1d6 + @{weapondamagebonus} + @{weapontype} + ?{Modifier|0}]]}}'></button>
+		<button class="sheet-2d6-dice" type='roll' name='roll_weapon2' value='&{template:default} {{name=@{character_name}}} {{Weapon=@{weaponname}}} {{Damage=[[2d6 + @{weapondamagebonus} + @{weapontype} + ?{Modifier|0}]]}}'></button>
+	</fieldset>
 </div>
 
-<hr />
-
-<div class="sheet-2colrow sheet-traits">
-	<div class="sheet-col">
-	    <h2>Traits</h2>
-		        
-        <fieldset class="repeating_traits">
-            <input type="text" name="attr_traitname" />
-            <input type="number" name="attr_traitcost" min="1" />
-            <textarea name="attr_traitdescription" />
-        </fieldset>
-	</div>
-	<div class="sheet-col">
-	    <h2>Limitations</h2>
-		        
-        <fieldset class="repeating_limitations">
-            <input type="text" name="attr_limitation" />
-        </fieldset>
-	</div>
+<div class="sheet-advancement">
+	<h2>Advancement</h2>
+	<label>Experience</label><input type="number" name="attr_experience" />
+	<br />
+	<br />		
+	<label>Total advancements</label><input type="number" name="attr_totaladvancements" /><br />	
+	<label>Unspent advancements</label><input type="number" name="attr_advancements" /><br />
+	<p class="sheet-skill-explain">Spend 1 advancement to buy a trait point, increase your skill cap, or buy a crew asset.</p>
+	<br />
+	<label>Additional crew assets</label><input type="number" name="attr_crewassets" />
+</div>
 </div>
 
-<p class="sheet-skill-explain">Start with 5 Trait points. You can gain up to +2 points from Limitations.</p>
-<div class="sheet-2colrow sheet-skillpoints">
-	<div class="sheet-col">
-	    <label>Unspent trait points </label><input type="number" name='attr_traitpoints'></input>
-	</div>
-	<div class="sheet-col">
-	    <label>Total trait points </label><input type="number" name='attr_totaltraitpoints'></input>
-	</div>
-</div>
-<hr />
 </div>
 
 <!-- CREW SHEET -->
@@ -235,7 +237,7 @@
 	<label>Modify endurance:</label><input type="number" name="attr_extraendurance" /><br />
 	<label>Modify will:</label><input type="number" name="attr_extrawill" /><br />
 </div>
-<!-- END CREW SHEET -->
+<!-- END MODS SHEET -->
 
 <script type="text/worker">
 
@@ -251,7 +253,7 @@ buttonlist.forEach(button => {
 
 // Initialise skills and other numbered attributes
 on("change:athletics change:awareness change:melee change:shoot change:stealth change:survival change:vehicles change:art change:business change:education change:lore change:medicine change:science change:technology change:charm change:conviction change:empathy change:highsociety change:rhetoric change:streetwise change:taunt sheet:opened", function() {  
-  getAttrs(["athletics","awareness","melee","shoot","stealth","survival","vehicles","art","business","education","lore","medicine","science","technology","charm","conviction","empathy","highsociety","rhetoric","streetwise","taunt","skillcap","meleebonus","shootbonus","totaltraitpoints","crewassets"], function(values) {
+  getAttrs(["athletics","awareness","melee","shoot","stealth","survival","vehicles","art","business","education","lore","medicine","science","technology","charm","conviction","empathy","highsociety","rhetoric","streetwise","taunt","skillcap","meleebonus","shootbonus","initiativebonus","totaltraitpoints","crewassets"], function(values) {
 	let athletics = parseInt(values.athletics)||0;
 	let awareness = parseInt(values.awareness)||0;
 	let melee = parseInt(values.melee)||0;
@@ -276,6 +278,7 @@ on("change:athletics change:awareness change:melee change:shoot change:stealth c
 	let skillcap = parseInt(values.skillcap)||4;
 	let meleebonus = parseInt(values.meleebonus)||0;
 	let shootbonus = parseInt(values.shootbonus)||0;
+	let initiativebonus = parseInt(values.initiativebonus)||0;
 	let totaltraitpoints = parseInt(values.totaltraitpoints)||5;
 	let crewassets = parseInt(values.crewassets)||0;
  
@@ -304,6 +307,7 @@ on("change:athletics change:awareness change:melee change:shoot change:stealth c
       "skillcap": skillcap,
       "meleebonus": meleebonus,
       "shootbonus": shootbonus,
+      "initiativebonus": initiativebonus,
       "totaltraitpoints": totaltraitpoints,
 	  "crewassets": crewassets
     });
diff --git a/Liminal/liminalpreview.png b/Liminal/liminalpreview.png
index 4fcd31ab22..b5c3b43a2e 100644
Binary files a/Liminal/liminalpreview.png and b/Liminal/liminalpreview.png differ