diff --git a/src/Roster.jsx b/src/Roster.jsx
index e89ce79..d677bec 100644
--- a/src/Roster.jsx
+++ b/src/Roster.jsx
@@ -100,6 +100,7 @@ const Force = ({ force, onePerPage }) => {
 			{units.map((unit, index) => (
 				<Unit
 					key={index}
+					index={index}
 					unit={unit}
 					catalog={catalog}
 					onePerPage={onePerPage}
@@ -110,7 +111,7 @@ const Force = ({ force, onePerPage }) => {
 	);
 };
 
-const Unit = ({ unit, catalog, onePerPage }) => {
+const Unit = ({ unit, index, catalog, onePerPage }) => {
 	let {
 		name,
 		weapons,
@@ -151,7 +152,9 @@ const Unit = ({ unit, catalog, onePerPage }) => {
 
 	return (
 		<div
-			className={"avoid-page-break " + (onePerPage ? "page-break" : "")}
+			className={
+				"avoid-page-break " + (onePerPage && index !== 0 ? "page-break" : "")
+			}
 			style={{
 				fontWeight: 500,
 				border: "2px solid var(--primary-color)",
diff --git a/src/roster40k.js b/src/roster40k.js
index 5552192..c5d0410 100644
--- a/src/roster40k.js
+++ b/src/roster40k.js
@@ -278,11 +278,14 @@ export class Unit extends BaseNotes {
 		// Sort force units by role and name
 		this.models.sort(CompareModel);
 		this.modelStats.sort((a, b) => {
-			if (!a.wounds) return 1;
 			var wounds_order = parseInt(a.wounds) - parseInt(b.wounds);
 			var leadership_order = parseInt(a.leadership) - parseInt(b.leadership);
+			var move_order = parseInt(a.move) - parseInt(b.move);
 			return (
-				-wounds_order || -leadership_order || b.name.length - a.name.length
+				-wounds_order ||
+				-leadership_order ||
+				-move_order ||
+				b.name.length - a.name.length
 			);
 		});