diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 789c67c86acc71d6ea5fdd088a0557b762ff3c77..e41b41fabe345596a4ae8443d5cfb36f1bae6444 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -6,7 +6,7 @@
 	<<set _HistoryDiscount = 1>>
 <</if>>
 
-<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
+<<set $nextButton = "Back", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
 
 Propaganda Hub
 <hr>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 7da10870a70ae9b71dd8708fdae0c5963f47f078..9899cd6a2a5e868593f577b39671594a33b0436a 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,6 +1,6 @@
 :: riotControlCenter [nobr]
 
-<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
+<<set $nextButton = "Back", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
 
 Riot Control Center
 <hr>
diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw
index d00288aaa7e06245cf519474bb117a5b08132d4c..a9df19c45e13b576d68d071310bb5b358d18923b 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -1,6 +1,6 @@
 :: secBarracks [nobr]
 
-<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
+<<set $nextButton = "Back", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
 
 The Barracks
 <hr>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index e61c94e97008f800fb3cf88553b6518ab20bb2b9..a274dcd2f87b18e1908aae774e2dfaa44e7d25ce 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -6,9 +6,9 @@
 	<<set _HistoryDiscount = 1>>
 <</if>>
 
-<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
+<<set $nextButton = "Back", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
 
-Security headquarters
+Security Headquarters
 <hr>
 
 The security headquarters stand in front of you. Innumerable screens flood with light the great central room. <<if $secMenials > 0>>Some slaves see you enter and interrupt their work to greet you.<</if>> From here you can build a safe and prosperous arcology.
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 159a94c35fa5e2ac68a4862cab1be65af8c13b24..a0471bb6a4c5a91de386f7c97bb6386187869bc0 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1,6 +1,6 @@
 :: Manage Corporation [nobr]
 
-<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "The Corporation">>
+<<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "The Corporation">>
 
 <<if $corpIncorporated == 0>>
 __Incorporation__
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 1620086abb87be171fbe4a9eacb8d8ed4f456dff..de12990ecb4163a5f66f0f69480dcdad247a6d90 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -1,7 +1,7 @@
-:: StoryCaption
-\
-<<set _Pass = passage()>>\
-<<if _Pass == "Encyclopedia">>\
+:: StoryCaption [nobr]
+
+<<set _Pass = passage()>>
+<<if _Pass == "Encyclopedia">>
 <span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>> to Free Cities</strong></span>
 /* Intro, new players, PC/Gameplay focused */
 [[Playing Free Cities|Encyclopedia][$encyclopedia = "Playing Free Cities"]]
@@ -23,16 +23,15 @@
 /* Mods and extras */
 [[Game Mods|Encyclopedia][$encyclopedia = "Game Mods"]]
 [[Credits|Encyclopedia][$encyclopedia = "Credits"]]
-<<elseif _Pass == "Starting Girls">>\
+<<elseif _Pass == "Starting Girls">>
 <span id="cost"><<SlaveCostDescription>></span>
 
-<<elseif $ui == "disclaimer">>\
+<<elseif $ui == "disclaimer">>
 	<span id="nextButton"><strong><<link [[($nextButton)|($nextLink)]]>><</link>></strong></span>
-<<elseif $ui != "start">>\
-<<nobr>>
+<<elseif $ui != "start">>
 
 <<set _SL = $slaves.length>>
-<<if $cheatMode>>_Pass<br><</if>>
+<<if $cheatMode || $debugMode>>_Pass<br><</if>>
 <span id="week">''Week $week''</span>
 <br>Week of $month $day, $year
 <<if (_Pass == "Main") && ($cheatMode)&& ($cheatModeM)>>
@@ -60,18 +59,18 @@
 	<<resetAssignmentFilter>> /* very important! */
 	<</link>></strong></span> @@.cyan;[Ent]@@
 	<<if $rulesError && $rulesAssistantAuto == 1>><br>@@.yellow; WARNING: some custom rules will change slave variables@@<</if>>
-<<else>>
+	<br><br>
+<<elseif $nextButton !== " ">>
 	<span id="nextButton"> /* target for miscWidgets' <<UpdateNextButton>> */
 		<strong><<link "$nextButton">> /* must use link so spacebar shortcut will work */
-			<<if $nextButton != " ">> /* but no effect if nextButton is set to a blank space */
 				<<set $ui = "main">>
 				<<goto $nextLink>>
-			<</if>>
 		<</link>></strong>
-		<<if $nextButton != " ">>@@.cyan;[Space]@@<</if>>
+		@@.cyan;[Space]@@
 	</span>
+	<br><br>
 <</if>>
-<br><br>
+
 <<if $newModelUI == 0>>
 	<<if _Pass == "Main">>
 		<span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
@@ -179,7 +178,7 @@
 			<</link>>
 		<</if>>
 	<</if>>
-	<br>[[Upkeep|Costs Budget]] |
+	[[Upkeep|Costs Budget]] |
 <<else>>
 	<<if $foodMarket > 0>>
 		<<set $food = Math.trunc($food)>>
@@ -192,7 +191,7 @@
 		| <<print massFormat($food)>>
 		</span>
 	<</if>>
-	<br>Upkeep |
+	Upkeep |
 <</if>><<print cashFormat($costs)>>
 <br><br>@@.pink;Total Sex Slaves@@ | <<print num(_SL)>>
 <br>@@.pink;Penthouse Beds@@ |
@@ -588,187 +587,133 @@
 			<<else>>
 				(_SCapT)
 			<</if>>
+			<br>
 		<</if>>
-		<br>
+		
 		<<if $SF.Toggle && $SF.Active >= 1>>
 			<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
 		<</if>>
-		<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
 	<<else>>
-		<br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
-		<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
-		<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
-		<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
-		<<if $secExp == 1>>
-		<<if $propHub == 1>>
-		<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
-		<</if>>
-		<<if $secHQ == 1>>
-		<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
-		<</if>>
-		<<if $secBarracks == 1>>
-		<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
-		<</if>>
-		<<if $riotCenter == 1>>
-		<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
-		<</if>>
-		<</if>>
-		<<if $SF.Toggle && $SF.Active >= 1>>
-			<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
-		<</if>>
-
-		<br>
-		<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
-		<br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[Y]@@
-		<<if $secExp == 1>>
-		<br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[D]@@
-		<</if>>
-		<<if $FSAnnounced>>
-			<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>>
-		<</if>>
-		<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+			<br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[Y]@@
+			<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
+			<<if $FSAnnounced>>
+				<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[F]@@ <<if ($FSCredits > 0) || ($FSReminder)>>@@.yellow;[!]@@<</if>>
+			<</if>>
+			<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@<br>
 
-		<br>
-		<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
+			<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
+			<br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
+			<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
+			<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
 	<</if>>
-	<br>
-
+<<elseif _Pass == "Wardrobe Use">>
+	<br><<link [[Wardrobe (shopping)|Wardrobe]]>><</link>>
+<<elseif _Pass == "Options">>
+	<br><br>[[Summary Options]]
+	<br>[[Description Options]]
 <<elseif _Pass == "Manage Arcology">>
-	<br>
-	<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
-	<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
-	<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
+	<span id="Security"> <br>
 	<<if $secExp == 1>>
-	<<if $propHub == 1>>
-	<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
-	<</if>>
-	<<if $secHQ == 1>>
-	<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
-	<</if>>
-	<<if $secBarracks == 1>>
-	<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
-	<</if>>
-	<<if $riotCenter == 1>>
-	<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
-	<</if>>
-	<</if>>
-	<<if $SF.Toggle && $SF.Active >= 1>>
-	<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
-	<</if>>
-
-	<br>
-	<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
-	<br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[Y]@@
-	<<if $secExp == 1>>
-	<br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[D]@@
-	<</if>>
-	<<if $FSAnnounced>>
-	<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Arcology">><</link>></span> @@.cyan;[F]@@
+		<br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Main">><</link>></span> @@.cyan;[D]@@
+		<</if>>
+	<<if $secExp > 0 || $SF.Toggle && $SF.Active >= 1>> <br>
+		<<link "Manage Security">> <<replace "#Security">> <br>
+			<<if $SF.Toggle && $SF.Active >= 1>>
+				<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+			<</if>>
+			<<if $secExp == 1>>
+				<<if $propHub == 1>>
+				<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
+				<</if>>
+				<<if $secHQ == 1>>
+				<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
+				<</if>>
+				<<if $secBarracks == 1>>
+				<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+				<</if>>
+				<<if $riotCenter == 1>>
+				<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
+				<</if>>
+			<</if>>
+		<</replace>> <</link>>
 	<</if>>
-	<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-	<br>
-	<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
+	</span>
 <<elseif _Pass == "Manage Penthouse">>
+	<br><br> <<link [[Wardrobe]]>><</link>>
+	<<if $dispensary>> <br>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
+	<<if $ImplantProductionUpgrade>> <br>[[Implant Manufactory|Implant Manufactory]]<</if>>
+	<<if $organFarmUpgrade>> <br>[[Organ Farm|Organ Farm]]<</if>>
+	<<if $geneticMappingUpgrade>> <br>[[Gene Lab|Gene Lab]]<</if>>
+<<elseif _Pass == "Manage Personal Affairs">>
 	<br>
-	<br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
-	<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
-	<br><span id="managePerson"><<link [[Manage Personal Affairs|Manage Personal Affairs]]>><</link>></span> @@.cyan;[X]@@
-	<br>
-	<br><<link [[Wardrobe]]>><</link>>
-	<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
-	<br><<if $ImplantProductionUpgrade>>[[Implant Manufactory|Implant Manufactory]]<</if>>
-	<br><<if $prostheticsUpgrade > 0>>[[Prosthetic Lab|Prosthetic Lab]]<</if>>
-	<br><<if $organFarmUpgrade>>[[Organ Farm|Organ Farm]]<</if>>
-	<br><<if $geneticMappingUpgrade>>[[Gene Lab|Gene Lab]]<</if>>
-	<br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
-	<br><br><br><br><br>
-<<elseif _Pass == "Manage Corporation">>
+	<<if $rep >= 10000>> <br>[[Black Market|The Black Market]]<</if>>
+<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
 	<br>
-	<br><span id="manageArcology"><<link "Manage Arcology">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Arcology">><</link>></span> @@.cyan;[C]@@
-	<br><span id="managePenthouse"><<link "Manage Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>></span> @@.cyan;[P]@@
-	<br><span id="managePerson"><<link "Manage Personal Affairs">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Personal Affairs">><</link>></span> @@.cyan;[X]@@
-	<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
-	<<if $secExp == 1>>
-	<<if $propHub == 1>>
-	<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
-	<</if>>
-	<<if $secHQ == 1>>
-	<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
-	<</if>>
-	<<if $secBarracks == 1>>
-	<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+	<<if $propHub > 0 && _Pass !== "propagandaHub">>
+		<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
 	<</if>>
-	<<if $riotCenter == 1>>
-	<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
+	<<if $secHQ > 0 && _Pass !== "securityHQ">>
+		<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
 	<</if>>
+	<<if $secBarracks > 0 && _Pass !== "secBarracks">>
+		<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
 	<</if>>
-	<<if $SF.Toggle && $SF.Active >= 1>>
-	<br><span id="SFMButton"> <<link "$SF.Caps's firebase""Firebase">><</link>> </span> @@.cyan;[Z]@@
+	<<if $riotCenter > 0 && _Pass !== "riotControlCenter">>
+		<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
 	<</if>>
+<</if>>
 
+<<if  _Pass !== "Main" && $nextButton !== " ">>
 	<br>
-	<br><span id="PAOButton"><<link [[Personal Assistant|Personal assistant options]]>><</link>></span> @@.cyan;[T]@@
-	<br><span id="policyButton"><<link [[Policies]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[Y]@@
-	<<if $secExp == 1>>
-	<br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[D]@@
-	<</if>>
-	<<if $FSAnnounced>>
-	<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Corporation">><</link>></span> @@.cyan;[F]@@
+	<<if _Pass !== "Options">>
+		<<if _Pass !== "Summary Options">>
+			<br> <<link "Summary Options" "Summary Options">> <</link>>
+		<</if>>
+		<<if _Pass !== "Description Options">>
+			<br> <<link "Description Options" "Description Options">> <</link>>
+		<</if>>
 	<</if>>
-	<br><span id="URButton"><<link [[Universal Rules]]>><</link>></span> @@.cyan;[V]@@
-	<br>
-	<br><span id="optionsButton"><<link "Game Options">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Options">><</link>></span> @@.cyan;[O]@@
-<<elseif _Pass == "Manage Personal Affairs">>
-	<br>
-	<br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
-	<br><span id="managePenthouse"><<link [[Manage Penthouse|Manage Penthouse]]>><</link>></span> @@.cyan;[X]@@
-	<<if $corpAnnounced == 1>><br><span id="manageCorporation"><<link "Manage Corporation">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Corporation">><</link>><<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>></span><</if>>
-	<br>
-	<br><<link [[Wardrobe]]>><</link>>
-	<br><<if $dispensary>>[[Pharmaceutical Fabricator|Dispensary]]<</if>>
-	<br><<if $ImplantProductionUpgrade>>[[Implant Manufactory|Implant Manufactory]]<</if>>
-	<br><<if $organFarmUpgrade>>[[Organ Farm|Organ Farm]]<</if>>
-	<br><<if $geneticMappingUpgrade>>[[Gene Lab|Gene Lab]]<</if>>
-	<br><<if $rep >= 10000>>[[Black Market|The Black Market]]<</if>>
-	<br><br><br><br><br>
-<<elseif _Pass == "Wardrobe Use">>
-	<br>
-	<br><<link [[Wardrobe (shopping)|Wardrobe]]>><</link>>
-	<br><br><br><br><br>
-<<elseif _Pass == "Options">>
-	<br>
-	<br>[[Summary Options]]
-	<br>[[Description Options]]
-	<br>
-<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
-	<br>
-	<<if $propHub == 1>>
-	<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
+	<span id="manageCorporation">
+	<<if _Pass !== "Manage Corporation">>
+		<br> <<link "Manage Corporation" "Manage Corporation">> <</link>> <<if ($corpSpecToken > 0) && ($corpSpecTimer == 0)>>@@.yellow;[!]@@<</if>>
 	<</if>>
-	<<if $secHQ == 1>>
-	<br><span id="securityHQ"><<link "Manage Security">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "securityHQ">><</link>></span> @@.cyan;[Shift+S]@@
+	</span>
+	<span id="manageArcology">
+	<<if _Pass !== "Manage Arcology">>
+		<br> <<link "Manage Arcology" "Manage Arcology">> <</link>> @@.cyan;[C]@@
 	<</if>>
-	<<if $secBarracks == 1>>
-	<br><span id="secBarracks"><<link "Manage Military">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "secBarracks">><</link>></span> @@.cyan;[Shift+A]@@
+	</span>
+	<span id="managePenthouse">
+	<<if _Pass !== "Manage Penthouse">>
+		<br> <<link "Manage Penthouse" "Manage Penthouse">> <</link>> @@.cyan;[P]@@
 	<</if>>
-	<<if $riotCenter == 1>>
-	<br><span id="riotCenter"><<link "Manage Rebels">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "riotControlCenter">><</link>></span> @@.cyan;[Shift+R]@@
+	</span>
+	<span id="managePerson">
+	<<if _Pass !== "Manage Personal Affairs">>
+		<br> <<link "Manage Personal Affairs" "Manage Personal Affairs">> <</link>> @@.cyan;[X]@@
 	<</if>>
+	</span>
 	<br>
-<<else>>
-	<br><br><br><br><br><br><br><br>
 <</if>>
-<</nobr>>
-<</if>>\
-<<nobr>>
+
+<<if _Pass !== "Options">>
+	<br><br>
+	<span id="optionsButton">
+	<<link "Game Options">>
+		<<set $nextButton = "Back", $nextLink = _Pass>>
+		<<goto "Options">>
+	<</link>>
+	</span> @@.cyan;[O]@@
+<</if>>
+
+<</if>>
 <<if (_Pass == "Encyclopedia") || ($showEncyclopedia == 0) || ($encyclopedia == " ")>>
 <<else>>
-	//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
+	<br>//FCE:// [[$encyclopedia|Encyclopedia][$nextButton = "Back", $nextLink = _Pass]]
 <</if>>
-	<br><br>
+	
 <<if ($debugMode == 1)>>
-	Debugging Tools
-	<br>
+	<br><br>Debugging Tools<br>
 	<<link "Display Variables">><<checkvars>><</link>>
 	<br>
 	<<link "Display Changed Variables">>
@@ -793,5 +738,3 @@
 	<br>
 	<<link "Dump Game State">><<run App.Debug.dumpGameState()>><</link>>
 <</if>>
-
-<</nobr>>