diff --git a/public/Chaos Demons Mix.rosz b/public/Chaos Demons Mix.rosz
new file mode 100644
index 0000000..db441b0
Binary files /dev/null and b/public/Chaos Demons Mix.rosz differ
diff --git a/src/App.jsx b/src/App.jsx
index 3d80786..ac8212a 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -27,8 +27,18 @@ function App() {
 			};
 			reader.readAsBinaryString(files[0]);
 		} else {
+			let example;
+			switch (event) {
+				case "ultras":
+					example = await fetch("Ultramarines Example.rosz");
+					break;
+				case "chaos daemons":
+					example = await fetch("Chaos Demons Mix.rosz");
+				default:
+					break;
+			}
 			// load example
-			const example = await fetch("Ultramarines Example.rosz");
+
 			const arrayBuffer = await example.arrayBuffer();
 			// Create a new Blob object from the zip file contents
 			const zipBlob = new Blob([arrayBuffer], { type: "application/zip" });
@@ -189,13 +199,22 @@ function App() {
 					{error}
 				</div>
 				<Roster roster={roster} onePerPage={onePerPage} />
-				<button
-					className="print-display-none"
-					style={{ display: roster ? "none" : "" }}
-					onClick={handleFileSelect}
-				>
-					Load Ultramarines example
-				</button>
+				<div style={{ display: "flex", gap: 8 }}>
+					<button
+						className="print-display-none"
+						style={{ display: roster ? "none" : "" }}
+						onClick={() => handleFileSelect("ultras")}
+					>
+						Load Ultramarines example
+					</button>
+					<button
+						className="print-display-none"
+						style={{ display: roster ? "none" : "" }}
+						onClick={() => handleFileSelect("chaos daemons")}
+					>
+						Load Chaos Daemons example
+					</button>
+				</div>
 				<div
 					className="print-display-none"
 					style={{ display: roster ? "none" : "" }}
diff --git a/src/Roster.jsx b/src/Roster.jsx
index 9b19177..f4e6e66 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -25,6 +25,7 @@ export const Roster = ({ roster, onePerPage }) => {
 					fontSize: " 1.7em",
 					fontWeight: "800",
 					textTransform: "uppercase",
+					marginBottom: "12px",
 				}}
 			>
 				{name} [{cost.commandPoints} CP]
@@ -121,8 +122,6 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 			}
 			style={{
 				fontWeight: 500,
-				border: "2px solid var(--primary-color)",
-				backgroundColor: "#DFE0E2",
 				marginBottom: 32,
 
 				"--primary-color": overridePrimary,
@@ -133,7 +132,11 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 		>
 			<label
 				className="print-display-none"
-				style={{ display: "flex", alignItems: "center" }}
+				style={{
+					display: "flex",
+					alignItems: "center",
+					justifyContent: "flex-end",
+				}}
 			>
 				<input type="checkbox" onChange={() => setHide(!hide)} />
 				<span className="print-display-none">Don't print this card.</span>
@@ -237,7 +240,14 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 					</div>
 				</div>
 			</div>
-			<div style={{ display: "flex" }}>
+			<div
+				style={{
+					display: "flex",
+					border: "2px solid var(--primary-color)",
+					borderTop: "none",
+					backgroundColor: "#DFE0E2",
+				}}
+			>
 				<div
 					style={{
 						flex: "1",
@@ -324,7 +334,7 @@ const Unit = ({ unit, index, catalog, onePerPage }) => {
 					</div>
 					<Rules rules={rules} />
 					<Abilities abilities={abilities.Abilities} />
-					<Psykers title="PSYKER" psykers={psykers} />
+					<Psykers psykers={psykers} />
 					<Factions factions={factions} />
 					<FactionIcon catalog={catalog} />
 				</div>
@@ -625,10 +635,10 @@ const Psykers = ({ title, psykers }) => {
 							color: "#fff",
 						}}
 					>
-						<th style={{ textAlign: "left" }}>{title}</th>
+						<th style={{ textAlign: "left" }}>PSYKER</th>
 						<th>Cast</th>
 						<th>Deny</th>
-						<th style={{ textAlign: "left" }} colSpan="4">
+						<th style={{ textAlign: "left", width: "100%" }} colSpan="4">
 							Powers Known
 						</th>
 					</tr>
@@ -640,8 +650,7 @@ const Psykers = ({ title, psykers }) => {
 				))}
 				{psykers.length > 0 && (
 					<tr className="emptyRow">
-						<td style={{ width: 37 }}></td>
-						<td colSpan={7}></td>
+						<td colSpan={4}></td>
 					</tr>
 				)}
 			</tbody>
@@ -657,18 +666,7 @@ const Psyker = ({ psyker, index }) => {
 			className={index % 2 ? "rowOtherColor" : ""}
 			style={{ fontSize: ".8em" }}
 		>
-			<td style={{ textAlign: "left" }}>
-				<div
-					style={{
-						display: "flex",
-						alignItems: "center",
-						flexWrap: "wrap",
-						gap: "0 4px",
-					}}
-				>
-					{name}
-				</div>
-			</td>
+			<td style={{ textAlign: "left" }}></td>
 			<td>{cast}</td>
 			<td>{deny}</td>
 			<td style={{ textAlign: "left" }} colSpan="4">
diff --git a/src/Weapons.jsx b/src/Weapons.jsx
index fc161f8..f7dc154 100644
--- a/src/Weapons.jsx
+++ b/src/Weapons.jsx
@@ -227,9 +227,7 @@ const Weapon = ({ weapon, modelStats, isMelee, className }) => {
 	return (
 		<>
 			<tr className={className}>
-				<td style={{ borderTop: "none", backgroundColor: "#dfe0e2" }}>
-					{differentProfiles && Arrow}
-				</td>
+				<td style={{ borderTop: "none" }}>{differentProfiles && Arrow}</td>
 				<td style={{ textAlign: "left" }}>
 					<div
 						style={{
@@ -303,7 +301,7 @@ const getWeaponClassNames = (weapons, index) => {
 };
 
 const calculateWeaponStrength = (strModel, strWeapon) => {
-	if (strWeapon.startsWith("User")) return strModel;
+	if (strWeapon.includes("User")) return strModel;
 	if (strWeapon.startsWith("x")) {
 		return strModel * parseInt(strWeapon.replace("x", ""));
 	}
diff --git a/src/index.css b/src/index.css
index eaa803d..d9249f0 100644
--- a/src/index.css
+++ b/src/index.css
@@ -71,7 +71,7 @@ button:focus-visible {
 	align-items: center;
 	justify-content: center;
 	gap: 8px;
-	padding: var(--size-24) var(--size-32);
+	padding: var(--size-24) var(--size-20);
 	max-width: 1100px;
 	margin-left: auto;
 	margin-right: auto;
@@ -177,6 +177,12 @@ button:focus-visible {
 	#root {
 		min-width: 1000px;
 	}
+
+	.body {
+		padding: 0;
+		display: block;
+		max-width: none;
+	}
 }
 
 @media screen and (max-width: 800px) {