diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index c9ca6bcd6489a2ed8e12b0f2b07dff1dfc810745..a2310c299bdd4f3973535eae99b1f5b6ce85e147 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -2,24 +2,31 @@
 
 <<set _Pass = passage()>>
 <<widget "userButton">>
-	<<if _Pass !== "Encyclopedia">> <br><br> <</if>>
-	<<if $nextButton === "END WEEK">>
-		<span id="endWeekButton"> <strong>
-		<<link [[END WEEK|End Week]]>><</link>>
-		</strong> </span> @@.cyan;[Ent]@@
-		<<if $rulesError && $rulesAssistantAuto == 1>>
-			<br>@@.yellow; WARNING: some custom rules will change slave variables@@
-		<</if>>
-	<<else>>
-		<strong>
-		<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
-			<<link "$nextButton">> <<goto $nextLink>> <</link>>
+	/*Don't remove these spans, it will break things.*/
+	<<if _Pass !== "End Week">>
+		<<if _Pass !== "Encyclopedia">> <br><br> <</if>>
+		<<if _Pass === "Main" && $nextButton === "END WEEK">>
+			<span id="endWeekButton"> <strong>
+			<<link [[END WEEK|End Week]]>><</link>>
+			</strong> </span> @@.cyan;[Ent]@@
+			<<if $rulesError && $rulesAssistantAuto == 1>>
+				<br>@@.yellow; WARNING: some custom rules will change slave variables@@
+			<</if>>
 		<<else>>
-			<<link [[Back to Free Cities|$nextLink]]>><</link>>
+			<span id="nextButton">
+			<<if $nextButton !== " ">>
+				<strong>
+				<<if _Pass !== "Encyclopedia">> /* must use link so spacebar shortcut will work */
+					<<link "$nextButton">> <<goto $nextLink>> <</link>>
+				<<else>>
+					<<link [[Back to Free Cities|$nextLink]]>><</link>>
+				<</if>>
+				</strong> @@.cyan;[Space]@@
+			<</if>>
+			</span>
 		<</if>>
-		</strong> @@.cyan;[Space]@@
+		<br>
 	<</if>>
-	<br>
 <</widget>>
 
 <<widget "security">> <br>
@@ -78,9 +85,7 @@
 			//@@.red;$weatherToday.name@@//
 		<</if>>
 	<</if>>
-	<span id="nextButton">
-		<<if $nextButton !== " ">> <<userButton>> <</if>>
-	</span>
+	<<userButton>>
 <</if>>
 
 <<if _Pass == "Encyclopedia">> <br>
@@ -108,8 +113,8 @@
 	<span id="cost"><<SlaveCostDescription>></span> <br><br>
 <</if>>
 
-<<if $ui != "start" && _Pass !== "Encyclopedia">>
-	<<if $sideBarOptions.Cash > 0>> <br>
+<<if $ui != "start" && _Pass !== "Encyclopedia">> <br>
+	<<if $sideBarOptions.Cash > 0>>
 		<<set $cash = Math.trunc($cash)>>
 		<span id="cash">
 		<<if $cash > 0>>