diff --git a/src/facilities/farmyard/food/foodMarket.tw b/src/facilities/farmyard/food/foodMarket.tw
index 79a99d2e1b47eb458f0166ee840eb531be02fa92..09fd3aed69631540da6305721b7990eb2d25a52f 100644
--- a/src/facilities/farmyard/food/foodMarket.tw
+++ b/src/facilities/farmyard/food/foodMarket.tw
@@ -8,56 +8,56 @@ The food market has @@.chocolate;<<print massFormat($foodStored)>>@@ in storage,
 
 /* TODO: allow for the buying and selling of food */
 <br>
-<<link "Buy <<= massFormat(1)>>" "Manage Economy">><<set cashX(forceNeg($foodCost*1), "farmyard"), $foodStored += 1>><</link>>
-| <<link "<<= massFormat(10)>>" "Manage Economy">><<set cashX(forceNeg($foodCost*10), "farmyard"), $foodStored += 10>><</link>>
-| <<link "<<= massFormat(100)>>" "Manage Economy">><<set cashX(forceNeg($foodCost*100), "farmyard"), $foodStored += 100>><</link>>
-| <<link "<<= massFormat(1000)>>" "Manage Economy">><<set cashX(forceNeg($foodCost*1000), "farmyard"), $foodStored += 1000>><</link>>
-| <<link "<<= massFormat(10000)>>" "Manage Economy">><<set cashX(forceNeg($foodCost*10000), "farmyard"), $foodStored += 10000>><</link>>
+<<link "Buy <<= massFormat(1)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*1), "farmyard"), $foodStored += 1>><</link>>
+| <<link "<<= massFormat(10)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*10), "farmyard"), $foodStored += 10>><</link>>
+| <<link "<<= massFormat(100)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*100), "farmyard"), $foodStored += 100>><</link>>
+| <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*1000), "farmyard"), $foodStored += 1000>><</link>>
+| <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set cashX(forceNeg($foodCost*10000), "farmyard"), $foodStored += 10000>><</link>>
 <<if $foodStored > 0>>
 	<br>
-	<<link "Sell <<= massFormat(1)>>" "Manage Economy">><<set cashX(($foodCost*1), "farmyard"), $foodStored -= 1>><</link>>
+	<<link "Sell <<= massFormat(1)>>" "Manage Arcology">><<set cashX(($foodCost*1), "farmyard"), $foodStored -= 1>><</link>>
 <</if>>
 <<if $foodStored >= 10>>
-	| <<link "<<= massFormat(10)>>" "Manage Economy">><<set cashX(($foodCost*10), "farmyard"), $foodStored -= 10>><</link>>
+	| <<link "<<= massFormat(10)>>" "Manage Arcology">><<set cashX(($foodCost*10), "farmyard"), $foodStored -= 10>><</link>>
 <</if>>
 <<if $foodStored >= 100>>
-	| <<link "<<= massFormat(100)>>" "Manage Economy">><<set cashX(($foodCost*100), "farmyard"), $foodStored -= 100>><</link>>
+	| <<link "<<= massFormat(100)>>" "Manage Arcology">><<set cashX(($foodCost*100), "farmyard"), $foodStored -= 100>><</link>>
 <</if>>
 <<if $foodStored >= 1000>>
-	| <<link "<<= massFormat(1000)>>" "Manage Economy">><<set cashX(($foodCost*1000), "farmyard"), $foodStored -= 1000>><</link>>
+	| <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set cashX(($foodCost*1000), "farmyard"), $foodStored -= 1000>><</link>>
 <</if>>
 <<if $foodStored >= 10000>>
-	| <<link "<<= massFormat(10000)>>" "Manage Economy">><<set cashX(($foodCost*10000), "farmyard"), $foodStored -= 10000>><</link>>
+	| <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set cashX(($foodCost*10000), "farmyard"), $foodStored -= 10000>><</link>>
 <</if>>
 <<if $food > 0>>
 	<br>
-	<<link "Store <<= massFormat(1)>>" "Manage Economy">><<set $foodStored += 1, $food -= 1>><</link>>
+	<<link "Store <<= massFormat(1)>>" "Manage Arcology">><<set $foodStored += 1, $food -= 1>><</link>>
 <</if>>
 <<if $food >= 10>>
-	| <<link "<<= massFormat(10)>>" "Manage Economy">><<set $foodStored += 10, $food -= 10>><</link>>
+	| <<link "<<= massFormat(10)>>" "Manage Arcology">><<set $foodStored += 10, $food -= 10>><</link>>
 <</if>>
 <<if $food >= 100>>
-	| <<link "<<= massFormat(100)>>" "Manage Economy">><<set $foodStored += 100, $food -= 100>><</link>>
+	| <<link "<<= massFormat(100)>>" "Manage Arcology">><<set $foodStored += 100, $food -= 100>><</link>>
 <</if>>
 <<if $food >= 1000>>
-	| <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $foodStored += 1000, $food -= 1000>><</link>>
+	| <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set $foodStored += 1000, $food -= 1000>><</link>>
 <</if>>
 <<if $food >= 10000>>
-	| <<link "<<= massFormat(10000)>>" "Manage Economy">><<set $foodStored += 10000, $food -= 10000>><</link>>
+	| <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set $foodStored += 10000, $food -= 10000>><</link>>
 <</if>>
 <<if $foodStored > 0>>
 	<br>
-	<<link "Retrieve <<= massFormat(1)>>" "Manage Economy">><<set $food += 1, $foodStored -= 1>><</link>>
+	<<link "Retrieve <<= massFormat(1)>>" "Manage Arcology">><<set $food += 1, $foodStored -= 1>><</link>>
 <</if>>
 <<if $foodStored >= 10>>
-	| <<link "<<= massFormat(10)>>" "Manage Economy">><<set $food += 10, $foodStored -= 10>><</link>>
+	| <<link "<<= massFormat(10)>>" "Manage Arcology">><<set $food += 10, $foodStored -= 10>><</link>>
 <</if>>
 <<if $foodStored >= 100>>
-	| <<link "<<= massFormat(100)>>" "Manage Economy">><<set $food += 100, $foodStored -= 100>><</link>>
+	| <<link "<<= massFormat(100)>>" "Manage Arcology">><<set $food += 100, $foodStored -= 100>><</link>>
 <</if>>
 <<if $foodStored >= 1000>>
-	| <<link "<<= massFormat(1000)>>" "Manage Economy">><<set $food += 1000, $foodStored -= 1000>><</link>>
+	| <<link "<<= massFormat(1000)>>" "Manage Arcology">><<set $food += 1000, $foodStored -= 1000>><</link>>
 <</if>>
 <<if $foodStored >= 10000>>
-	| <<link "<<= massFormat(10000)>>" "Manage Economy">><<set $food += 10000, $foodStored -= 10000>><</link>>
+	| <<link "<<= massFormat(10000)>>" "Manage Arcology">><<set $food += 10000, $foodStored -= 10000>><</link>>
 <</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 7b9213065ef426af8a3250c91e8e5110e1d51a2b..d2755edbc140d380215cba6da601245cc9e31fc0 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -293,7 +293,7 @@ BEING IN CHARGE
 
 
 <<case "The Corporation">>
-	Once you are fairly reputable and have a large sum of cash in the bank, you will receive a brief end of turn event that unlocks the ability to found a corporation dedicated to slaving. Once this happens, you can incorporate from the 'Manage Corporation' tab found under 'Manage Economy", and once you've done that, you can manage your corporation every week from the same place.
+	Once you are fairly reputable and have a large sum of cash in the bank, you will receive a brief end of turn event that unlocks the ability to found a corporation dedicated to slaving. Once this happens, you can incorporate from the 'Manage Corporation' link on the sidebar, and once you've done that, you can manage your corporation every week from the same place.
 
 	<br><br>__Shares__
 	Buying shares from the corporation or issuing new shares will create new shares in the corporation. If you buy them yourself, cash will be transferred from you to the corporation in return for the shares; if you direct the corporation to issue new public shares, @@.yellowgreen;[[money|Encyclopedia][$encyclopedia = "Money"]]@@ will come into the corporation from the market. If you direct the corporation to buy back shares from the public, cash will be transferred from the corporation to reduce the number of public shares, which will increase your ownership percentage. You are not permitted to give up majority ownership of the corporation. Selling your shares or buying publicly held shares are both transactions between you and your shares and shareholders and their shares. All transactions impact the stock price.
diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw
index 9545b79adcd5d434d6b4164c8fba518c5b89f481..412cbe1fca2bb8bab4dffec43a61b3b11fe9693f 100644
--- a/src/pregmod/manageCorporation.tw
+++ b/src/pregmod/manageCorporation.tw
@@ -1,6 +1,6 @@
 :: Manage Corporation [nobr]
 
-<<set $nextButton = "Back", $nextLink = "Manage Economy", $showEncyclopedia = 1, $encyclopedia = "The Corporation">>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "The Corporation">>
 
 <<if $corpIncorporated == 0>>
 __Incorporation__
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
deleted file mode 100644
index 3e0c4b1bd09d5f68c3c1f53a9de7ccd04517126e..0000000000000000000000000000000000000000
--- a/src/pregmod/manageEconomy.tw
+++ /dev/null
@@ -1,230 +0,0 @@
-:: Manage Economy [nobr]
-<<set $nextButton = "Back", $nextLink = "Main">>
-
-<<if $difficultySwitch == 1>>
-__Economy__<br>
-	<span id="economy">
-		@@.yellowgreen;Global Economy@@
-	| <<print $economy>>
-	</span>
-	<<if ($cheatMode) && ($cheatModeM)>>
-		<<set _Teconomy = $economy>>
-		<<textbox "_Teconomy" _Teconomy>>
-		<<link "Apply">>
-		<<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>>
-		<<replace "#economy">>
-		@@.yellowgreen;Global Economy@@
-		| <<print $economy>>
-		<</replace>>
-		<</link>>
-	<</if>>
-	<br>
-
-	<span id="localEcon">
-		@@.yellowgreen;Local Economy@@
-	| <<print $localEcon>>
-	</span>
-	<<if ($cheatMode) && ($cheatModeM)>>
-		<<set _TlocalEcon = $localEcon>>
-		<<textbox "_TlocalEcon" _TlocalEcon>>
-		<<link "Apply">>
-		<<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>>
-		<<replace "#localEcon">>
-		@@.yellowgreen;Local Economy@@
-		| <<print $localEcon>>
-		<</replace>>
-		<</link>>
-	<</if>>
-
-	<br><br> //The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is ''100''.//
-	<br> The current score is
-	<<if $localEcon > 100>>
-		<<set _econPercent = Math.trunc(1000-100000/$localEcon)/10>>
-		reducing prices by @@.green;''<<print _econPercent>>%.''@@
-	<<elseif $localEcon == 100>>
-		equal to the base score. There are no price modifications.
-	<<else>>
-		<<set _econPercent = Math.trunc(100000/$localEcon-1000)/10>>
-		increasing prices by @@.red;''<<print _econPercent>>%.''@@
-	<</if>>
-	<<if $econWeatherDamage > 0>>
-		<br><br>The recent terrible weather has damaged the local infrastructure. It is @@.red;reducing the local economy score by <<print $econWeatherDamage>>.@@
-		<<if $disasterResponse == 0>>
-			<br>Locals will do their best to repair the damage on their own, but setting up a disaster response unit <br>will improve the recovery of infrastructure critical for keeping goods, people and information flowing smoothly in and out of your arcology.
-			<br>Creating the unit will cost <<print cashFormat(50000)>> and incur upkeep. [[Create Disaster Response Unit|Manage Economy][cashX(-50000, "capEx"), $disasterResponse = 1]]
-		<<elseif $disasterResponse == 1>>
-			<br>You are sending your disaster response unit to repair critical infrastructure. They are doing what they can.
-			<br>The unit can be made more effective with an additional investment of <<print cashFormat(100000)>>. This will also increase upkeep. [[Improve Disaster Response Unit|Manage Economy][cashX(-100000, "capEx"), $disasterResponse = 2]]
-		<<else>>
-			<br>Your highly capable disaster response unit is rapidly repairing the weather damage.
-		<</if>>
-	<<elseif $disasterResponse > 0>>
-		<br><br>Your disaster response unit is idle. It will not cost you any upkeep this week.
-	<</if>>
-<br><br>
-<</if>>
-
-<<if $corpAnnounced == 1>>
-	__Corporation__
-	<<link "Manage Corporation">><<goto "Manage Corporation">><</link>>
-	<br><br>
-<</if>>
-
-__Population and Rent__<br>
-<<print $arcologies[0].name>> is home to the following;
-<<set _percACitizens = Math.trunc(($ACitizens / ($ACitizens + $ASlaves)) * 1000) / 10,
-_percASlaves = Math.trunc(($ASlaves / ($ACitizens + $ASlaves)) * 1000) / 10,
-_percLowerClass = Math.trunc(($lowerClass / ($ACitizens + $ASlaves)) * 1000) / 10,
-_percMiddleClass = Math.trunc(($middleClass / ($ACitizens + $ASlaves)) * 1000) / 10,
-_percUpperClass = Math.trunc(($upperClass / ($ACitizens + $ASlaves)) * 1000) / 10,
-_percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
-<br>Lower Class Citizens  | $lowerClass | <<print _percLowerClass>>% | Rent @@.yellowgreen;<<print cashFormat($LCRent / 25)>>@@
-<<if $LCRent > 30>>
-	//Very High// | [[Decrease|Manage Economy][$LCRent = 30, $rentEffectL = 0.94]]
-<<elseif $LCRent > 20>>
-	//High// | [[Increase|Manage Economy][$LCRent = 40, $rentEffectL = 0.85]] | [[Decrease|Manage Economy][$LCRent = 20, $rentEffectL = 1]]
-<<elseif $LCRent > 10>>
-	//Average// | [[Increase|Manage Economy][$LCRent = 30, $rentEffectL = 0.94]] | [[Decrease|Manage Economy][$LCRent = 10, $rentEffectL = 1.04]]
-<<elseif $LCRent > 0>>
-	//Low// | [[Increase|Manage Economy][$LCRent = 20, $rentEffectL = 1]] | [[Free Rent|Manage Economy][$LCRent = 0, $rentEffectL = 1.1]]
-<<else>>
-	//Free// | [[Increase|Manage Economy][$LCRent = 10, $rentEffectL = 1.04]]
-<</if>>
-<br>Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent @@.yellowgreen;<<print cashFormat($MCRent / 25)>>@@
-<<if $MCRent > 75>>
-	//Very High// | [[Decrease|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]]
-<<elseif $MCRent > 50>>
-	//High// | [[Increase|Manage Economy][$MCRent = 100, $rentEffectM = 0.85]] | [[Decrease|Manage Economy][$MCRent = 50, $rentEffectM = 1]]
-<<elseif $MCRent > 25>>
-	//Average// | [[Increase|Manage Economy][$MCRent = 75, $rentEffectM = 0.94]] | [[Decrease|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
-<<elseif $MCRent > 0>>
-	//Low// | [[Increase|Manage Economy][$MCRent = 50, $rentEffectM = 1]] | [[Free Rent|Manage Economy][$MCRent = 0, $rentEffectM = 1.1]]
-<<else>>
-	//Free// | [[Increase|Manage Economy][$MCRent = 25, $rentEffectM = 1.04]]
-<</if>>
-<br>Upper Class Citizens  | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent / 25)>>@@
-<<if $UCRent > 270>>
-	//Very High// | [[Decrease|Manage Economy][$UCRent = 270, $rentEffectU = 0.94]]
-<<elseif $UCRent > 180>>
-	//High// | [[Increase|Manage Economy][$UCRent = 360, $rentEffectU = 0.85]] | [[Decrease|Manage Economy][$UCRent = 180, $rentEffectU = 1]]
-<<elseif $UCRent > 90>>
-	//Average// | [[Increase|Manage Economy][$UCRent = 270, $rentEffectU = 0.94]] | [[Decrease|Manage Economy][$UCRent = 90, $rentEffectU = 1.04]]
-<<elseif $UCRent > 0>>
-	//Low// | [[Increase|Manage Economy][$UCRent = 180, $rentEffectU = 1]] | [[Free Rent|Manage Economy][$UCRent = 0, $rentEffectU = 1.1]]
-<<else>>
-	//Free// | [[Increase|Manage Economy][$UCRent = 90, $rentEffectU = 1.04]]
-<</if>>
-<br>Millionaires		  | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent / 25)>>@@
-<<if $TCRent > 975>>
-	//Very High// | [[Decrease|Manage Economy][$TCRent = 975, $rentEffectT = 0.94]]
-<<elseif $TCRent > 650>>
-	//High// | [[Increase|Manage Economy][$TCRent = 1300, $rentEffectT = 0.85]] | [[Decrease|Manage Economy][$TCRent = 650, $rentEffectT = 1]]
-<<elseif $TCRent > 325>>
-	//Average// | [[Increase|Manage Economy][$TCRent = 975, $rentEffectT = 0.94]] | [[Decrease|Manage Economy][$TCRent = 325, $rentEffectT = 1.04]]
-<<elseif $TCRent > 0>>
-	//Low// | [[Increase|Manage Economy][$TCRent = 650, $rentEffectT = 1]] | [[Free Rent|Manage Economy][$TCRent = 0, $rentEffectT = 1.1]]
-<<else>>
-	//Free// | [[Increase|Manage Economy][$TCRent = 325, $rentEffectT = 1.04]]
-<</if>>
-<br>Slaves				| $ASlaves | <<print _percASlaves>>%
-
-<<if $secExp == 0>>
-	<<if $weatherAwareness > 0>>
-		<<if $antiWeatherFreeze == 0>>
-			<br><br>The extreme weather hurts your arcology's ability to function. Reinforcing your passenger terminals increase the weather range at which they can operate.<br>
-			Reinforcing passenger terminals costs <<print cashFormat(50000)>> and increase upkeep. [[Reinforce|Manage Economy][$antiWeatherFreeze = 1, cashX(-50000, "capEx")]]
-		<<elseif $antiWeatherFreeze == 1>>
-			<br><br>You have reinforced your passenger terminals to function even during bad weather. You can invest into all-weather transportation to remain functional no matter what.<br>
-			Investing in all-weather transportation costs <<print cashFormat(100000)>> and increase upkeep. [[Invest|Manage Economy][$antiWeatherFreeze = 2, cashX(-100000, "capEx")]]
-		<<elseif $antiWeatherFreeze == 2>>
-			<br><br>Your arcology's passenger terminals remain fully operational even during the most extreme weather.
-		<</if>>
-	<</if>>
-<</if>>
-<br><br>
-
-__Slaves__<br>
-Slave demand is
-<<if $menialDemandFactor <= -35000>>
-	@@.red;''extremely low''@@
-<<elseif $menialDemandFactor <= -20000>>
-	@@.red;''very low''@@
-<<elseif $menialDemandFactor <= 0>>
-	@@.yellow;''weak''@@
-<<elseif $menialDemandFactor >= 35000>>
-	@@.green;''extremely high''@@
-<<elseif $menialDemandFactor >= 20000>>
-	@@.green;''very high''@@
-<<else>>
-	@@.yellow;''strong''@@
-<</if>>
-<<if $deltaDemand > 0>>
-	and @@.green;''improving''@@
-<<elseif $deltaDemand < 0>>
-	and @@.red;''decreasing''@@
-<</if>>
-<<if $deltaDemand != 0>>
-	<<if $demandTimer - $elapsedDemandTimer < 3>>
-		but it might change soon
-	<</if>>
-<</if>>
-<<if ($cheatMode) && ($cheatModeM)>>
-	<span id="menialDemandFactor">
-	@@.yellowgreen;Slave Demand@@
-	| <<print $menialDemandFactor>>
-	</span>
-	<<set _TmenialDemandFactor = $menialDemandFactor>>
-	<<textbox "_TmenialDemandFactor" _TmenialDemandFactor>>
-	<<link "Apply">>
-	<<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
-	<<replace "#menialDemandFactor">>
-	@@.yellowgreen; Slave Demand@@
-	| <<print $menialDemandFactor>>
-	<</replace>>
-	<</link>>
-<</if>>
-<br>
-Slave supply is
-<<if $menialSupplyFactor <= -35000>>
-	@@.green;''extremely low''@@
-<<elseif $menialSupplyFactor <= -20000>>
-	@@.green;''very low''@@
-<<elseif $menialSupplyFactor <= 0>>
-	@@.yellow;''weak''@@
-<<elseif $menialSupplyFactor >= 35000>>
-	@@.red;''extremely high''@@
-<<elseif $menialSupplyFactor >= 20000>>
-	@@.red;''very high''@@
-<<else>>
-	@@.yellow;''strong''@@
-<</if>>
-<<if $deltaSupply > 0>>
-	and @@.red;''improving''@@
-<<elseif $deltaSupply < 0>>
-	and @@.green;''decreasing''@@
-<</if>>
-<<if $deltaSupply != 0>>
-	<<if $supplyTimer - $elapsedDemandTimer < 3>>
-		but it might change soon
-	<</if>>
-<</if>>
-<<if ($cheatMode) && ($cheatModeM)>>
-	<span id="menialSupplyFactor">
-	@@.yellowgreen;Slave Supply@@
-	| <<print $menialSupplyFactor>>
-	</span>
-	<<set _TmenialSupplyFactor = $menialSupplyFactor>>
-	<<textbox "_TmenialSupplyFactor" _TmenialSupplyFactor>>
-	<<link "Apply">>
-	<<set $menialSupplyFactor = Math.clamp(Math.trunc(Number(_TmenialSupplyFactor)),-50000,50000) || $menialSupplyFactor, $cheater = 1>>
-	<<replace "#menialSupplyFactor">>
-	@@.yellowgreen; Slave Supply@@
-	| <<print $menialSupplyFactor>>
-	<</replace>>
-	<</link>>
-<</if>>
-<br><br>
-
-<<if $foodMarket > 0>>
-<<include "Food Market">>
-<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 00b3f666ea986e97ebd11b738f035005e5417579..59eda6ce117b3952c779979d970228bd8de22000 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -10,6 +10,11 @@
 __Sex Slave Purchase Options__
 <br>
 //There are many different organizations to purchase slaves from, but many of them are selective about their customers and will only sell to you if you are reputable.//
+
+
+<br><br>
+
+__Market status__<br>
 <<if ($slaveCostFactor > 1.1)>>
 	@@.yellow;There is a bull market for slaves; the price of slaves is very high.@@
 <<elseif ($slaveCostFactor > 1)>>
@@ -21,6 +26,86 @@ __Sex Slave Purchase Options__
 <<else>>
 	The slave market is stable; the price of slaves is average.
 <</if>>
+<br>
+Slave demand is
+<<if $menialDemandFactor <= -35000>>
+	@@.red;''extremely low''@@
+<<elseif $menialDemandFactor <= -20000>>
+	@@.red;''very low''@@
+<<elseif $menialDemandFactor <= 0>>
+	@@.yellow;''weak''@@
+<<elseif $menialDemandFactor >= 35000>>
+	@@.green;''extremely high''@@
+<<elseif $menialDemandFactor >= 20000>>
+	@@.green;''very high''@@
+<<else>>
+	@@.yellow;''strong''@@
+<</if>>
+<<if $deltaDemand > 0>>
+	and @@.green;''improving''@@
+<<elseif $deltaDemand < 0>>
+	and @@.red;''decreasing''@@
+<</if>>
+<<if $deltaDemand != 0>>
+	<<if $demandTimer - $elapsedDemandTimer < 3>>
+		but it might change soon
+	<</if>>
+<</if>>
+<<if ($cheatMode) && ($cheatModeM)>>
+	<span id="menialDemandFactor">
+	@@.yellowgreen;Slave Demand@@
+	| <<print $menialDemandFactor>>
+	</span>
+	<<set _TmenialDemandFactor = $menialDemandFactor>>
+	<<textbox "_TmenialDemandFactor" _TmenialDemandFactor>>
+	<<link "Apply">>
+	<<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
+	<<replace "#menialDemandFactor">>
+	@@.yellowgreen; Slave Demand@@
+	| <<print $menialDemandFactor>>
+	<</replace>>
+	<</link>>
+<</if>>
+<br>
+Slave supply is
+<<if $menialSupplyFactor <= -35000>>
+	@@.green;''extremely low''@@
+<<elseif $menialSupplyFactor <= -20000>>
+	@@.green;''very low''@@
+<<elseif $menialSupplyFactor <= 0>>
+	@@.yellow;''weak''@@
+<<elseif $menialSupplyFactor >= 35000>>
+	@@.red;''extremely high''@@
+<<elseif $menialSupplyFactor >= 20000>>
+	@@.red;''very high''@@
+<<else>>
+	@@.yellow;''strong''@@
+<</if>>
+<<if $deltaSupply > 0>>
+	and @@.red;''improving''@@
+<<elseif $deltaSupply < 0>>
+	and @@.green;''decreasing''@@
+<</if>>
+<<if $deltaSupply != 0>>
+	<<if $supplyTimer - $elapsedDemandTimer < 3>>
+		but it might change soon
+	<</if>>
+<</if>>
+<<if ($cheatMode) && ($cheatModeM)>>
+	<span id="menialSupplyFactor">
+	@@.yellowgreen;Slave Supply@@
+	| <<print $menialSupplyFactor>>
+	</span>
+	<<set _TmenialSupplyFactor = $menialSupplyFactor>>
+	<<textbox "_TmenialSupplyFactor" _TmenialSupplyFactor>>
+	<<link "Apply">>
+	<<set $menialSupplyFactor = Math.clamp(Math.trunc(Number(_TmenialSupplyFactor)),-50000,50000) || $menialSupplyFactor, $cheater = 1>>
+	<<replace "#menialSupplyFactor">>
+	@@.yellowgreen; Slave Supply@@
+	| <<print $menialSupplyFactor>>
+	<</replace>>
+	<</link>>
+<</if>>
 
 <br>
 
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index abbbf1ca67bfb2f65d9789adb3ce6579090fdaa2..d57b6251c56da985ef52433ba81cdf5a5df32755 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -9,12 +9,60 @@
 <</if>>
 
 
-<br>
-//Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.
+//Here you can view many of the financial details of your arcology, <<= properTitle()>>. The detailed list of slaves and their costs (food, hormones) that you may remember can now be found in the "Slave maintenance" link. Other links will allow you to directly control areas of your arcology to adjust spending to suit your tastes.//
+
+<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
+
+<<if $difficultySwitch == 1>>
+	//The Local Economy score effects some prices in your ecology. The lower the score, the higher the prices. The base score is ''100''.//
+	<br>
+	<span id="economy">
+		@@.yellowgreen;Global Economy@@
+	| <<print $economy>>
+	</span>
+	<<if ($cheatMode) && ($cheatModeM)>>
+		<<set _Teconomy = $economy>>
+		<<textbox "_Teconomy" _Teconomy>>
+		<<link "Apply">>
+		<<set $economy = Math.trunc(Number(_Teconomy)) || $economy, $cheater = 1>>
+		<<replace "#economy">>
+		@@.yellowgreen;Global Economy@@
+		| <<print $economy>>
+		<</replace>>
+		<</link>>
+	<</if>>
+	<br>
+
+	<span id="localEcon">
+		@@.yellowgreen;Local Economy@@
+	| <<print $localEcon>>
+	</span>
+	<<if ($cheatMode) && ($cheatModeM)>>
+		<<set _TlocalEcon = $localEcon>>
+		<<textbox "_TlocalEcon" _TlocalEcon>>
+		<<link "Apply">>
+		<<set $localEcon = Math.trunc(Number(_TlocalEcon)) || $localEcon, $cheater = 1>>
+		<<replace "#localEcon">>
+		@@.yellowgreen;Local Economy@@
+		| <<print $localEcon>>
+		<</replace>>
+		<</link>>
+	<</if>>
 
-<br style="clear:both"><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>>
-<br>
-Your weekly costs are as follows://
+	<br> The current score is
+	<<if $localEcon > 100>>
+		<<set _econPercent = Math.trunc(1000-100000/$localEcon)/10>>
+		reducing prices by @@.green;''<<print _econPercent>>%.''@@
+	<<elseif $localEcon == 100>>
+		equal to the base score. There are no price modifications.
+	<<else>>
+		<<set _econPercent = Math.trunc(100000/$localEcon-1000)/10>>
+		increasing prices by @@.red;''<<print _econPercent>>%.''@@
+	<</if>>
+	<br style="clear:both" /><<if $lineSeparations == 0>><br><br><<else>><hr style="margin:0"><</if>>
+<</if>>
+
+//Your weekly costs are as follows://
 
 /* Table of Totals */
 <<if ndef $lastWeeksCashIncome>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 185fb225230df2fcd68868a629001b3605034bf3..c13db5806b3a0c662323c1aee10cfd877c269610 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -74,9 +74,22 @@ __Construction__
 	You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
 <</if>>
 
+<<if $secExp == 0>>
+	<<if $weatherAwareness > 0>>
+		<<if $antiWeatherFreeze == 0>>
+			<br><br>The extreme weather hurts your arcology's ability to function. Reinforcing your passenger terminals increase the weather range at which they can operate.<br>
+			Reinforcing passenger terminals costs <<print cashFormat(50000)>> and increase upkeep. [[Reinforce|Manage Arcology][$antiWeatherFreeze = 1, cashX(-50000, "capEx")]]
+		<<elseif $antiWeatherFreeze == 1>>
+			<br><br>You have reinforced your passenger terminals to function even during bad weather. You can invest into all-weather transportation to remain functional no matter what.<br>
+			Investing in all-weather transportation costs <<print cashFormat(100000)>> and increase upkeep. [[Invest|Manage Arcology][$antiWeatherFreeze = 2, cashX(-100000, "capEx")]]
+		<<elseif $antiWeatherFreeze == 2>>
+			<br><br>Your arcology's passenger terminals remain fully operational even during the most extreme weather.
+		<</if>>
+	<</if>>
+<</if>>
+
 <<if $secExp == 1>>
-	<br>
-	<br>
+	<br><br>
 	__Security__
 	<<if $propHub == 0>>
 		<br>
@@ -123,6 +136,89 @@ __Construction__
 	<br>//Arcology upgrades are less expensive due to your @@.springgreen;<<if $PC.career == "arcology owner">>experience in the Free Cities<<else>>arcology engineering training<</if>>.@@//
 <</if>>
 
+<<if $difficultySwitch == 1>>
+	<br><br>
+	__Disaster Repsonse__<br>
+	<<if $econWeatherDamage > 0>>
+		The recent terrible weather has damaged the local infrastructure. It is @@.red;reducing the local economy score by <<print $econWeatherDamage>>.@@
+		<<if $disasterResponse == 0>>
+			<br>Locals will do their best to repair the damage on their own, but setting up a disaster response unit <br>will improve the recovery of infrastructure critical for keeping goods, people and information flowing smoothly in and out of your arcology.
+			<br>Creating the unit will cost <<print cashFormat(50000)>> and incur upkeep. [[Create Disaster Response Unit|Manage Arcology][cashX(-50000, "capEx"), $disasterResponse = 1]]
+		<<elseif $disasterResponse == 1>>
+			<br>You are sending your disaster response unit to repair critical infrastructure. They are doing what they can.
+			<br>The unit can be made more effective with an additional investment of <<print cashFormat(100000)>>. This will also increase upkeep. [[Improve Disaster Response Unit|Manage Arcology][cashX(-100000, "capEx"), $disasterResponse = 2]]
+		<<else>>
+			<br>Your highly capable disaster response unit is rapidly repairing the weather damage.
+		<</if>>
+	<<elseif $disasterResponse > 0>>
+		Your disaster response unit is idle. It will not cost you any upkeep this week.
+	<</if>>
+<</if>>
+
+<<if $foodMarket > 0>>
+<br><br><<include "Food Market">>
+<</if>>
+
+<br><br>
+
+__Population and Rent__<br>
+<<print $arcologies[0].name>> is home to the following;
+<<set _percACitizens = Math.trunc(($ACitizens / ($ACitizens + $ASlaves)) * 1000) / 10,
+_percASlaves = Math.trunc(($ASlaves / ($ACitizens + $ASlaves)) * 1000) / 10,
+_percLowerClass = Math.trunc(($lowerClass / ($ACitizens + $ASlaves)) * 1000) / 10,
+_percMiddleClass = Math.trunc(($middleClass / ($ACitizens + $ASlaves)) * 1000) / 10,
+_percUpperClass = Math.trunc(($upperClass / ($ACitizens + $ASlaves)) * 1000) / 10,
+_percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<br>Lower Class Citizens  | $lowerClass | <<print _percLowerClass>>% | Rent @@.yellowgreen;<<print cashFormat($LCRent / 25)>>@@
+<<if $LCRent > 30>>
+	//Very High// | [[Decrease|Manage Arcology][$LCRent = 30, $rentEffectL = 0.94]]
+<<elseif $LCRent > 20>>
+	//High// | [[Increase|Manage Arcology][$LCRent = 40, $rentEffectL = 0.85]] | [[Decrease|Manage Arcology][$LCRent = 20, $rentEffectL = 1]]
+<<elseif $LCRent > 10>>
+	//Average// | [[Increase|Manage Arcology][$LCRent = 30, $rentEffectL = 0.94]] | [[Decrease|Manage Arcology][$LCRent = 10, $rentEffectL = 1.04]]
+<<elseif $LCRent > 0>>
+	//Low// | [[Increase|Manage Arcology][$LCRent = 20, $rentEffectL = 1]] | [[Free Rent|Manage Arcology][$LCRent = 0, $rentEffectL = 1.1]]
+<<else>>
+	//Free// | [[Increase|Manage Arcology][$LCRent = 10, $rentEffectL = 1.04]]
+<</if>>
+<br>Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent @@.yellowgreen;<<print cashFormat($MCRent / 25)>>@@
+<<if $MCRent > 75>>
+	//Very High// | [[Decrease|Manage Arcology][$MCRent = 75, $rentEffectM = 0.94]]
+<<elseif $MCRent > 50>>
+	//High// | [[Increase|Manage Arcology][$MCRent = 100, $rentEffectM = 0.85]] | [[Decrease|Manage Arcology][$MCRent = 50, $rentEffectM = 1]]
+<<elseif $MCRent > 25>>
+	//Average// | [[Increase|Manage Arcology][$MCRent = 75, $rentEffectM = 0.94]] | [[Decrease|Manage Arcology][$MCRent = 25, $rentEffectM = 1.04]]
+<<elseif $MCRent > 0>>
+	//Low// | [[Increase|Manage Arcology][$MCRent = 50, $rentEffectM = 1]] | [[Free Rent|Manage Arcology][$MCRent = 0, $rentEffectM = 1.1]]
+<<else>>
+	//Free// | [[Increase|Manage Arcology][$MCRent = 25, $rentEffectM = 1.04]]
+<</if>>
+<br>Upper Class Citizens  | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat($UCRent / 25)>>@@
+<<if $UCRent > 270>>
+	//Very High// | [[Decrease|Manage Arcology][$UCRent = 270, $rentEffectU = 0.94]]
+<<elseif $UCRent > 180>>
+	//High// | [[Increase|Manage Arcology][$UCRent = 360, $rentEffectU = 0.85]] | [[Decrease|Manage Arcology][$UCRent = 180, $rentEffectU = 1]]
+<<elseif $UCRent > 90>>
+	//Average// | [[Increase|Manage Arcology][$UCRent = 270, $rentEffectU = 0.94]] | [[Decrease|Manage Arcology][$UCRent = 90, $rentEffectU = 1.04]]
+<<elseif $UCRent > 0>>
+	//Low// | [[Increase|Manage Arcology][$UCRent = 180, $rentEffectU = 1]] | [[Free Rent|Manage Arcology][$UCRent = 0, $rentEffectU = 1.1]]
+<<else>>
+	//Free// | [[Increase|Manage Arcology][$UCRent = 90, $rentEffectU = 1.04]]
+<</if>>
+<br>Millionaires		  | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent / 25)>>@@
+<<if $TCRent > 975>>
+	//Very High// | [[Decrease|Manage Arcology][$TCRent = 975, $rentEffectT = 0.94]]
+<<elseif $TCRent > 650>>
+	//High// | [[Increase|Manage Arcology][$TCRent = 1300, $rentEffectT = 0.85]] | [[Decrease|Manage Arcology][$TCRent = 650, $rentEffectT = 1]]
+<<elseif $TCRent > 325>>
+	//Average// | [[Increase|Manage Arcology][$TCRent = 975, $rentEffectT = 0.94]] | [[Decrease|Manage Arcology][$TCRent = 325, $rentEffectT = 1.04]]
+<<elseif $TCRent > 0>>
+	//Low// | [[Increase|Manage Arcology][$TCRent = 650, $rentEffectT = 1]] | [[Free Rent|Manage Arcology][$TCRent = 0, $rentEffectT = 1.1]]
+<<else>>
+	//Free// | [[Increase|Manage Arcology][$TCRent = 325, $rentEffectT = 1.04]]
+<</if>>
+<br>Slaves				| $ASlaves | <<print _percASlaves>>%
+
 <br><br>
 
 __Language__
diff --git a/src/uncategorized/pCorpAnnouncement.tw b/src/uncategorized/pCorpAnnouncement.tw
index 8d3783f2818965e5a89b4a62c4c61c85a6cbbe50..a1bf424182450331166ecbfc633b103b41f592f8 100644
--- a/src/uncategorized/pCorpAnnouncement.tw
+++ b/src/uncategorized/pCorpAnnouncement.tw
@@ -10,5 +10,3 @@ You never understood the power of money until accumulating so much of it yoursel
 Good investment opportunities are hard to come by in the uncertain world of today. The days of government bonds providing steady yields are ending. Markets are volatile, and under attack by forces they cannot begin to control or anticipate. In places, the very consensus on modern capitalism that has held for nearly fifty years is under siege. There's one reliable growth market in the Free Cities: slaves. And there's too much capital chasing too few investment opportunities in that market.
 
 Reviewing the situation from your desk, the nerve center of your growing empire, you think to yourself: why not? You have the reputation and the capital to become a major player in the slave market, just for the asking. If you announced the incorporation of a publicly traded company dedicated to the industry of slavery, Free Cities investors would be lining up, cash in hand, ready to buy stock.
-
-<br><br>@@.orange;//Corporation controls are under the Manage Economy tab//@@
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index f7db94bdb91fdc9ba51419c73d8bade8804cd330..75980a8a7335fd564119532321a97332b5efaa08 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -596,8 +596,8 @@
 	<<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="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> @@.cyan;[N]@@
 		<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]@@
@@ -638,8 +638,8 @@
 <<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="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> @@.cyan;[N]@@
 	<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]@@
@@ -676,7 +676,7 @@
 <<elseif _Pass == "Manage Penthouse">>
 	<br>
 	<br><span id="manageArcology"><<link [[Manage Arcology|Manage Arcology]]>><</link>></span> @@.cyan;[C]@@
-	<br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> @@.cyan;[N]@@
+	<<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>>
@@ -686,51 +686,12 @@
 	<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 Economy">>
-	<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>>
-	<<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 $cyberMod != 0 && $researchLab.built == "true">>
-	<br>[[Manage Research Lab|Research Lab][$temp = 0]]
-	<</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 Economy">><</link>></span> @@.cyan;[Y]@@
-	<<if $secExp == 1>>
-	<br><span id="edictButton"><<link [[Edicts|edicts]]>><<set $nextButton = "Back", $nextLink = "Manage Economy">><</link>></span> @@.cyan;[D]@@
-	<</if>>
-	<<if $FSAnnounced>>
-	<br><span id="FSButton"><<link [[Future Societies|Future Society]]>><<set $nextButton = "Back", $nextLink = "Manage Economy">><</link>></span> @@.cyan;[F]@@
-	<</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 Corporation">>
 	<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="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> @@.cyan;[N]@@
 	<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]@@
@@ -768,7 +729,7 @@
 	<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]@@
-	<br><span id="manageEconomy"><<link "Manage Economy">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Economy">><</link>></span> @@.cyan;[N]@@
+	<<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>>