diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 9a71ecdf91e0063e110d003143c3efd85fab0d78..ce8b167052242c58d770b125cc8e9d7bbb7fb9fd 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -1,31 +1,8 @@
 :: StoryCaption [nobr]
 
 <<set _Pass = passage()>>
-<<if _Pass == "Encyclopedia">>
-	/* Intro, new players, PC/Gameplay focused */
-	[[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
-	<br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]]
-	<br>[[Being in charge|Encyclopedia][$encyclopedia = "Being in charge"]]
-	/* Section for slaves */
-	<br>[[Slaves|Encyclopedia][$encyclopedia = "Slaves"]]
-	<br>[[Obtaining Slaves|Encyclopedia][$encyclopedia = "Obtaining Slaves"]]
-	<br>[[Slave Assignments|Encyclopedia][$encyclopedia = "Slave Assignments"]]
-	<br>[[Slave Body|Encyclopedia][$encyclopedia = "Body"]] / [[Skills|Encyclopedia][$encyclopedia = "Skills"]]
-	<br>[[Slave Fetishes|Encyclopedia][$encyclopedia = "Fetishes"]] / [[Quirks|Encyclopedia][$encyclopedia = "Quirks"]] / [[Flaws|Encyclopedia][$encyclopedia = "Flaws"]]
-	<br>[[Slave Relationships|Encyclopedia][$encyclopedia = "Relationships"]]
-	/* Section for arcology and Lore */
-	<br>[[The X-Series Arcology|Encyclopedia][$encyclopedia = "What the Upgrades Do"]]
-	<br>[[Arcology Facilities|Encyclopedia][$encyclopedia = "Facilities"]]
-	<br>[[Terrain Types|Encyclopedia][$encyclopedia = "Terrain Types"]]
-	<br>[[Future Societies|Encyclopedia][$encyclopedia = "Future Societies"]]
-	<br>[[Lore|Encyclopedia][$encyclopedia = "Lore"]]
-	/* Mods and extras */
-	<br>[[Game Mods|Encyclopedia][$encyclopedia = "Game Mods"]]
-	<br>[[Credits|Encyclopedia][$encyclopedia = "Credits"]]
-<<elseif _Pass == "Starting Girls">>
-	<span id="cost"><<SlaveCostDescription>></span>
 
-<<elseif $ui != "start">>
+<<if $ui != "start" && _Pass !== "Encyclopedia">>
 	<<if $cheatMode || $debugMode>> _Pass<br> <</if>>
 	<span id="week">''Week $week''</span>
 	<<if $week > 52>> (<<= years($week)>>) <</if>>
@@ -49,14 +26,21 @@
 	<<else>>
 		//@@.red;$weatherToday.name@@//
 	<</if>>
+<</if>>
 
-	<<if $nextButton == "END WEEK">> <br><br>
+<<if $ui != "start">>
+	<<if $nextButton === "END WEEK" || _Pass === "Encyclopedia">>
 		<span id="endWeekButton">
+		<<if $nextButton === "END WEEK">> <br><br> <</if>>
 		<strong>
 		<<link [[($nextButton)|($nextLink)]]>><</link>>
 		</strong>
-		@@.cyan;[Ent]@@
-		<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
+		<<if $nextButton === "END WEEK">>
+			@@.cyan;[Ent]@@
+			<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
+		<<else>>
+			to Fee Cities.<br>
+		<</if>>
 		</span>
 		<br>
 	<<elseif $nextButton == " ">> <br><br>
@@ -72,8 +56,34 @@
 			@@.cyan;[Space]@@<br>
 		</span>
 	<</if>>
+<</if>>
 
+<<if _Pass == "Encyclopedia">>
+	/* Intro, new players, PC/Gameplay focused */
+	[[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
+	<br>[[Design your master|Encyclopedia][$encyclopedia = "Design Your Master"]]
+	<br>[[Being in charge|Encyclopedia][$encyclopedia = "Being in charge"]]
+	/* Section for slaves */
+	<br>[[Slaves|Encyclopedia][$encyclopedia = "Slaves"]]
+	<br>[[Obtaining Slaves|Encyclopedia][$encyclopedia = "Obtaining Slaves"]]
+	<br>[[Slave Assignments|Encyclopedia][$encyclopedia = "Slave Assignments"]]
+	<br>[[Slave Body|Encyclopedia][$encyclopedia = "Body"]] / [[Skills|Encyclopedia][$encyclopedia = "Skills"]]
+	<br>[[Slave Fetishes|Encyclopedia][$encyclopedia = "Fetishes"]] / [[Quirks|Encyclopedia][$encyclopedia = "Quirks"]] / [[Flaws|Encyclopedia][$encyclopedia = "Flaws"]]
+	<br>[[Slave Relationships|Encyclopedia][$encyclopedia = "Relationships"]]
+	/* Section for arcology and Lore */
+	<br>[[The X-Series Arcology|Encyclopedia][$encyclopedia = "What the Upgrades Do"]]
+	<br>[[Arcology Facilities|Encyclopedia][$encyclopedia = "Facilities"]]
+	<br>[[Terrain Types|Encyclopedia][$encyclopedia = "Terrain Types"]]
+	<br>[[Future Societies|Encyclopedia][$encyclopedia = "Future Societies"]]
+	<br>[[Lore|Encyclopedia][$encyclopedia = "Lore"]]
+	/* Mods and extras */
+	<br>[[Game Mods|Encyclopedia][$encyclopedia = "Game Mods"]]
+	<br>[[Credits|Encyclopedia][$encyclopedia = "Credits"]]
+<<elseif _Pass == "Starting Girls">>
+	<span id="cost"><<SlaveCostDescription>></span>
+<</if>>
 
+<<if $ui != "start" && _Pass !== "Encyclopedia">>
 	<<if $sideBarOptions.Cash > 0>> <br>
 		<<set $cash = Math.trunc($cash)>>
 		<span id="cash">