diff --git a/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt b/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt
index 9bde797..8d6d486 100644
--- a/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt
+++ b/src/commonMain/kotlin/com/jeffpdavidson/kotwords/formats/PuzzleMe.kt
@@ -482,11 +482,11 @@ class PuzzleMe(val json: String) : DelegatingPuzzleable() {
                         }
                     }
                     clues = listOf(
-                        Puzzle.ClueList("<b>Bands</b>", bandClues),
                         Puzzle.ClueList(
                             "<b>Rows</b>",
                             buildClueMap(isAcross = true, clueList = rowWords, wordLengthsEnabled = false),
-                        )
+                        ),
+                        Puzzle.ClueList("<b>Bands</b>", bandClues),
                     )
                     words = bandWordList + rowWordList
                 } else {
diff --git a/src/commonMain/kotlin/com/jeffpdavidson/kotwords/model/MarchingBands.kt b/src/commonMain/kotlin/com/jeffpdavidson/kotwords/model/MarchingBands.kt
index 324c5b9..b6799d8 100644
--- a/src/commonMain/kotlin/com/jeffpdavidson/kotwords/model/MarchingBands.kt
+++ b/src/commonMain/kotlin/com/jeffpdavidson/kotwords/model/MarchingBands.kt
@@ -67,7 +67,7 @@ data class MarchingBands(
             copyright = copyright,
             description = description,
             grid = puzzleGrid,
-            clues = listOf(Puzzle.ClueList("Bands", bandClueList), Puzzle.ClueList("Rows", rowClueList)),
+            clues = listOf(Puzzle.ClueList("Rows", rowClueList), Puzzle.ClueList("Bands", bandClueList)),
             words = bandWordList + rowWordList,
         )
     }
diff --git a/src/commonTest/resources/marching-bands/marching-bands-without-rows.jpz b/src/commonTest/resources/marching-bands/marching-bands-without-rows.jpz
index 9167c4f..d5326bc 100644
--- a/src/commonTest/resources/marching-bands/marching-bands-without-rows.jpz
+++ b/src/commonTest/resources/marching-bands/marching-bands-without-rows.jpz
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><crossword-compiler-applet xmlns="http://crossword.info/xml/crossword-compiler-applet"><applet-settings cursor-color="#00b100" selected-cells-color="#80ff80"><completion only-if-correct="true">All done!</completion><actions buttons-layout="left"><reveal-word label="Reveal Word"/><reveal-letter label="Reveal Letter"/><check label="Check"/><solution label="Solution"/><pencil label="Pencil"/></actions></applet-settings><rectangular-puzzle xmlns="http://crossword.info/xml/rectangular-puzzle"><metadata><title>Test title</title><creator>Test creator</creator><copyright>Test copyright</copyright><description>Test description</description></metadata><crossword><grid width="5" height="5"><grid-look numbering-scheme="normal"/><cell x="1" y="1" solution="A" background-color="#FFFFFF" number="A"/><cell x="2" y="1" solution="B" background-color="#FFFFFF"/><cell x="3" y="1" solution="C" background-color="#FFFFFF"/><cell x="4" y="1" solution="D" background-color="#FFFFFF"/><cell x="5" y="1" solution="E" background-color="#FFFFFF"/><cell x="1" y="2" solution="F" background-color="#FFFFFF"/><cell x="2" y="2" solution="G" background-color="#C0C0C0" number="B"/><cell x="3" y="2" solution="H" background-color="#C0C0C0"/><cell x="4" y="2" solution="I" background-color="#C0C0C0"/><cell x="5" y="2" solution="J" background-color="#FFFFFF"/><cell x="1" y="3" solution="K" background-color="#FFFFFF"/><cell x="2" y="3" solution="L" background-color="#C0C0C0"/><cell x="3" y="3" type="block"/><cell x="4" y="3" solution="M" background-color="#C0C0C0"/><cell x="5" y="3" solution="N" background-color="#FFFFFF"/><cell x="1" y="4" solution="O" background-color="#FFFFFF"/><cell x="2" y="4" solution="P" background-color="#C0C0C0"/><cell x="3" y="4" solution="Q" background-color="#C0C0C0"/><cell x="4" y="4" solution="R" background-color="#C0C0C0"/><cell x="5" y="4" solution="S" background-color="#FFFFFF"/><cell x="1" y="5" solution="T" background-color="#FFFFFF"/><cell x="2" y="5" solution="U" background-color="#FFFFFF"/><cell x="3" y="5" solution="V" background-color="#FFFFFF"/><cell x="4" y="5" solution="W" background-color="#FFFFFF"/><cell x="5" y="5" solution="X" background-color="#FFFFFF"/></grid><word id="1001"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/><cells x="5" y="2"/><cells x="5" y="3"/><cells x="5" y="4"/><cells x="5" y="5"/><cells x="4" y="5"/><cells x="3" y="5"/><cells x="2" y="5"/><cells x="1" y="5"/><cells x="1" y="4"/><cells x="1" y="3"/><cells x="1" y="2"/></word><word id="1002"><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="4" y="3"/><cells x="4" y="4"/><cells x="3" y="4"/><cells x="2" y="4"/><cells x="2" y="3"/></word><word id="1"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/></word><word id="2"><cells x="1" y="2"/><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="5" y="2"/></word><word id="3"><cells x="1" y="3"/><cells x="2" y="3"/><cells x="4" y="3"/><cells x="5" y="3"/></word><word id="4"><cells x="1" y="4"/><cells x="2" y="4"/><cells x="3" y="4"/><cells x="4" y="4"/><cells x="5" y="4"/></word><word id="5"><cells x="1" y="5"/><cells x="2" y="5"/><cells x="3" y="5"/><cells x="4" y="5"/><cells x="5" y="5"/></word><clues><title><b>Bands</b></title><clue word="1001" number="A">Band A1 / Band A2 / Band A3</clue><clue word="1002" number="B">Band B1 / Band B2</clue></clues><clues><title><b>Rows</b></title><clue word="1" number="1">Row 1A / Row 1B</clue><clue word="2" number="2">Row 2A / Row 2B</clue><clue word="3" number="3">Row 3A / Row 3B</clue><clue word="4" number="4">Row 4A / Row 4B</clue><clue word="5" number="5">Row 5A / Row 5B</clue></clues></crossword></rectangular-puzzle></crossword-compiler-applet>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><crossword-compiler-applet xmlns="http://crossword.info/xml/crossword-compiler-applet"><applet-settings cursor-color="#00b100" selected-cells-color="#80ff80"><completion only-if-correct="true">All done!</completion><actions buttons-layout="left"><reveal-word label="Reveal Word"/><reveal-letter label="Reveal Letter"/><check label="Check"/><solution label="Solution"/><pencil label="Pencil"/></actions></applet-settings><rectangular-puzzle xmlns="http://crossword.info/xml/rectangular-puzzle"><metadata><title>Test title</title><creator>Test creator</creator><copyright>Test copyright</copyright><description>Test description</description></metadata><crossword><grid width="5" height="5"><grid-look numbering-scheme="normal"/><cell x="1" y="1" solution="A" background-color="#FFFFFF" number="A"/><cell x="2" y="1" solution="B" background-color="#FFFFFF"/><cell x="3" y="1" solution="C" background-color="#FFFFFF"/><cell x="4" y="1" solution="D" background-color="#FFFFFF"/><cell x="5" y="1" solution="E" background-color="#FFFFFF"/><cell x="1" y="2" solution="F" background-color="#FFFFFF"/><cell x="2" y="2" solution="G" background-color="#C0C0C0" number="B"/><cell x="3" y="2" solution="H" background-color="#C0C0C0"/><cell x="4" y="2" solution="I" background-color="#C0C0C0"/><cell x="5" y="2" solution="J" background-color="#FFFFFF"/><cell x="1" y="3" solution="K" background-color="#FFFFFF"/><cell x="2" y="3" solution="L" background-color="#C0C0C0"/><cell x="3" y="3" type="block"/><cell x="4" y="3" solution="M" background-color="#C0C0C0"/><cell x="5" y="3" solution="N" background-color="#FFFFFF"/><cell x="1" y="4" solution="O" background-color="#FFFFFF"/><cell x="2" y="4" solution="P" background-color="#C0C0C0"/><cell x="3" y="4" solution="Q" background-color="#C0C0C0"/><cell x="4" y="4" solution="R" background-color="#C0C0C0"/><cell x="5" y="4" solution="S" background-color="#FFFFFF"/><cell x="1" y="5" solution="T" background-color="#FFFFFF"/><cell x="2" y="5" solution="U" background-color="#FFFFFF"/><cell x="3" y="5" solution="V" background-color="#FFFFFF"/><cell x="4" y="5" solution="W" background-color="#FFFFFF"/><cell x="5" y="5" solution="X" background-color="#FFFFFF"/></grid><word id="1001"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/><cells x="5" y="2"/><cells x="5" y="3"/><cells x="5" y="4"/><cells x="5" y="5"/><cells x="4" y="5"/><cells x="3" y="5"/><cells x="2" y="5"/><cells x="1" y="5"/><cells x="1" y="4"/><cells x="1" y="3"/><cells x="1" y="2"/></word><word id="1002"><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="4" y="3"/><cells x="4" y="4"/><cells x="3" y="4"/><cells x="2" y="4"/><cells x="2" y="3"/></word><word id="1"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/></word><word id="2"><cells x="1" y="2"/><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="5" y="2"/></word><word id="3"><cells x="1" y="3"/><cells x="2" y="3"/><cells x="4" y="3"/><cells x="5" y="3"/></word><word id="4"><cells x="1" y="4"/><cells x="2" y="4"/><cells x="3" y="4"/><cells x="4" y="4"/><cells x="5" y="4"/></word><word id="5"><cells x="1" y="5"/><cells x="2" y="5"/><cells x="3" y="5"/><cells x="4" y="5"/><cells x="5" y="5"/></word><clues><title><b>Rows</b></title><clue word="1" number="1">Row 1A / Row 1B</clue><clue word="2" number="2">Row 2A / Row 2B</clue><clue word="3" number="3">Row 3A / Row 3B</clue><clue word="4" number="4">Row 4A / Row 4B</clue><clue word="5" number="5">Row 5A / Row 5B</clue></clues><clues><title><b>Bands</b></title><clue word="1001" number="A">Band A1 / Band A2 / Band A3</clue><clue word="1002" number="B">Band B1 / Band B2</clue></clues></crossword></rectangular-puzzle></crossword-compiler-applet>
\ No newline at end of file
diff --git a/src/commonTest/resources/marching-bands/marching-bands.jpz b/src/commonTest/resources/marching-bands/marching-bands.jpz
index aa7cf51..95903c4 100644
--- a/src/commonTest/resources/marching-bands/marching-bands.jpz
+++ b/src/commonTest/resources/marching-bands/marching-bands.jpz
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><crossword-compiler-applet xmlns="http://crossword.info/xml/crossword-compiler-applet"><applet-settings cursor-color="#00b100" selected-cells-color="#80ff80"><completion only-if-correct="true">All done!</completion><actions buttons-layout="left"><reveal-word label="Reveal Word"/><reveal-letter label="Reveal Letter"/><check label="Check"/><solution label="Solution"/><pencil label="Pencil"/></actions></applet-settings><rectangular-puzzle xmlns="http://crossword.info/xml/rectangular-puzzle"><metadata><title>Test title</title><creator>Test creator</creator><copyright>Test copyright</copyright><description>Test description</description></metadata><crossword><grid width="5" height="5"><grid-look numbering-scheme="normal"/><cell x="1" y="1" solution="A" background-color="#FFFFFF" number="1" top-right-number="A"/><cell x="2" y="1" solution="B" background-color="#FFFFFF"/><cell x="3" y="1" solution="C" background-color="#FFFFFF"/><cell x="4" y="1" solution="D" background-color="#FFFFFF"/><cell x="5" y="1" solution="E" background-color="#FFFFFF"/><cell x="1" y="2" solution="F" background-color="#FFFFFF" number="2"/><cell x="2" y="2" solution="G" background-color="#C0C0C0" top-right-number="B"/><cell x="3" y="2" solution="H" background-color="#C0C0C0"/><cell x="4" y="2" solution="I" background-color="#C0C0C0"/><cell x="5" y="2" solution="J" background-color="#FFFFFF"/><cell x="1" y="3" solution="K" background-color="#FFFFFF" number="3"/><cell x="2" y="3" solution="L" background-color="#C0C0C0"/><cell x="3" y="3" type="block"/><cell x="4" y="3" solution="M" background-color="#C0C0C0"/><cell x="5" y="3" solution="N" background-color="#FFFFFF"/><cell x="1" y="4" solution="O" background-color="#FFFFFF" number="4"/><cell x="2" y="4" solution="P" background-color="#C0C0C0"/><cell x="3" y="4" solution="Q" background-color="#C0C0C0"/><cell x="4" y="4" solution="R" background-color="#C0C0C0"/><cell x="5" y="4" solution="S" background-color="#FFFFFF"/><cell x="1" y="5" solution="T" background-color="#FFFFFF" number="5"/><cell x="2" y="5" solution="U" background-color="#FFFFFF"/><cell x="3" y="5" solution="V" background-color="#FFFFFF"/><cell x="4" y="5" solution="W" background-color="#FFFFFF"/><cell x="5" y="5" solution="X" background-color="#FFFFFF"/></grid><word id="1001"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/><cells x="5" y="2"/><cells x="5" y="3"/><cells x="5" y="4"/><cells x="5" y="5"/><cells x="4" y="5"/><cells x="3" y="5"/><cells x="2" y="5"/><cells x="1" y="5"/><cells x="1" y="4"/><cells x="1" y="3"/><cells x="1" y="2"/></word><word id="1002"><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="4" y="3"/><cells x="4" y="4"/><cells x="3" y="4"/><cells x="2" y="4"/><cells x="2" y="3"/></word><word id="1"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/></word><word id="2"><cells x="1" y="2"/><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="5" y="2"/></word><word id="3"><cells x="1" y="3"/><cells x="2" y="3"/><cells x="4" y="3"/><cells x="5" y="3"/></word><word id="4"><cells x="1" y="4"/><cells x="2" y="4"/><cells x="3" y="4"/><cells x="4" y="4"/><cells x="5" y="4"/></word><word id="5"><cells x="1" y="5"/><cells x="2" y="5"/><cells x="3" y="5"/><cells x="4" y="5"/><cells x="5" y="5"/></word><clues><title><b>Bands</b></title><clue word="1001" number="A">Band A1 / Band A2 / Band A3</clue><clue word="1002" number="B">Band B1 / Band B2</clue></clues><clues><title><b>Rows</b></title><clue word="1" number="1">Row 1A / Row 1B</clue><clue word="2" number="2">Row 2A / Row 2B</clue><clue word="3" number="3">Row 3A / Row 3B</clue><clue word="4" number="4">Row 4A / Row 4B</clue><clue word="5" number="5">Row 5A / Row 5B</clue></clues></crossword></rectangular-puzzle></crossword-compiler-applet>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><crossword-compiler-applet xmlns="http://crossword.info/xml/crossword-compiler-applet"><applet-settings cursor-color="#00b100" selected-cells-color="#80ff80"><completion only-if-correct="true">All done!</completion><actions buttons-layout="left"><reveal-word label="Reveal Word"/><reveal-letter label="Reveal Letter"/><check label="Check"/><solution label="Solution"/><pencil label="Pencil"/></actions></applet-settings><rectangular-puzzle xmlns="http://crossword.info/xml/rectangular-puzzle"><metadata><title>Test title</title><creator>Test creator</creator><copyright>Test copyright</copyright><description>Test description</description></metadata><crossword><grid width="5" height="5"><grid-look numbering-scheme="normal"/><cell x="1" y="1" solution="A" background-color="#FFFFFF" number="1" top-right-number="A"/><cell x="2" y="1" solution="B" background-color="#FFFFFF"/><cell x="3" y="1" solution="C" background-color="#FFFFFF"/><cell x="4" y="1" solution="D" background-color="#FFFFFF"/><cell x="5" y="1" solution="E" background-color="#FFFFFF"/><cell x="1" y="2" solution="F" background-color="#FFFFFF" number="2"/><cell x="2" y="2" solution="G" background-color="#C0C0C0" top-right-number="B"/><cell x="3" y="2" solution="H" background-color="#C0C0C0"/><cell x="4" y="2" solution="I" background-color="#C0C0C0"/><cell x="5" y="2" solution="J" background-color="#FFFFFF"/><cell x="1" y="3" solution="K" background-color="#FFFFFF" number="3"/><cell x="2" y="3" solution="L" background-color="#C0C0C0"/><cell x="3" y="3" type="block"/><cell x="4" y="3" solution="M" background-color="#C0C0C0"/><cell x="5" y="3" solution="N" background-color="#FFFFFF"/><cell x="1" y="4" solution="O" background-color="#FFFFFF" number="4"/><cell x="2" y="4" solution="P" background-color="#C0C0C0"/><cell x="3" y="4" solution="Q" background-color="#C0C0C0"/><cell x="4" y="4" solution="R" background-color="#C0C0C0"/><cell x="5" y="4" solution="S" background-color="#FFFFFF"/><cell x="1" y="5" solution="T" background-color="#FFFFFF" number="5"/><cell x="2" y="5" solution="U" background-color="#FFFFFF"/><cell x="3" y="5" solution="V" background-color="#FFFFFF"/><cell x="4" y="5" solution="W" background-color="#FFFFFF"/><cell x="5" y="5" solution="X" background-color="#FFFFFF"/></grid><word id="1001"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/><cells x="5" y="2"/><cells x="5" y="3"/><cells x="5" y="4"/><cells x="5" y="5"/><cells x="4" y="5"/><cells x="3" y="5"/><cells x="2" y="5"/><cells x="1" y="5"/><cells x="1" y="4"/><cells x="1" y="3"/><cells x="1" y="2"/></word><word id="1002"><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="4" y="3"/><cells x="4" y="4"/><cells x="3" y="4"/><cells x="2" y="4"/><cells x="2" y="3"/></word><word id="1"><cells x="1" y="1"/><cells x="2" y="1"/><cells x="3" y="1"/><cells x="4" y="1"/><cells x="5" y="1"/></word><word id="2"><cells x="1" y="2"/><cells x="2" y="2"/><cells x="3" y="2"/><cells x="4" y="2"/><cells x="5" y="2"/></word><word id="3"><cells x="1" y="3"/><cells x="2" y="3"/><cells x="4" y="3"/><cells x="5" y="3"/></word><word id="4"><cells x="1" y="4"/><cells x="2" y="4"/><cells x="3" y="4"/><cells x="4" y="4"/><cells x="5" y="4"/></word><word id="5"><cells x="1" y="5"/><cells x="2" y="5"/><cells x="3" y="5"/><cells x="4" y="5"/><cells x="5" y="5"/></word><clues><title><b>Rows</b></title><clue word="1" number="1">Row 1A / Row 1B</clue><clue word="2" number="2">Row 2A / Row 2B</clue><clue word="3" number="3">Row 3A / Row 3B</clue><clue word="4" number="4">Row 4A / Row 4B</clue><clue word="5" number="5">Row 5A / Row 5B</clue></clues><clues><title><b>Bands</b></title><clue word="1001" number="A">Band A1 / Band A2 / Band A3</clue><clue word="1002" number="B">Band B1 / Band B2</clue></clues></crossword></rectangular-puzzle></crossword-compiler-applet>
\ No newline at end of file
diff --git a/src/jsTest/resources/marching-bands/marching-bands.pdf b/src/jsTest/resources/marching-bands/marching-bands.pdf
index cff6c9e..b80b623 100644
Binary files a/src/jsTest/resources/marching-bands/marching-bands.pdf and b/src/jsTest/resources/marching-bands/marching-bands.pdf differ
diff --git a/src/jvmTest/resources/marching-bands/marching-bands.pdf b/src/jvmTest/resources/marching-bands/marching-bands.pdf
index 5c3770b..3579295 100644
Binary files a/src/jvmTest/resources/marching-bands/marching-bands.pdf and b/src/jvmTest/resources/marching-bands/marching-bands.pdf differ