diff --git a/src/gui/css/mainStyleSheet.css b/src/gui/css/mainStyleSheet.css
index 8ae45c45ea88499e572e788f9e212c085840cb02..1e009d593b49511356780a7a0b7aacbeab429855 100644
--- a/src/gui/css/mainStyleSheet.css
+++ b/src/gui/css/mainStyleSheet.css
@@ -213,7 +213,8 @@ span.zeroButton > a:hover { text-decoration: none; }
 .orangered, .orangered a, .defiant.inc, .defiant.inc a, .defiant.bold, .defiant.bold, education.neg a { color: orangered }
 .orchid, .orchid a { color: orchid } /* used once (wrong? */
 .pink, .pink a { color: pink } /* also fetish start ??? , and a lot of other stuff */
-.red, .red a, .health.dec, .health.dec a, .cash.dec, .cash.dec a, .flaw.gain, .flaw.gain a, .error, .error a, .elites.loss, .elites.loss a, .reputation.dec, .reputation.dec a { color: red } /* also generally bad stuff */
+.red, .red a, .health.dec, .health.dec a, .cash.dec, .cash.dec a, .flaw.gain, .flaw.gain a, .error, .error a, .elites.loss, .elites.loss a, .reputation.dec, .reputation.dec a, .warning, .warning a { color: red } /* also generally bad stuff */
+/* note: .error is for unexpected behaviour, .warning for player feedback */
 .seagreen, .seagreen a, .trust.prof-trusting, .trust.prof-trusting a { color: seagreen }
 .springgreen, .springgreen a, .skill.player, .skill.player a { color: springgreen }
 .tan, .tan a { color: tan } /* some ethnicity */
@@ -221,7 +222,7 @@ span.zeroButton > a:hover { text-decoration: none; }
 .saddlebrown, .saddlebrown a { color: saddlebrown }
 .teal, .teal a { color: teal }
 .yellow, .yellow a, .noteworthy, .noteworthy a, .devotion.ambivalent, .devotion.ambivalent a, .trust.fearful, .trust.fearful a { color: yellow }
-.yellowgreen, .yellowgreen a, .cash.inc, .cash.inc a { color: yellowgreen }
+.yellowgreen, .yellowgreen a, .cash.inc, .cash.inc a, .cash, .cash a { color: yellowgreen }
 
 /*! <<checkvars>> macro for SugarCube 2.x */
 #ui-dialog-body.checkvars{padding:1em}#ui-dialog-body.checkvars h1{font-size:1em;margin-top:0}#ui-dialog-body.checkvars table{border-collapse:collapse;border-spacing:0}#ui-dialog-body.checkvars thead tr{border-bottom:2px solid #444}#ui-dialog-body.checkvars tr:not(:first-child){border-top:1px solid #444}#ui-dialog-body.checkvars td,#ui-dialog-body.checkvars th{padding:.25em 1em}#ui-dialog-body.checkvars td:first-child,#ui-dialog-body.checkvars th:first-child{padding-left:.5em;border-right:1px solid #444}#ui-dialog-body.checkvars td:last-child,#ui-dialog-body.checkvars th:last-child{padding-right:.5em}#ui-dialog-body.checkvars th:first-child{text-align:center}#ui-dialog-body.checkvars td:first-child{font-weight:700;text-align:right}#ui-dialog-body.checkvars td{font-family:monospace,monospace;vertical-align:top;white-space:pre-wrap}#ui-dialog-body.checkvars .scroll-pad{margin:0;padding:0}
@@ -312,9 +313,6 @@ div.indent {
 div.double-indent {
 	text-indent: 4em;
 }
-div.major-break {
-	margin-top: 1em;
-}
 
 /* setting at the beginning of a scene / subscene */
 .scene-intro {
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 1cace9bfcf8bb2c535c020221a3e4becf465293e..0641ede4e75c2e308effa90b89420e8991eac696 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -494,7 +494,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 <<if $PC.vagina != -1>>
 <h2>Contraceptives and Fertility</h2>
 
-<div>
+<p>
 	<span id="miniscene">
 		<<if $PC.preg < 6 && $PC.pregKnown == 1>>
 			Your period is late, so the first thing you do is test yourself for a potential pregnancy: @@.lime;you are pregnant.@@
@@ -512,126 +512,128 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 			<</if>>
 		<</if>>
 	</span>
-</div>
+</p>
 
-<<if $PC.counter.birthsTotal > 0>>
-<div class="major-break">
-	In total, you have given birth to:
-	<<if $PC.counter.birthElite > 0>>
-		<div>
-			<<print $PC.counter.birthElite>> bab<<if $PC.counter.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthMaster > 0>>
-		<div>
-			<<print $PC.counter.birthMaster>> bab<<if $PC.counter.birthMaster > 1>>ies<<else>>y<</if>> for your former Master.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthClient > 0>>
-		<div>
-			<<print $PC.counter.birthClient>> bab<<if $PC.counter.birthClient > 1>>ies<<else>>y<</if>> from clients you've slept with.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthDegenerate > 0>>
-		<div>
-			<<print $PC.counter.birthDegenerate>> bastard<<if $PC.counter.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthArcOwner > 0>>
-		<div>
-			<<print $PC.counter.birthArcOwner>> bab<<if $PC.counter.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with male arcology owners.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthCitizen > 0>>
-		<div>
-			<<print $PC.counter.birthCitizen>> bab<<if $PC.counter.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthOther > 0>>
+<p>
+	<<if $PC.counter.birthsTotal > 0>>
 		<div>
-			<<print $PC.counter.birthOther>> bab<<if $PC.counter.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
-		</div>
-	<</if>>
-	<<if $PC.counter.birthSelf > 0>>
-		<div>
-			<<print $PC.counter.birthSelf>> bab<<if $PC.counter.birthSelf > 1>>ies<<else>>y<</if>> that <<if $PC.counter.birthSelf > 1>>are<<else>>is<</if>> literally all you.
+			In total, you have given birth to:
+			<<if $PC.counter.birthElite > 0>>
+				<div>
+					<<print $PC.counter.birthElite>> bab<<if $PC.counter.birthElite > 1>>ies<<else>>y<</if>> for the Societal Elite.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthMaster > 0>>
+				<div>
+					<<print $PC.counter.birthMaster>> bab<<if $PC.counter.birthMaster > 1>>ies<<else>>y<</if>> for your former Master.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthClient > 0>>
+				<div>
+					<<print $PC.counter.birthClient>> bab<<if $PC.counter.birthClient > 1>>ies<<else>>y<</if>> from clients you've slept with.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthDegenerate > 0>>
+				<div>
+					<<print $PC.counter.birthDegenerate>> bastard<<if $PC.counter.birthDegenerate > 1>>s<</if>> from getting fucked by slaves.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthArcOwner > 0>>
+				<div>
+					<<print $PC.counter.birthArcOwner>> bab<<if $PC.counter.birthArcOwner > 1>>ies<<else>>y<</if>> from your time with male arcology owners.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthCitizen > 0>>
+				<div>
+					<<print $PC.counter.birthCitizen>> bab<<if $PC.counter.birthCitizen > 1>>ies<<else>>y<</if>> from sex with arcology citizens.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthOther > 0>>
+				<div>
+					<<print $PC.counter.birthOther>> bab<<if $PC.counter.birthOther > 1>>ies<<else>>y<</if>> from sources you can't quite recall.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthSelf > 0>>
+				<div>
+					<<print $PC.counter.birthSelf>> bab<<if $PC.counter.birthSelf > 1>>ies<<else>>y<</if>> that <<if $PC.counter.birthSelf > 1>>are<<else>>is<</if>> literally all you.
+				</div>
+			<</if>>
+			<<if $PC.counter.birthLab > 0>>
+				<div>
+					<<print $PC.counter.birthLab>> bab<<if $PC.counter.birthLab > 1>>ies<<else>>y<</if>> specially designed in the lab.
+				</div>
+			<</if>>
 		</div>
 	<</if>>
-	<<if $PC.counter.birthLab > 0>>
+	<<if $PC.counter.slavesKnockedUp > 0>>
 		<div>
-			<<print $PC.counter.birthLab>> bab<<if $PC.counter.birthLab > 1>>ies<<else>>y<</if>> specially designed in the lab.
+			<<if $PC.dick > 0>>
+				You've knocked up <<print num($PC.counter.slavesKnockedUp)>> fertile slave girl<<if $PC.counter.slavesKnockedUp > 1>>s<</if>><<if $PC.counter.slavesFathered > 0>> and fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
+			<<else>>
+				Before your sex change, you knocked up <<print num($PC.counter.slavesKnockedUp)>> fertile slave girl<<if $PC.counter.slavesKnockedUp > 1>>s<</if>><<if $PC.counter.slavesFathered > 0>> and fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>><</if>>.
+			<</if>>
 		</div>
+	<<else>>
+		<<if $PC.counter.slavesFathered > 0>>
+			<div>
+				<<if $PC.dick != 0>>
+					You've fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>> as an arcology owner so far.
+				<<else>>
+					Before your sex change, you fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>>.
+				<</if>>
+			</div>
+		<</if>>
 	<</if>>
-</div>
-<</if>>
-<<if $PC.counter.slavesKnockedUp > 0>>
+
 	<div>
-		<<if $PC.dick > 0>>
-			You've knocked up <<print num($PC.counter.slavesKnockedUp)>> fertile slave girl<<if $PC.counter.slavesKnockedUp > 1>>s<</if>><<if $PC.counter.slavesFathered > 0>> and fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
-		<<else>>
-			Before your sex change, you knocked up <<print num($PC.counter.slavesKnockedUp)>> fertile slave girl<<if $PC.counter.slavesKnockedUp > 1>>s<</if>><<if $PC.counter.slavesFathered > 0>> and fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>><</if>>.
+		<<if $PC.preg >= 8>>
+			You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now.
+		<<elseif $PC.preg >= 6>>
+			You're having morning sickness.
+		<<elseif $PC.preg > 1>>
+			You've missed your period. This could be bad.
+		<<elseif $PC.preg > 0>>
+			Your fertile pussy has been thoroughly seeded; there is a chance you are pregnant.
+			<<if ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
+				<<link "Pop some morning after pills">><<set WombFlush($PC)>><<goto "Manage Personal Affairs">><</link>>
+			<</if>>
+		<<elseif $PC.pregWeek < 0>>
+			You're still recovering from your recent pregnancy.
+		<<elseif $PC.preg == -2>>
+			You're menopausal. Your time to bear children has passed.
+		<<elseif $PC.preg == -1>>
+			You're currently on birth control.
+			[[Stop taking it|Manage Personal Affairs][$PC.preg = 0]]
+		<<elseif $PC.preg == 0>>
+			You're currently fertile.
+			[[Start taking birth control|Manage Personal Affairs][$PC.preg = -1, $PC.fertDrugs = 0]]
+			<<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
+			<<if _toSearch.indexOf("fertility") != -1>>
+				<<set _fertRefresh = 1>>
+			<</if>>
+			<div>
+			<<if $PC.fertDrugs == 1>>
+				You are currently taking fertility supplements<<if _fertRefresh == 1>>on top of the <<print $PC.refreshment>>s.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
+			<<else>>
+				You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
+			<</if>>
+			</div>
 		<</if>>
 	</div>
-<<else>>
-	<<if $PC.counter.slavesFathered > 0>>
+	<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
 		<div>
-			<<if $PC.dick != 0>>
-				You've fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>> as an arcology owner so far.
-			<<else>>
-				Before your sex change, you fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>>.
-			<</if>>
+			[[Inspect pregnancy|Analyze PC Pregnancy]]
 		</div>
 	<</if>>
-<</if>>
-
-<div>
-	<<if $PC.preg >= 8>>
-		You're currently <<print $PC.preg>> week<<if $PC.preg > 1>>s<</if>> pregnant, so contraception doesn't matter right now.
-	<<elseif $PC.preg >= 6>>
-		You're having morning sickness.
-	<<elseif $PC.preg > 1>>
-		You've missed your period. This could be bad.
-	<<elseif $PC.preg > 0>>
-		Your fertile pussy has been thoroughly seeded; there is a chance you are pregnant.
-		<<if ($arcologies[0].FSRestart == "unset" || $eugenicsFullControl == 1 || ($PC.pregSource != -1 && $PC.pregSource != -6))>>
-			<<link "Pop some morning after pills">><<set WombFlush($PC)>><<goto "Manage Personal Affairs">><</link>>
-		<</if>>
-	<<elseif $PC.pregWeek < 0>>
-		You're still recovering from your recent pregnancy.
-	<<elseif $PC.preg == -2>>
-		You're menopausal. Your time to bear children has passed.
-	<<elseif $PC.preg == -1>>
-		You're currently on birth control.
-		[[Stop taking it|Manage Personal Affairs][$PC.preg = 0]]
-	<<elseif $PC.preg == 0>>
-		You're currently fertile.
-		[[Start taking birth control|Manage Personal Affairs][$PC.preg = -1, $PC.fertDrugs = 0]]
-		<<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
-		<<if _toSearch.indexOf("fertility") != -1>>
-			<<set _fertRefresh = 1>>
-		<</if>>
+	<<if $PC.preg >= 0 && $PC.ovaries == 1 && $PC.ovaryAge < 47>>
 		<div>
-		<<if $PC.fertDrugs == 1>>
-			You are currently taking fertility supplements<<if _fertRefresh == 1>>on top of the <<print $PC.refreshment>>s.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
-		<<else>>
-			You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
-		<</if>>
+			[[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $PC, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Manage Personal Affairs"]]
 		</div>
 	<</if>>
-</div>
-<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
-	<div>
-		[[Inspect pregnancy|Analyze PC Pregnancy]]
-	</div>
-<</if>>
-<<if $PC.preg >= 0 && $PC.ovaries == 1 && $PC.ovaryAge < 47>>
-	<div>
-		[[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $PC, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Manage Personal Affairs"]]
-	</div>
-<</if>>
+</p>
 
 <<if $arcologies[0].FSRestartDecoration >= 100>>
-	<div class="major-break">
+	<p>
 		<<if $playerBred == 0>>
 			You are currently not bearing children for the Societal Elite.
 			[[List your womb as available|Manage Personal Affairs][$playerBred = 1, $playerBredTube = 0]] | [[Sign up for artificial insemination|Manage Personal Affairs][$playerBred = 1, $playerBredTube = 1]]
@@ -643,12 +645,12 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 				<span class="note">You must bear at least one child for the Societal Elite before removing yourself from the breeding program.</span>
 			<</if>>
 		<</if>>
-	</div>
+	</p>
 <</if>>
 
 <<if $PC.preg == 0 && $PC.pregWeek == 0>>
 	<<if $dairyPiping == 1 && ($cumSlaves > 0 || $arcologies[0].FSPastoralistLaw == 1)>>
-		<div class="major-break">
+		<p>
 			<<if $PC.skill.cumTap == 0>>
 				The tap connected to $dairyName has a variety of attachments, one of which being a very tantalizing dick-shaped nozzle. It looks like it would be a perfect fit for you, if you were curious, that is.
 				<div>[[No one is looking...|FSelf]]</div>
@@ -657,23 +659,24 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 				<div>[[Sounds fun!|FSelf]]</div>
 				<div><<link "You only want to get pregnant." "Manage Personal Affairs">><<set $PC.preg = 1, $PC.pregWeek = 1, $PC.pregSource = 0, $PC.pregKnown = 1>><<set $PC.pregType = setPregType($PC)>><<set WombImpregnate($PC, $PC.pregType, 0, 1)>><</link>></div>
 			<</if>>
-		</div>
+		</p>
 	<</if>>
 	<<if $PC.vagina >= 1 && $PC.dick != 0>>
-		<div class="major-break">
+		<p>
 			<<if $PC.counter.birthSelf > 0>>
 				Who better to impregnate you than you? [[Impregnate yourself.|MpregSelf]]
 			<<else>>
 				You have an empty vagina, a working set of balls, and a strong craving for a hot creampie. Who better to give it to you than you? [[Grab an extra syringe.|MpregSelf]]
 			<</if>>
-		</div>
+		</p>
 	<</if>>
 <</if>>
 
 <<else>> /* no vagina */
+<p>
 
 <<if $PC.counter.births > 0>>
-	<div class="major-break">
+	<div>
 		Before your sex change, you had given birth to:
 		<<if $PC.counter.birthElite > 0>>
 			<div>
@@ -725,8 +728,8 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 				<<print $PC.counter.birthLab>> bab<<if $PC.counter.birthLab > 1>>ies<<else>>y<</if>> specially designed in the lab.
 			</div>
 		<</if>>
-		</div>
-	<</if>>
+	</div>
+<</if>>
 <div>
 	<<if $PC.counter.slavesKnockedUp > 0>>
 		You've knocked up <<print num($PC.counter.slavesKnockedUp)>> fertile slave girl<<if $PC.counter.slavesKnockedUp > 1>>s<</if>><<if $PC.counter.slavesFathered > 0>> and fathered <<print num($PC.counter.slavesFathered)>> new slave<<if $PC.counter.slavesFathered > 1>>s<</if>><</if>> as an arcology owner so far.
@@ -737,7 +740,8 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
 	<</if>>
 </div>
 
-<</if>>
+</p>
+<</if>> /* vagina check */
 
 <<if $PC.lactation == 1>>
 	<h2>Lactation</h2>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 49d940c2fa383be6e664c09a8c1246a9b0fee0bf..eb0f5cdf0b5e194e3c75a359ad3ea9269acdc7fa 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -1,41 +1,42 @@
 :: Manage Arcology [nobr]
 
 <<set $nextButton = "Back", $nextLink = "Main">>
+<<set $showEncyclopedia = 0>>
 
 <<if $cheatMode == 1>>
-	<center>
-		//[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]//
-	</center>
+	<div class="cheat-menu">[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]</div>
 <</if>>
-<<set $showEncyclopedia = 0>>
 
+<div>
 <<DisplayBuilding>>
 <<include "Arcology Description">>
+</div>
 
-<br><br>
+<h2>Arcology Ownership</h2>
 
-__Arcology Ownership__
-<br>
+<div>
 <<UpdateOwnership>>
-You own ''$arcologies[0].ownership%'' of $arcologies[0].name, <<if $arcologies[0].minority > 0>>against ''$arcologies[0].minority%'' owned by the second most significant holder<<else>>and there are no other significant holders<</if>>.
+You own <strong>$arcologies[0].ownership%</strong> of $arcologies[0].name, <<if $arcologies[0].minority > 0>>against <strong>$arcologies[0].minority%</strong> owned by the second most significant holder<<else>>and there are no other significant holders<</if>>.
 <<if $arcologies[0].minority > $arcologies[0].ownership-10>>
-	@@.red;This is a dangerously narrow margin of control.@@
+	<span class="warning">This is a dangerously narrow margin of control.</span>
 <</if>>
+</div>
 
 <<if $FSAnnounced > 0>>
 	<<if $FSCredits > 0>>
-	<br><br>
-		@@.yellow;$arcologies[0].name's society is ready to begin accepting a new societal direction.@@
+		<p class="noteworthy">
+			$arcologies[0].name's society is ready to begin accepting a new societal direction.
+		</p>
 	<</if>>
 <</if>>
 
-<br><br>
-
-__Construction__
-<br>
+<h2>Construction</h2>
 
+<div>
 <<if $arcologyUpgrade.drones != 1>>
-	//The first major upgrade needed is the installation of a drone security system so higher-class citizens will feel safe and protected should they choose to immigrate. This upgrade will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.//
+	<span class="note">
+		The first major upgrade needed is the installation of a drone security system so higher-class citizens will feel safe and protected should they choose to immigrate. This upgrade will cost <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.
+	</span>
 	<<link "Install drone security system" "Manage Arcology">>
 		<<run cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx")>>
 		<<set $arcologyUpgrade.drones = 1, $PC.skill.engineering += 1>>
@@ -44,32 +45,59 @@ __Construction__
 		<</if>>
 	<</link>>
 <<elseif $arcologyUpgrade.hydro != 1>>
-	//The next major upgrade needed is the installation of a better water reclamation system so your residents will have access to cheaper water and hydroponically grown food. This upgrade will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.// [[Upgrade water reclamation system|Manage Arcology][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.hydro = 1, $PC.skill.engineering += 1]]
+	<span class="note">
+		The next major upgrade needed is the installation of a better water reclamation system so your residents will have access to cheaper water and hydroponically grown food. This upgrade will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.
+	</span>
+	[[Upgrade water reclamation system|Manage Arcology][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.hydro = 1, $PC.skill.engineering += 1]]
 <<elseif $arcologyUpgrade.apron != 1>>
-	//The next major upgrade needed is the installation of a broader apron at the bottom of the arcology to increase its surface area and gather more solar energy. Right now, tenants that use a lot of power have to import it from outside. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>.// [[Install solar apron|Manage Arcology][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.apron = 1, $PC.skill.engineering += 1]]
+	<span class="note">
+		The next major upgrade needed is the installation of a broader apron at the bottom of the arcology to increase its surface area and gather more solar energy. Right now, tenants that use a lot of power have to import it from outside. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>.
+	</span>
+	[[Install solar apron|Manage Arcology][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.apron = 1, $PC.skill.engineering += 1]]
 <<elseif $arcologyUpgrade.grid != 1>>
-	//The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.grid = 1, $PC.skill.engineering += 1]]
+	<span class="note">
+		The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.
+	</span>
+	[[Upgrade transmission lines|Manage Arcology][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.grid = 1, $PC.skill.engineering += 1]]
 <<elseif $arcologyUpgrade.spire != 1>>
-	//The next major upgrade needed is the addition of a spire at the top of the arcology to increase the space available for the wealthiest citizens to own whole floors. This huge project will cost <<print cashFormat(Math.trunc(250000*$upgradeMultiplierArcology))>>.// [[Add spire|Manage Arcology][cashX(forceNeg(Math.trunc(250000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.spire = 1, $sectors[1].type = "Apartments", $sectors[2].type = "Apartments", $sectors[3].type = "Apartments", $sectors[4].type = "Apartments", $sectors[1].ownership = 1, $sectors[2].ownership = 1, $sectors[3].ownership = 1, $sectors[4].ownership = 1, $PC.skill.engineering += 1]]
+	<span class="note">
+		The next major upgrade needed is the addition of a spire at the top of the arcology to increase the space available for the wealthiest citizens to own whole floors. This huge project will cost <<print cashFormat(Math.trunc(250000*$upgradeMultiplierArcology))>>.
+	</span>
+	[[Add spire|Manage Arcology][cashX(forceNeg(Math.trunc(250000*$upgradeMultiplierArcology)), "capEx"), $arcologyUpgrade.spire = 1, $sectors[1].type = "Apartments", $sectors[2].type = "Apartments", $sectors[3].type = "Apartments", $sectors[4].type = "Apartments", $sectors[1].ownership = 1, $sectors[2].ownership = 1, $sectors[3].ownership = 1, $sectors[4].ownership = 1, $PC.skill.engineering += 1]]
 <<else>>
-	//The arcology's public areas are fully upgraded.//
+	<span class="note">
+		The arcology's public areas are fully upgraded.
+	</span>
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $weatherCladding == 0>>
-	//Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat and will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>. Your citizens are <<if $weatherAwareness == 0>>likely to disapprove of this measure as alarmism.<<else>>@@.yellow;concerned that this measure has not been taken already.@@<</if>> // [[Apply weather cladding|Manage Arcology][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $weatherCladding = 1, $PC.skill.engineering += 1]]
+	<span class="note">
+		Extreme weather is becoming common worldwide. The arcology's exterior can be hardened to reduce damage in case of heavy weather, but this will reduce its beauty somewhat and will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>. 
+		Your citizens are 
+		<<if $weatherAwareness == 0>>
+			likely to disapprove of this measure as alarmism.
+		<<else>>
+			<span class="noteworthy">concerned that this measure has not been taken already.</span>
+		<</if>>
+	</span>
+	[[Apply weather cladding|Manage Arcology][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $weatherCladding = 1, $PC.skill.engineering += 1]]
 <<elseif $weatherCladding == 1 && $arcologyUpgrade.spire == 1>>
 	The arcology's exterior is jacketed with unsightly but sturdy weather cladding. Your arcology is so prosperous that remodeling the cladding into something beautiful is within the realm of possibility. This massive project will cost <<print cashFormat(Math.trunc(3500000*$upgradeMultiplierArcology))>> and without a doubt render your arcology one of the wonders of the world.
 	[[Remodel weather cladding|Manage Arcology][cashX(forceNeg(Math.trunc(3500000*$upgradeMultiplierArcology)), "capEx"), $weatherCladding = 2, $PC.skill.engineering += 1]]
 <<elseif $weatherCladding == 1>>
-	//The arcology's exterior is jacketed with unsightly but sturdy weather cladding.//
+	<span class="note">
+		The arcology's exterior is jacketed with unsightly but sturdy weather cladding.
+	</span>
 <<elseif $weatherCladding == 2>>
-	//The arcology's exterior is jacketed with gorgeously sculpted and fully functional weather cladding.//
+	<span class="note">
+		The arcology's exterior is jacketed with gorgeously sculpted and fully functional weather cladding.
+	</span>
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>>
 	You have not installed an FCTV receiver.
 	Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.
@@ -84,199 +112,246 @@ __Construction__
 <<elseif ($FCTVreceiver == 1)>>
 	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>>
+</div>
 
 <<if $secExpEnabled == 0>>
 	<<if $weatherAwareness > 0>>
+		<p>
 		<<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")]]
+			The extreme weather hurts your arcology's ability to function. Reinforcing your passenger terminals increase the weather range at which they can operate.
+			<div>
+				Reinforcing passenger terminals costs <<print cashFormat(50000)>> and increase upkeep. [[Reinforce|Manage Arcology][$antiWeatherFreeze = 1, cashX(-50000, "capEx")]]
+			</div>
 		<<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")]]
+			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.
+			<div>
+				Investing in all-weather transportation costs <<print cashFormat(100000)>> and increase upkeep. [[Invest|Manage Arcology][$antiWeatherFreeze = 2, cashX(-100000, "capEx")]]
+			</div>
 		<<elseif $antiWeatherFreeze == 2>>
-			<br><br>Your arcology's passenger terminals remain fully operational even during the most extreme weather.
+			Your arcology's passenger terminals remain fully operational even during the most extreme weather.
 		<</if>>
+		</p>
 	<</if>>
 <</if>>
 
 <<if $secExpEnabled == 1>>
-	<br><br>
-	__Security__
+	<h2>Security</h2>
+
+	<div>
 	<<if $SecExp.buildings.propHub.active == 0>>
-		<br>
 		[[Set up the propaganda Hub|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $SecExp.buildings.propHub.active = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1, App.SecExp.Check.general()]]
-		//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)))>>.//
-		<br>//Building specialized in the management of authority.//
+		<span class="detail">
+			Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier)))>>.
+			<div class="indent">Building specialized in the management of authority.</div>
+		</span>
 	<<else>>
-		<br>
 		The [[Propaganda Hub|propagandaHub]] is ready to manipulate reality on your command.
 	<</if>>
+	</div>
+
+	<div>
 	<<if $secHQ == 0>>
-		<br>
 		[[Set up the security headquarters|Manage Arcology][cashX(forceNeg(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))), "capEx"), $secHQ = 1, $PC.skill.engineering += 1, $PC.skill.hacking += 1]]
-		//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.//
-		<br>//Building specialized in the management of security and crime.//
+		<span class="detail">
+			Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.
+			<div class="indent">Building specialized in the management of security and crime.</div>
+		</span>
 	<<else>>
-		<br>
 		The [[security HQ|securityHQ]] is constantly working to protect your arcology.
 	<</if>>
+	</div>
 
+	<div>
 	<<if $SecExp.buildings.barracks.active == 0>>
-		<br>
 		[[Set up the barracks|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $SecExp.buildings.barracks.active = 1, $PC.skill.engineering += 1, App.SecExp.Check.general()]]
-		//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
-		<br>//Building specialized in the management of armed forces.//
+		<span class="detail">
+			Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>
+			<div class="indent">Building specialized in the management of armed forces.</div>
+		</span>
 	<<else>>
-		<br>
 		The [[barracks|secBarracks]] patiently await your orders.
 	<</if>>
+	</div>
 
+	<div>
 	<<if $riotCenter == 0 && $SecExp.settings.rebellion.enabled == 1>>
-		<br>
 		[[Set up the riot control center|Manage Arcology][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $riotCenter = 1, $PC.skill.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
-		<<if $PC.skill.engineering < 100>> <<= IncreasePCSkills('engineering', 0.1)>> <</if>>
-		<br>//Building specialized in the management and suppression of rebellions.//
+		<span class="detail">
+			Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>
+			<div class="indent">Building specialized in the management and suppression of rebellions.</div>
+		</span>
 	<<elseif $SecExp.settings.rebellion.enabled == 1>>
-		<br>
 		The [[Riot Control Center|riotControlCenter]] stands ready for action.
 	<</if>>
+	</div>
 <</if>>
 
 <<if ($PC.skill.engineering >= 100) || ($PC.career == "arcology owner")>>
-	<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>>.@@//
+	<div class="note">
+		Arcology upgrades are less expensive due to your 
+		<span class="player skill">
+			<<if $PC.career == "arcology owner">>experience in the Free Cities<<else>>arcology engineering training<</if>>.
+		</span>
+	</div>
 <</if>>
 
 <<if $difficultySwitch == 1>>
-	<br><br>
-	__Disaster Response__<br>
+	<h2>Disaster Response</h2>
+
+	<div>
 	<<if $econWeatherDamage > 0>>
-		The recent terrible weather has damaged the local infrastructure. It is @@.red;reducing the local economy score by <<print $econWeatherDamage>>.@@
+		The recent terrible weather has damaged the local infrastructure. It is <span class="warning">reducing the local economy score by <<print $econWeatherDamage>>.</span>
+		<div>
 		<<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]]
+			Locals will do their best to repair the damage on their own, but setting up a disaster response unit will improve the recovery of infrastructure critical for keeping goods, people and information flowing smoothly in and out of your arcology.
+			<div>
+				Creating the unit will cost <<print cashFormat(50000)>> and incur upkeep. [[Create Disaster Response Unit|Manage Arcology][cashX(-50000, "capEx"), $disasterResponse = 1]]
+			</div>
 		<<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]]
+			You are sending your disaster response unit to repair critical infrastructure. They are doing what they can.
+			<div>
+				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]]
+			</div>
 		<<else>>
-			<br>Your highly capable disaster response unit is rapidly repairing the weather damage.
+			Your highly capable disaster response unit is rapidly repairing the weather damage.
 		<</if>>
+		</div>
 	<<elseif $disasterResponse > 0>>
 		Your disaster response unit is idle. It will not cost you any upkeep this week.
 	<</if>>
+	</div>
 <</if>>
 
 <<if $foodMarket > 0>>
-	<br><br>
-	__Food Management__
+	<h2>Food Management</h2>
 	<<include "Food Market">>
 <</if>>
 
-<br><br>
-
-__Sexual Service Policies__<br>
-If so desired, your assistant can help you manipulate the business environment within your arcology.<br>
-Currently outside parties are providing <<print $NPCMarketShare.lowerClass/10>>%, <<print $NPCMarketShare.middleClass/10>>%, <<print $NPCMarketShare.upperClass/10>> and <<print $NPCMarketShare.topClass/10>>% of the sexual services for the lower, middle, upper and top class respectively.
-<br><br>
-
-<<if $sexSubsidies.lowerClass == 0>>
-	You can provide a minor subsidy for those selling sexual services to the lower class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 1]]<br>
-<<elseif $sexSubsidies.lowerClass == 1>>
-	You are providing a minor subsidy for those selling sexual services to the lower class. //Upkeep is relative to the amount of sex provided by other parties// [[Cancel Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 2]]<br>
-<<elseif $sexSubsidies.lowerClass == 2>>
-	You are providing a moderate subsidy for those selling sexual services to the lower class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 3]]<br>
-<<elseif $sexSubsidies.lowerClass == 3>>
-	You are providing a substantial subsidy for those selling sexual services to the lower class. //Upkeep is relative to the amount of sex provided by other parties// [[Moderate Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 4]]<br>
-<<else>>
-	You are providing a gratuitous subsidy for those selling sexual services to the lower class. //Upkeep is relative to the amount of sex provided by other parties// [[Substantial Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 3]]<br>
-<</if>>
-<<if $sexSupplyBarriers.lowerClass == 0>>
-	You can make things more difficult for those supplying sexual services in the lower class segment if you are willing to spend 1000 reputation and pay a flat upkeep of @@.yellowgreen;<<print cashFormat(1000)>>.@@ <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 1, repX(-1000, "policies")]] <<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.lowerClass == 1>>
-	You have forced some unneeded bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(5000)>>.@@ <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 2, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.lowerClass == 2>>
-	You have forced considerable bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(20000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.lowerClass == 3>>
-	You have forced stifling bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(60000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 4, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<else>>
-	You have forced suffocating bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<</if>>
-<br><br>
-
-<<if $sexSubsidies.middleClass == 0>>
-	You can provide a minor subsidy for those selling sexual services to the middle class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.middleClass = 1]]<br>
-<<elseif $sexSubsidies.middleClass == 1>>
-	You are providing a minor subsidy for those selling sexual services to the middle class. //Upkeep is relative to the amount of sex provided by other parties// [[Cancel Subsidy|Manage Arcology][$sexSubsidies.middleClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.middleClass = 2]]<br>
-<<elseif $sexSubsidies.middleClass == 2>>
-	You are providing a moderate subsidy for those selling sexual services to the middle class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.middleClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.middleClass = 3]]<br>
-<<elseif $sexSubsidies.middleClass == 3>>
-	You are providing a substantial subsidy for those selling sexual services to the middle class. //Upkeep is relative to the amount of sex provided by other parties// [[Moderate Subsidy|Manage Arcology][$sexSubsidies.middleClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.middleClass = 4]]<br>
-<<else>>
-	You are providing a gratuitous subsidy for those selling sexual services to the middle class. //Upkeep is relative to the amount of sex provided by other parties// [[Substantial Subsidy|Manage Arcology][$sexSubsidies.middleClass = 3]]<br>
-<</if>>
-<<if $sexSupplyBarriers.middleClass == 0>>
-	You can make things more difficult for those supplying sexual services in the middle class segment if you are willing to spend 1000 reputation and pay a flat upkeep of @@.yellowgreen;<<print cashFormat(1000)>>.@@ <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 1, repX(-1000, "policies")]] <<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.middleClass == 1>>
-	You have forced some unneeded bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(5000)>>.@@ <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 2, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.middleClass == 2>>
-	You have forced considerable bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(20000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.middleClass == 3>>
-	You have forced stifling bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(60000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 4, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<else>>
-	You have forced suffocating bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<</if>>
-<br><br>
-
-<<if $sexSubsidies.upperClass == 0>>
-	You can provide a minor subsidy for those selling sexual services to the upper class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.upperClass = 1]]<br>
-<<elseif $sexSubsidies.upperClass == 1>>
-	You are providing a minor subsidy for those selling sexual services to the upper class. //Upkeep is relative to the amount of sex provided by other parties// [[Cancel Subsidy|Manage Arcology][$sexSubsidies.upperClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.upperClass = 2]]<br>
-<<elseif $sexSubsidies.upperClass == 2>>
-	You are providing a moderate subsidy for those selling sexual services to the upper class. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.upperClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.upperClass = 3]]<br>
-<<elseif $sexSubsidies.upperClass == 3>>
-	You are providing a substantial subsidy for those selling sexual services to the upper class. //Upkeep is relative to the amount of sex provided by other parties// [[Moderate Subsidy|Manage Arcology][$sexSubsidies.upperClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.upperClass = 4]]<br>
-<<else>>
-	You are providing a gratuitous subsidy for those selling sexual services to the upper class. //Upkeep is relative to the amount of sex provided by other parties// [[Substantial Subsidy|Manage Arcology][$sexSubsidies.upperClass = 3]]<br>
-<</if>>
-<<if $sexSupplyBarriers.upperClass == 0>>
-	You can make things more difficult for those supplying sexual services in the upper class segment if you are willing to spend 1000 reputation and pay a flat upkeep of @@.yellowgreen;<<print cashFormat(1000)>>.@@ <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 1, repX(-1000, "policies")]] <<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.upperClass == 1>>
-	You have forced some unneeded bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(5000)>>.@@ <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 2, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.upperClass == 2>>
-	You have forced considerable bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(20000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.upperClass == 3>>
-	You have forced stifling bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(60000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 4, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<else>>
-	You have forced suffocating bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<</if>>
-<br><br>
-
-<<if $sexSubsidies.topClass == 0>>
-	You can provide a minor subsidy for those selling sexual services to the millionaires. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.topClass = 1]]<br>
-<<elseif $sexSubsidies.topClass == 1>>
-	You are providing a minor subsidy for those selling sexual services to the millionaires. //Upkeep is relative to the amount of sex provided by other parties// [[Cancel Subsidy|Manage Arcology][$sexSubsidies.topClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.topClass = 2]]<br>
-<<elseif $sexSubsidies.topClass == 2>>
-	You are providing a moderate subsidy for those selling sexual services to the millionaires. //Upkeep is relative to the amount of sex provided by other parties// [[Minor Subsidy|Manage Arcology][$sexSubsidies.topClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.topClass = 3]]<br>
-<<elseif $sexSubsidies.topClass == 3>>
-	You are providing a substantial subsidy for those selling sexual services to the millionaires. //Upkeep is relative to the amount of sex provided by other parties// [[Moderate Subsidy|Manage Arcology][$sexSubsidies.topClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.topClass = 4]]<br>
-<<else>>
-	You are providing a gratuitous subsidy for those selling sexual services to the millionaires. //Upkeep is relative to the amount of sex provided by other parties// [[Substantial Subsidy|Manage Arcology][$sexSubsidies.topClass = 3]]<br>
-<</if>>
-<<if $sexSupplyBarriers.topClass == 0>>
-	You can make things more difficult for those supplying sexual services in the millionaires segment if you are willing to spend 1000 reputation and pay a flat upkeep of @@.yellowgreen;<<print cashFormat(1000)>>.@@ <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 1, repX(-1000, "policies")]] <<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.topClass == 1>>
-	You have forced some unneeded bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(5000)>>.@@ <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 2, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.topClass == 2>>
-	You have forced considerable bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(20000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<elseif $sexSupplyBarriers.topClass == 3>>
-	You have forced stifling bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of @@.yellowgreen;<<print cashFormat(60000)>>.@@ <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 4, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<<else>>
-	You have forced suffocating bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 3, repX(-1000, "policies")]]<<else>>//You are not reputable enough//<</if>>
-<</if>>
+<h2>Sexual Service Policies</h2>
+
+<div>
+	If so desired, your assistant can help you manipulate the business environment within your arcology.
+</div>
+<div>
+	Currently outside parties are providing <<print $NPCMarketShare.lowerClass/10>>%, <<print $NPCMarketShare.middleClass/10>>%, <<print $NPCMarketShare.upperClass/10>>% and <<print $NPCMarketShare.topClass/10>>% of the sexual services for the lower, middle, upper and top class respectively.
+</div>
+
+<p>
+	<div>
+	<<if $sexSubsidies.lowerClass == 0>>
+		You can provide a minor subsidy for those selling sexual services to the lower class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 1]]
+	<<elseif $sexSubsidies.lowerClass == 1>>
+		You are providing a minor subsidy for those selling sexual services to the lower class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Cancel Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 2]]
+	<<elseif $sexSubsidies.lowerClass == 2>>
+		You are providing a moderate subsidy for those selling sexual services to the lower class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 3]]
+	<<elseif $sexSubsidies.lowerClass == 3>>
+		You are providing a substantial subsidy for those selling sexual services to the lower class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Moderate Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 4]]
+	<<else>>
+		You are providing a gratuitous subsidy for those selling sexual services to the lower class. <span class="note">Upkeep is relative to the amount of sex provided by other parties</span> [[Substantial Subsidy|Manage Arcology][$sexSubsidies.lowerClass = 3]]
+	<</if>>
+	</div>
+	<div>
+	<<if $sexSupplyBarriers.lowerClass == 0>>
+		You can make things more difficult for those supplying sexual services in the lower class segment if you are willing to spend 1000 reputation and pay a flat upkeep of <span class="cash"><<print cashFormat(1000)>>.</span> <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 1, repX(-1000, "policies")]] <<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.lowerClass == 1>>
+		You have forced some unneeded bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(5000)>>.</span> <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 2, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.lowerClass == 2>>
+		You have forced considerable bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(20000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.lowerClass == 3>>
+		You have forced stifling bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(60000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 4, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<else>>
+		You have forced suffocating bureaucracy on those selling sexual services to the lower class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.lowerClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<</if>>
+	</div>
+</p>
+
+<p>
+	<div>
+	<<if $sexSubsidies.middleClass == 0>>
+		You can provide a minor subsidy for those selling sexual services to the middle class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.middleClass = 1]]
+	<<elseif $sexSubsidies.middleClass == 1>>
+		You are providing a minor subsidy for those selling sexual services to the middle class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Cancel Subsidy|Manage Arcology][$sexSubsidies.middleClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.middleClass = 2]]
+	<<elseif $sexSubsidies.middleClass == 2>>
+		You are providing a moderate subsidy for those selling sexual services to the middle class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.middleClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.middleClass = 3]]
+	<<elseif $sexSubsidies.middleClass == 3>>
+		You are providing a substantial subsidy for those selling sexual services to the middle class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Moderate Subsidy|Manage Arcology][$sexSubsidies.middleClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.middleClass = 4]]
+	<<else>>
+		You are providing a gratuitous subsidy for those selling sexual services to the middle class. <span class="note">Upkeep is relative to the amount of sex provided by other parties</span> [[Substantial Subsidy|Manage Arcology][$sexSubsidies.middleClass = 3]]
+	<</if>>
+	<<if $sexSupplyBarriers.middleClass == 0>>
+		You can make things more difficult for those supplying sexual services in the middle class segment if you are willing to spend 1000 reputation and pay a flat upkeep of <span class="cash"><<print cashFormat(1000)>>.</span> <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 1, repX(-1000, "policies")]] <<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.middleClass == 1>>
+		You have forced some unneeded bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(5000)>>.</span> <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 2, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.middleClass == 2>>
+		You have forced considerable bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(20000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.middleClass == 3>>
+		You have forced stifling bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(60000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 4, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<else>>
+		You have forced suffocating bureaucracy on those selling sexual services to the middle class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.middleClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<</if>>
+	</div>
+</p>
+
+<p>
+	<div>
+	<<if $sexSubsidies.upperClass == 0>>
+		You can provide a minor subsidy for those selling sexual services to the upper class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.upperClass = 1]]
+	<<elseif $sexSubsidies.upperClass == 1>>
+		You are providing a minor subsidy for those selling sexual services to the upper class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Cancel Subsidy|Manage Arcology][$sexSubsidies.upperClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.upperClass = 2]]
+	<<elseif $sexSubsidies.upperClass == 2>>
+		You are providing a moderate subsidy for those selling sexual services to the upper class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.upperClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.upperClass = 3]]
+	<<elseif $sexSubsidies.upperClass == 3>>
+		You are providing a substantial subsidy for those selling sexual services to the upper class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Moderate Subsidy|Manage Arcology][$sexSubsidies.upperClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.upperClass = 4]]
+	<<else>>
+		You are providing a gratuitous subsidy for those selling sexual services to the upper class. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Substantial Subsidy|Manage Arcology][$sexSubsidies.upperClass = 3]]
+	<</if>>
+	</div>
+	<div>
+	<<if $sexSupplyBarriers.upperClass == 0>>
+		You can make things more difficult for those supplying sexual services in the upper class segment if you are willing to spend 1000 reputation and pay a flat upkeep of <span class="cash"><<print cashFormat(1000)>>.</span> <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 1, repX(-1000, "policies")]] <<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.upperClass == 1>>
+		You have forced some unneeded bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(5000)>>.</span> <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 2, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough</span><</if>>
+	<<elseif $sexSupplyBarriers.upperClass == 2>>
+		You have forced considerable bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(20000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.upperClass == 3>>
+		You have forced stifling bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(60000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 4, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<else>>
+		You have forced suffocating bureaucracy on those selling sexual services to the upper class making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.upperClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<</if>>
+	</div>
+</p>
+
+<p>
+	<div>
+	<<if $sexSubsidies.topClass == 0>>
+		You can provide a minor subsidy for those selling sexual services to the millionaires. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.topClass = 1]]
+	<<elseif $sexSubsidies.topClass == 1>>
+		You are providing a minor subsidy for those selling sexual services to the millionaires. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Cancel Subsidy|Manage Arcology][$sexSubsidies.topClass = 0]] | [[Moderate Subsidy|Manage Arcology][$sexSubsidies.topClass = 2]]
+	<<elseif $sexSubsidies.topClass == 2>>
+		You are providing a moderate subsidy for those selling sexual services to the millionaires. <span class="note">Upkeep is relative to the amount of sex provided by other parties.</span> [[Minor Subsidy|Manage Arcology][$sexSubsidies.topClass = 1]] | [[Substantial Subsidy|Manage Arcology][$sexSubsidies.topClass = 3]]
+	<<elseif $sexSubsidies.topClass == 3>>
+		You are providing a substantial subsidy for those selling sexual services to the millionaires. <span class="note">Upkeep is relative to the amount of sex provided by other parties</span> [[Moderate Subsidy|Manage Arcology][$sexSubsidies.topClass = 2]] | [[Gratuitous Subsidy|Manage Arcology][$sexSubsidies.topClass = 4]]
+	<<else>>
+		You are providing a gratuitous subsidy for those selling sexual services to the millionaires. <span class="note">Upkeep is relative to the amount of sex provided by other parties</span> [[Substantial Subsidy|Manage Arcology][$sexSubsidies.topClass = 3]]
+	<</if>>
+	</div>
+	<div>
+	<<if $sexSupplyBarriers.topClass == 0>>
+		You can make things more difficult for those supplying sexual services in the millionaires segment if you are willing to spend 1000 reputation and pay a flat upkeep of <span class="cash"><<print cashFormat(1000)>>.</span> <<if $rep > 1000>>[[Create Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 1, repX(-1000, "policies")]] <<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.topClass == 1>>
+		You have forced some unneeded bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(5000)>>.</span> <<if $rep > 1000>>[[Abolish Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 0, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 2, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<elseif $sexSupplyBarriers.topClass == 2>>
+		You have forced considerable bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(20000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 1, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough</span><</if>>
+	<<elseif $sexSupplyBarriers.topClass == 3>>
+		You have forced stifling bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. Increasing the bureaucracy further will cost a flat upkeep of <span class="cash"><<print cashFormat(60000)>>.</span> <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 2, repX(-1000, "policies")]] | [[Increase Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 4, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough.</span><</if>>
+	<<else>>
+		You have forced suffocating bureaucracy on those selling sexual services to the millionaires making things a little more difficult. If you are willing to spend 1000 reputation you can change this policy. <<if $rep > 1000>>[[Reduce Bureaucracy|Manage Arcology][$sexSupplyBarriers.topClass = 3, repX(-1000, "policies")]]<<else>><span class="note">You are not reputable enough</span><</if>>
+	<</if>>
+	</div>
+</p>
 
-<br><br>
+<h2>Population and Rent</h2>
 
-__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,
@@ -288,69 +363,79 @@ _rentLowerClass = Math.trunc($rent.lowerClass * (1 + (5 - $baseDifficulty) / 20)
 _rentMiddleClass = Math.trunc($rent.middleClass * (1 + (5 - $baseDifficulty) / 20) / 0.25) / 100,
 _rentUpperClass = Math.trunc($rent.upperClass * (1 + (5 - $baseDifficulty) / 20) / 25),
 _rentTopClass = Math.trunc($rent.topClass * (1 + (5 - $baseDifficulty) / 20) / 25)>>
-<br>Lower Class Citizens  | $lowerClass | <<print _percLowerClass>>% | Rent @@.yellowgreen;<<print cashFormat(_rentLowerClass)>>@@
+<div>
+Lower Class Citizens | $lowerClass | <<print _percLowerClass>>% | Rent <span class="cash"><<print cashFormat(_rentLowerClass)>></span>
 <<if $rent.lowerClass > $rentDefaults.lowerClass * 1.5>>
-	//Very High// | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 8]]
+	<span class="note">Very High</span> | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 8]]
 <<elseif $rent.lowerClass > $rentDefaults.lowerClass>>
-	//High// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 2, $rentEffectL = 0.85, $whoreBudget.lowerClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 9]]
+	<span class="note">High</span> | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 2, $rentEffectL = 0.85, $whoreBudget.lowerClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 9]]
 <<elseif $rent.lowerClass > $rentDefaults.lowerClass * 0.5>>
-	//Average// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 0.5, $rentEffectL = 1.04, $whoreBudget.lowerClass *= 11 / 10]]
+	<span class="note">Average</span> | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 1.5, $rentEffectL = 0.94, $whoreBudget.lowerClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 0.5, $rentEffectL = 1.04, $whoreBudget.lowerClass *= 11 / 10]]
 <<elseif $rent.lowerClass > 0>>
-	//Low// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.lowerClass = 0, $rentEffectL = 1.1, $whoreBudget.lowerClass *= 12 / 11]]
+	<span class="note">Low</span> | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass, $rentEffectL = 1, $whoreBudget.lowerClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.lowerClass = 0, $rentEffectL = 1.1, $whoreBudget.lowerClass *= 12 / 11]]
 <<else>>
-	//Free// | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 0.5, $rentEffectL = 1.04, $whoreBudget.lowerClass *= 11 / 12]]
+	<span class="note">Free</span> | [[Increase|Manage Arcology][$rent.lowerClass = $rentDefaults.lowerClass * 0.5, $rentEffectL = 1.04, $whoreBudget.lowerClass *= 11 / 12]]
 <</if>>
-<br>Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent @@.yellowgreen;<<print cashFormat(_rentMiddleClass)>>@@
+</div>
+<div>
+Middle Class Citizens | $middleClass | <<print _percMiddleClass>>% | Rent <span class="cash"><<print cashFormat(_rentMiddleClass)>></span>
 <<if $rent.middleClass > $rentDefaults.middleClass * 1.5>>
-	//Very High// | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 1.5, $rentEffectM = 0.94, $whoreBudget.middleClass *= 9 / 8]]
+	<span class="note">Very High</span> | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 1.5, $rentEffectM = 0.94, $whoreBudget.middleClass *= 9 / 8]]
 <<elseif $rent.middleClass > $rentDefaults.middleClass>>
-	//High// | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 2, $rentEffectM = 0.85, $whoreBudget.middleClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass, $rentEffectM = 1, $whoreBudget.middleClass *= 10 / 9]]
+	<span class="note">High</span> | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 2, $rentEffectM = 0.85, $whoreBudget.middleClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass, $rentEffectM = 1, $whoreBudget.middleClass *= 10 / 9]]
 <<elseif $rent.middleClass > $rentDefaults.middleClass * 0.5>>
-	//Average// | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 1.5, $rentEffectM = 0.94, $whoreBudget.middleClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 0.5, $rentEffectM = 1.04, $whoreBudget.middleClass *= 11 / 10]]
+	<span class="note">Average</span> | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 1.5, $rentEffectM = 0.94, $whoreBudget.middleClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 0.5, $rentEffectM = 1.04, $whoreBudget.middleClass *= 11 / 10]]
 <<elseif $rent.middleClass > 0>>
-	//Low// | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass, $rentEffectM = 1, $whoreBudget.middleClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.middleClass = 0, $rentEffectM = 1.1, $whoreBudget.middleClass *= 12 / 11]]
+	<span class="note">Low</span> | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass, $rentEffectM = 1, $whoreBudget.middleClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.middleClass = 0, $rentEffectM = 1.1, $whoreBudget.middleClass *= 12 / 11]]
 <<else>>
-	//Free// | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 0.5, $rentEffectM = 1.04, $whoreBudget.middleClass *= 11 / 12]]
+	<span class="note">Free</span> | [[Increase|Manage Arcology][$rent.middleClass = $rentDefaults.middleClass * 0.5, $rentEffectM = 1.04, $whoreBudget.middleClass *= 11 / 12]]
 <</if>>
-<br>Upper Class Citizens  | $upperClass | <<print _percUpperClass>>% | Rent @@.yellowgreen;<<print cashFormat(_rentUpperClass)>>@@
+</div>
+<div>
+Upper Class Citizens | $upperClass | <<print _percUpperClass>>% | Rent <span class="cash"><<print cashFormat(_rentUpperClass)>></span>
 <<if $rent.upperClass > $rentDefaults.upperClass * 1.5>>
-	//Very High// | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 1.5, $rentEffectU = 0.94, $whoreBudget.upperClass *= 9 / 8]]
+	<span class="note">Very High</span> | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 1.5, $rentEffectU = 0.94, $whoreBudget.upperClass *= 9 / 8]]
 <<elseif $rent.upperClass > $rentDefaults.upperClass>>
-	//High// | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 2, $rentEffectU = 0.85, $whoreBudget.upperClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass, $rentEffectU = 1, $whoreBudget.upperClass *= 10 / 9 ]]
+	<span class="note">High</span> | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 2, $rentEffectU = 0.85, $whoreBudget.upperClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass, $rentEffectU = 1, $whoreBudget.upperClass *= 10 / 9 ]]
 <<elseif $rent.upperClass > $rentDefaults.upperClass * 0.5>>
-	//Average// | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 1.5, $rentEffectU = 0.94, $whoreBudget.upperClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 0.5, $rentEffectU = 1.04, $whoreBudget.upperClass *= 11 / 10]]
+	<span class="note">Average</span> | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 1.5, $rentEffectU = 0.94, $whoreBudget.upperClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 0.5, $rentEffectU = 1.04, $whoreBudget.upperClass *= 11 / 10]]
 <<elseif $rent.upperClass > 0>>
-	//Low// | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass, $rentEffectU = 1, $whoreBudget.upperClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.upperClass = 0, $rentEffectU = 1.1, $whoreBudget.upperClass *= 12 / 11]]
+	<span class="note">Low</span> | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass, $rentEffectU = 1, $whoreBudget.upperClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.upperClass = 0, $rentEffectU = 1.1, $whoreBudget.upperClass *= 12 / 11]]
 <<else>>
-	//Free// | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 0.5, $rentEffectU = 1.04, $whoreBudget.upperClass *= 11 / 12]]
+	<span class="note">Free</span> | [[Increase|Manage Arcology][$rent.upperClass = $rentDefaults.upperClass * 0.5, $rentEffectU = 1.04, $whoreBudget.upperClass *= 11 / 12]]
 <</if>>
-<br>Millionaires		  | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat(_rentTopClass)>>@@
+</div>
+<div>
+Millionaires | $topClass | <<print _percTopClass>>% | Rent <span class="cash"><<print cashFormat(_rentTopClass)>></span>
 <<if $rent.topClass > $rentDefaults.topClass * 1.5>>
-	//Very High// | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 1.5, $rentEffectT = 0.94, $whoreBudget.topClass *= 9 / 8]]
+	<span class="note">Very High</span> | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 1.5, $rentEffectT = 0.94, $whoreBudget.topClass *= 9 / 8]]
 <<elseif $rent.topClass > $rentDefaults.topClass>>
-	//High// | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 2, $rentEffectT = 0.85, $whoreBudget.topClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass, $rentEffectT = 1, $whoreBudget.topClass *= 10 / 9]]
+	<span class="note">High</span> | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 2, $rentEffectT = 0.85, $whoreBudget.topClass *= 8 / 9]] | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass, $rentEffectT = 1, $whoreBudget.topClass *= 10 / 9]]
 <<elseif $rent.topClass > $rentDefaults.topClass * 0.5>>
-	//Average// | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 1.5, $rentEffectT = 0.94, $whoreBudget.topClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 0.5, $rentEffectT = 1.04, $whoreBudget.topClass *= 11 / 10]]
+	<span class="note">Average</span> | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 1.5, $rentEffectT = 0.94, $whoreBudget.topClass *= 9 / 10]] | [[Decrease|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 0.5, $rentEffectT = 1.04, $whoreBudget.topClass *= 11 / 10]]
 <<elseif $rent.topClass > 0>>
-	//Low// | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass, $rentEffectT = 1, $whoreBudget.topClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.topClass = 0, $rentEffectT = 1.1, $whoreBudget.topClass *= 12 / 11]]
+	<span class="note">Low</span> | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass, $rentEffectT = 1, $whoreBudget.topClass *= 10 / 11]] | [[Free Rent|Manage Arcology][$rent.topClass = 0, $rentEffectT = 1.1, $whoreBudget.topClass *= 12 / 11]]
 <<else>>
-	//Free// | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 0.5, $rentEffectT = 1.04, $whoreBudget.topClass *= 11 / 12]]
+	<span class="note">Free</span> | [[Increase|Manage Arcology][$rent.topClass = $rentDefaults.topClass * 0.5, $rentEffectT = 1.04, $whoreBudget.topClass *= 11 / 12]]
 <</if>>
-<br>Slaves				| $ASlaves | <<print _percASlaves>>%
+</div>
+<div>
+Slaves | $ASlaves | <<print _percASlaves>>%
+</div>
 
-<br><br>
+<h2>Language</h2>
 
-__Language__
-<br>The lingua franca of the arcology is ''$language''.
-<<link "Language options">><<set $seed = $language>><<goto "Change Language">><</link>>
+<div>
+	The lingua franca of the arcology is <strong>$language</strong>.
+	<<link "Language options">><<set $seed = $language>><<goto "Change Language">><</link>>
+</div>
 
-<br><br>
+<h2>Special Arcology Upgrades</h2>
 
-__Special Arcology Upgrades__
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+<div class="indent">
 
 <<if ($personalArms == 0) && ($mercenaries == 0) && ($assistant == 0)>>
-	//$arcologies[0].name has no special upgrades//
+	<span class="note">$arcologies[0].name has no special upgrades.</span>
 <</if>>
 
 <<if ($personalArms == 1)>>
@@ -377,15 +462,19 @@ __Special Arcology Upgrades__
 	<</if>>
 <</if>>
 
-<br><br>
+</div>
+
+<p>
 
 Your slaves have participated in approximately <<print num($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print num($oralTotal)>> primarily oral, <<print num($vaginalTotal)>> vanilla, <<print num($mammaryTotal)>> mammary, <<print num($analTotal)>> anal, and <<print num($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print num($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print num($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print num($birthsTotal)>> times.
 
 <<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
 <<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
 
+</p>
+
 <<if $secExpEnabled == 1 && $SecExp.settings.battle.enabled == 1>>
-	<br><br>
+	<p>
 	<<if $SF.Toggle === 0||$SF.Active === 0>>
 		Your army counts <<print num($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
 	<<elseif $SF.Toggle && $SF.Active >= 1>>
@@ -407,11 +496,15 @@ Your slaves have participated in approximately <<print num($oralTotal+$vaginalTo
 	<</if>>
 
 	During all battles you lost a total of <<print num($militiaTotalCasualties + $slavesTotalCasualties + $mercTotalCasualties)>> men, while scoring a total of <<print num($totalKills)>> kills.
+	</p>
 <</if>>
-<br><br>
 
-Your arcology is named <<textbox "$arcologies[0].name" $arcologies[0].name "Manage Arcology">>
+<p>
+	Your arcology is named <<textbox "$arcologies[0].name" $arcologies[0].name "Manage Arcology">>
+</p>
 
 <<if $cheatMode == 1 && $seeExtreme == 1>>
-	<br><br>[[Host Dinner Party|Dinner Party Preparations]]
+	<p>
+		[[Host Dinner Party|Dinner Party Preparations]]
+	</p>
 <</if>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index 90d5f98a307362a359e90c05c4c3482885908c85..df025799fe1ebaeb6a8a3ce15f692de95449bc5b 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -3,413 +3,430 @@
 <<set $nextButton = "Back", $nextLink = "Main", $showEncyclopedia = 1, $encyclopedia = "What the Upgrades Do">>
 
 <<if $cheatMode == 1>>
-	<center>
-	//[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]//
-	</center>
+	<div class="cheat-menu">[[Cheat Edit Arcology|MOD_Edit Arcology Cheat][$cheater = 1]]</div>
 <</if>>
 
+<h1>Penthouse</h1>
+
+<div class="scene-intro">
 <<include "Office Description">>
 <<if $PC.career == "mercenary">>
 	You look back at the rifle. It could never hold a zero, and would fail to feed if it wasn't given just the right amount of lubricant. But sometimes, you'd give anything for one more mission with that shitty old rifle.
 <</if>>
+</div>
 
-<br><br>
-
+<div>
 <<if $SF.Toggle && $SF.Active >= 1>>
+	<br>
 	<<link "Take your express elevator down to $SF.Lower""Firebase">> <</link>>
-	<br><br>
 <<elseif $SF.FS.Tension > 100>>
 	<<= App.SF.fsIntegration('BadOutcome_Firebase')>>
 <</if>>
+</div>
 
-__Penthouse Capacity__
-<br>
+<h2>Penthouse Capacity</h2>
 
+<div>
 The main penthouse dormitory, which houses slaves who aren't living in a facility and aren't granted a luxurious standard of living, has a capacity of ''$dormitory'' slaves.
 [[Expand the dormitory|Manage Penthouse][cashX(forceNeg(Math.trunc($dormitory*1000*$upgradeMultiplierArcology)), "capEx"), $dormitory += 10, $PC.skill.engineering += .1]]
-//Costs <<print cashFormat(Math.trunc($dormitory*1000*$upgradeMultiplierArcology))>>//
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-//Exceeding this limit is bad for slaves' health, devotion and trust//
-
-<br>
+<span class="detail">
+	Costs <<print cashFormat(Math.trunc($dormitory*1000*$upgradeMultiplierArcology))>>
+	<div class="indent">Exceeding this limit is bad for slaves' health, devotion and trust.</div>
+</span>
+</div>
 
+<div>
 The penthouse also features little individual rooms, which house slaves who do enjoy a luxurious standard of living. They have a capacity of ''$rooms'' slaves.
 [[Expand the rooms|Manage Penthouse][cashX(forceNeg(Math.trunc($rooms*1000*$upgradeMultiplierArcology)), "capEx"), $rooms += 5, $PC.skill.engineering += .1]]
-//Costs <<print cashFormat(Math.trunc($rooms*1000*$upgradeMultiplierArcology))>>//
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
-//The number of rooms determines the number of slaves that can be granted luxury//
-
-<br><br>
-
-__Penthouse Facilities__
+<span class="detail">
+	Costs <<print cashFormat(Math.trunc($rooms*1000*$upgradeMultiplierArcology))>>
+	<div class="indent">The number of rooms determines the number of slaves that can be granted luxury.</div>
+</span>
+</div>
 
-<br>
+<h2>Penthouse Facilities</h2>
 
+<div>
 <<if $masterSuite == 0>>
 	[[Improve your master bedroom to house a harem of personal toys|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $masterSuite = 1, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	Your penthouse is capped by a master suite with room for an entire harem of personal toys.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $servantsQuarters == 0>>
 	[[Build a dormitory to house large numbers of house servants|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $servantsQuarters = 5, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	Your penthouse includes a dormitory to house large numbers of house servants.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $schoolroom == 0>>
 	[[Build a schoolroom where slaves can be educated|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $schoolroom = 5, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	Your penthouse includes a schoolroom where slaves can be educated.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $spa == 0>>
 	[[Install open baths to provide relaxation space for resting slaves|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $spa = 5, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	The penthouse includes a fully appointed spa where slaves can rest and recuperate.
 <</if>>
+</div>
 
 <<if $familyTesting == 1 && $seePreg != 0>>
-	<br>
 	<<if $cheatMode == 1>>
+	<div>
 	<<if $nursery == 0>>
 		[[Build a nursery to raise children from birth|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $nursery = 5, $nurseryNannies = 1, $PC.skill.engineering += 1]]
-			//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 			The penthouse has a nursery built where infants can be brought up.
 	<</if>>
+	</div>
 	<</if>>
 <</if>>
 
-<br>
-
+<div>
 <<if $clinic == 0>>
 	[[Expand the surgical recovery area to accommodate patients and a nurse|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $clinic = 5, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	The surgical recovery area has been expanded to take in more unhealthy slaves and be staffed by a nurse.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $cellblock == 0>>
 	[[Construct cells to properly confine disobedient slaves|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $cellblock = 5, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	The lower level of the penthouse includes a hallway of cells to confine slaves in.
 <</if>>
-
-<br>
+</div>
 
 <<if $familyTesting == 1 && $seePreg != 0>>
+	<div>
 	<<if $arcologyUpgrade.grid == 1>>
 		<<if $incubator == 0>>
 			[[Install an incubation chamber to rapidly age children|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $incubator = 1, $PC.skill.engineering += 1, $readySlaves = 0]]
-			//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>></span>
 		<<else>>
 			The penthouse has a specialized facility dedicated to rapidly aging children.
 		<</if>>
 	<<elseif $arcologyUpgrade.hydro == 1 || $arcologyUpgrade.apron == 1>>
-		//Installation of a child aging facility will require the arcology's electrical infrastructure to be overhauled.//
+		<span class="note">Installation of a child aging facility will require the arcology's electrical infrastructure to be overhauled.</span>
 	<</if>>
-	<br>
+	</div>
 <</if>>
 
+<div>
 <<if $HGSuite != 1>>
 	[[Build a small suite for a Head Girl to live in|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $HGSuite = 1, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	There is a small but handsome suite next to yours reserved for the Head Girl.
 <</if>>
+</div>
 
-<br><br>
-
-__Penthouse Upgrades__
-
-<br>
+<h2>Penthouse Upgrades</h2>
 
+<div>
 <<if $servantMilkers != 1>>
 	Your penthouse is equipped with basic milkers for lactating slaves. [[Install more and tie them into the liquid systems|Manage Penthouse][cashX(forceNeg(Math.trunc(25000*$upgradeMultiplierArcology)), "capEx"), $servantMilkers = 1, $PC.skill.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	Every room in the penthouse is equipped with milkers tied into the liquid systems, letting slaves with full udders drain them anywhere.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $boobAccessibility != 1>>
 	<<if $pregAccessibility == 1 || $ballsAccessibility || $buttAccessibility>>
 		Your penthouse has already been widened for overly wide slaves but there are no special accommodations for slaves with enormous breasts. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $boobAccessibility = 1, $PC.skill.engineering += .5]]
-		//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 		Your penthouse has no special accessibility provisions for slaves with enormous breasts. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $boobAccessibility = 1, $PC.skill.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>></span>
 	<</if>>
 <<else>>
 	The entire penthouse has been remodeled to make life with enormous breasts easier. The doorways have been widened, and tables, sinks, and other items now have two levels: one at shoulder height for slaves to use, and another at waist height for them to rest their tits on while they do.
 <</if>>
+</div>
 
 <<if $seeHyperPreg == 1>>
-	<br>
+	<div>
 	<<if $pregAccessibility != 1>>
 		<<if $boobAccessibility == 1 || $ballsAccessibility || $buttAccessibility>>
 			Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous pregnancies. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $pregAccessibility = 1, $PC.skill.engineering += .5]]
-			//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 		<<else>>
 			Your penthouse has no special accessibility provisions for slaves with enormous pregnancies. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $pregAccessibility = 1, $PC.skill.engineering += 1]]
-			//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>></span>
 		<</if>>
 	<<else>>
 		The entire penthouse has been remodeled to make life with enormous pregnancies easier. The doorways have been widened, and tables, sinks, and other items are now designed to work around a massively distended belly.
 	<</if>>
+	</div>
 <</if>>
 
 <<if $arcologies[0].FSAssetExpansionistResearch == 1>>
-	<br>
-
+	<div>
 	<<if $dickAccessibility != 1>>
 		Your penthouse has no special accessibility provisions for slaves with enormous dicks. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $dickAccessibility = 1, $PC.skill.engineering += .5]]
-		//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 		The entire penthouse has been remodeled to make life with enormous dicks easier. Carts, slings and harnesses are available to keep things from dragging and there is now plenty of room for huge genitals to occupy when a slave must use appliances, tables and seats.
 	<</if>>
+	</div>
 
-	<br>
+	<div>
 	<<if $ballsAccessibility != 1>>
 		<<if $boobAccessibility == 1 || $buttAccessibility || $pregAccessibility>>
 			Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with enormous testicles. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $ballsAccessibility = 1, $PC.skill.engineering += .5]]
-			//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 		<<else>>
 			Your penthouse has no special accessibility provisions for slaves with enormous testicles. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $ballsAccessibility = 1, $PC.skill.engineering += 1]]
-			//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>></span>
 		<</if>>
 	<<else>>
 		The entire penthouse has been remodeled to make life with enormous testicles easier. The doorways have been widened, tables, sinks, and other items are now designed to fit over giant balls, drains have been widened to allow excessive cum to flow easier, and seats have been specially altered to allow plenty of ball room for seated slaves.
 	<</if>>
+	</div>
 
-	<br>
+	<div>
 	<<if $buttAccessibility != 1>>
 		<<if $boobAccessibility == 1 || $dickAccessibility || $ballsAccessibility>>
 			Your penthouse has already been widened to make life for overly wide slaves easier but there are no special accommodations for slaves with gigantic posteriors. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $buttAccessibility = 1, $PC.skill.engineering += .5]]
-			//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 		<<else>>
 			Your penthouse has no special accessibility provisions for slaves with enormous posteriors. [[Remodel for accessibility|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $buttAccessibility = 1, $PC.skill.engineering += 1]]
-			//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
+			<span class="detail">Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>></span>
 		<</if>>
 	<<else>>
 		The entire penthouse has been remodeled to make life with enormous rears easier. The doorways have been widened, and anything that can be sat on is now extra, extra wide and reinforced to allow even the heaviest, biggest asses to comfortably rest upon it.
 	<</if>>
+	</div>
 <</if>>
 
 <<if $boobAccessibility > 0 || $pregAccessibility > 0 || $dickAccessibility > 0 || $ballsAccessibility > 0 || $buttAccessibility > 0>>
 	<<set _removeCost = Math.trunc(((5000*($boobAccessibility+$pregAccessibility+$dickAccessibility+$ballsAccessibility+$buttAccessibility)))*$upgradeMultiplierArcology)>>
-	<br>
-	//[[Remove the accessibility renovations|Manage Penthouse][cashX(forceNeg(_removeCost), "capEx"), $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>//
+	<div class="detail">
+		[[Remove the accessibility renovations|Manage Penthouse][cashX(forceNeg(_removeCost), "capEx"), $boobAccessibility = 0, $pregAccessibility = 0, $dickAccessibility = 0, $ballsAccessibility = 0, $buttAccessibility = 0]] Will cost <<print cashFormat(_removeCost)>>
+	</div>
 <</if>>
 
-<br>
-
+<div>
 <<if $feeder == 0>>
 	[[Upgrade the kitchen's nutritional sensing systems|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $feeder = 1, $PC.skill.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	The kitchen mounts sensors to refine diets in real time.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $cockFeeder == 0>>
 	[[Enhance the feeding system with faux phalli|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $cockFeeder = 1, $PC.skill.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
-	The kitchen dispenses food from phalli slaves must suck off in order to eat. //[[Remove them|Manage Penthouse][$cockFeeder = 0]]//
+	The kitchen dispenses food from phalli slaves must suck off in order to eat. <span class="detail">[[Remove them|Manage Penthouse][$cockFeeder = 0]]</span>
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $suppository == 0>>
 	[[Replace the drug dispensers with reciprocating dildo suppositories|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $suppository = 1, $PC.skill.engineering += .1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
-	The kitchen applies drugs that can be absorbed rectally by assfucking slaves with dildos that cum the pharmaceuticals. //[[Remove them|Manage Penthouse][$suppository = 0]]//
+	The kitchen applies drugs that can be absorbed rectally by assfucking slaves with dildos that cum the pharmaceuticals. <span class="detail">[[Remove them|Manage Penthouse][$suppository = 0]]</span>
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $dairy != 0>>
 	<<if $dairyPiping == 0>>
 		[[Install pipes connecting the Dairy to the rest of your penthouse for use in enema play|Manage Penthouse][cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology)), "capEx"), $dairyPiping = 1, $PC.skill.engineering += .5]]
-		//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 		Various taps around the penthouse supply product from $dairyName for use in enema play and force-feeding.
 	<</if>>
 <<elseif $dairyPiping == 1>>
 	Various taps around the penthouse supply product from $dairyName for use in enema play and force-feeding. With no dairy to draw from, they are currently unused.
 <</if>>
-
-<br>
+</div>
 
 <<if $seePee == 1>>
+	<div>
 	<<if $wcPiping == 0>>
 		[[Install pipes connecting the slave bathrooms to the rest of your penthouse for use in watersports|Manage Penthouse][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $wcPiping = 1, $PC.skill.engineering += .5]]
-		//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 		The plumbing underneath the slave bathrooms connects to various taps throughout the penthouse that can dispense its contents when needed.
 	<</if>>
+	</div>
 <</if>>
 
-<br>
-
+<div>
 <<if $studio == 0>>
 	[[Install a media hub to convert slave video feeds into pornography|Manage Penthouse][cashX(forceNeg(Math.trunc(10000*$upgradeMultiplierArcology)), "capEx"), $studio = 1, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	The arcology's video systems are connected to a media hub that can convert slave video feeds into pornography.
 	<<if $studioFeed == 0>>
 		[[Upgrade the media hub to allow better control of pornographic content|Manage Penthouse][cashX(forceNeg(Math.trunc(15000*$upgradeMultiplierArcology)), "capEx"), $studioFeed = 1]]
-		//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology))>></span>
 	<<else>>
 		It has been upgraded to allow superior control of a slave's pornographic content.
 	<</if>>
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $dojo == 0>>
 	[[Set up a personal armory to support a bodyguard|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $dojo = 1, $PC.skill.engineering += 1]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<elseif $dojo == 1>>
 	There is a small armory next to your office that can support a bodyguard. [[Upgrade the armory with a private room for the bodyguard|Manage Penthouse][cashX(forceNeg(Math.trunc(5000*$upgradeMultiplierArcology)), "capEx"), $dojo = 2, $PC.skill.engineering += .5]]
-	//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>//
+	<span class="detail">Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>></span>
 <<else>>
 	There is a small armory next to your office that can support a bodyguard, with a little room for them to rest in when off duty.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $dispensary == 0>>
 	<<if $rep > 2000>>
 		[[Install a pharmaceutical fabricator|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $dispensary = 1, $drugsCost = $drugsCost*.75, $PC.skill.engineering += .1]]
-		//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to obtain cutting-edge pharmaceutical technology//
+		<span class="note">You lack the reputation to obtain cutting-edge pharmaceutical technology.</span>
 	<</if>>
 <<else>>
 	There is a [[pharmaceutical fabricator|Dispensary]] attached to the surgery.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $ImplantProductionUpgrade == 0>>
 	<<if $rep > 2000>>
 		[[Install an implant manufactory|Manage Penthouse][cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "capEx"), $ImplantProductionUpgrade = 1, $PC.skill.engineering += .1]]
-		//Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to obtain cutting-edge implant fabrication technology//
+		<span class="note">You lack the reputation to obtain cutting-edge implant fabrication technology.</span>
 	<</if>>
 <<else>>
 	There is a [[implant manufactory|Implant Manufactory]] attached to the surgery.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $organFarmUpgrade == 0>>
 	<<if $rep > 10000>>
 		[[Install an experimental organ farm|Manage Penthouse][cashX(forceNeg(Math.trunc(70000*$upgradeMultiplierArcology)), "capEx"), $organFarmUpgrade = 1, $PC.skill.engineering += .1]]
-		//Costs <<print cashFormat(Math.trunc(70000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(70000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to obtain an experimental organ fabricator//
+		<span class="note">You lack the reputation to obtain an experimental organ fabricator.</span>
 	<</if>>
 <<else>>
 	There is an [[organ farm|Organ Farm]] attached to the surgery.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<if $geneticMappingUpgrade == 0>>
 	<<if $rep > 14000>>
 		[[Install a genetic sequencer|Manage Penthouse][cashX(-120000, "capEx"), $geneticMappingUpgrade = 1, $PC.skill.engineering += .1]]
-		//Costs <<print cashFormat(120000)>>//
+		<span class="detail">Costs <<print cashFormat(120000)>></span>
 	<<else>>
-		//You lack the reputation to purchase a cutting-edge genetic sequencer//
+		<span class="note">You lack the reputation to purchase a cutting-edge genetic sequencer</span>
 	<</if>>
 <<else>>
 	There is a [[genetic sequencer|Gene Lab]] attached to the surgery.
 <</if>>
+</div>
 
-<br>
-
+<div>
 <<switch $prostheticsUpgrade>>
 <<case 0>>
 	<<if ($rep > 8000)>>
 		[[Install basic equipment for attaching and maintenance of prosthetics|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $prostheticsUpgrade = 1, $PC.skill.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to buy basic equipment for attaching and maintenance of prosthetics.//
+		<span class="note">You lack the reputation to buy basic equipment for attaching and maintenance of prosthetics.</span>
 	<</if>>
 <<case 1>>
 	You have basic equipment for attaching and maintenance of prosthetics.
 	<<if ($rep > 12000)>>
 		[[Buy a contract for advanced prosthetics|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $prostheticsUpgrade = 2]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to get a contract for advanced prosthetics.//
+		<span class="note">You lack the reputation to get a contract for advanced prosthetics.</span>
 	<</if>>
 <<case 2>>
 	You have basic equipment for attaching and maintenance of prosthetics and a contract to guarantee the availability of advanced prosthetics.
 	<<if ($rep > 16000)>>
 		[[Buy a contract for high-tech prosthetics|Manage Penthouse][cashX(forceNeg(Math.trunc(100000*$upgradeMultiplierArcology)), "capEx"), $prostheticsUpgrade = 3]]
-		//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>>//
+		<span class="detail">Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology))>></span>
 	<<else>>
-		//You lack the reputation to get a contract for high-tech prosthetics.//
+		<span class="note">You lack the reputation to get a contract for high-tech prosthetics.</span>
 	<</if>>
 <<case 3>>
 	You have basic equipment for attaching and maintenance of prosthetics and a contract to guarantee the availability of high-tech prosthetics.
 <</switch>>
-<br>
+</div>
+
 <<if $prostheticsUpgrade > 0>>
+	<div>
 	<<if $researchLab.level > 0>>
 		Your penthouse is equipped with an advanced prosthetic lab.
 	<<else>>
 		[[Clear out one of the floors and install equipment to construct prosthetics yourself|Manage Penthouse][cashX(forceNeg(Math.trunc(150000*$upgradeMultiplierArcology)), "capEx"), $researchLab.level = 1, $researchLab.maxSpace = 5, $PC.skill.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(150000*$upgradeMultiplierArcology))>>//<br>
-		//Buying the equipment to construct prosthetics yourself is expensive but if you want to construct a lot of prosthetics it will pay out in the long run.//
+		<span class="detail">
+			Costs <<print cashFormat(Math.trunc(150000*$upgradeMultiplierArcology))>>
+			<div class="indent">
+				Buying the equipment to construct prosthetics yourself is expensive but if you want to construct a lot of prosthetics it will pay out in the long run.
+			</div>
+		</span>
 	<</if>>
+	</div>
 <</if>>
 
-<br><br>
 
-<<if $surgeryUpgrade == 0>>
-	<<if $rep > 10000>>
-		[[Upgrade the remote surgery|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $surgeryUpgrade = 1, $PC.skill.engineering += 1]]
-		//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>//
-	<<else>>
-		//You lack the reputation to secure rare surgery upgrades//
-	<</if>>
-<<else>>
-	Your remote surgery has been heavily upgraded and customized.
-<</if>>
-
-<<if $seePreg == 1>>
-	<br>
-	<<if $pregnancyMonitoringUpgrade == 0>>
+<p>
+	<div>
+	<<if $surgeryUpgrade == 0>>
 		<<if $rep > 10000>>
-			[[Upgrade the pregnancy monitoring systems|Manage Penthouse][cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx"), $pregnancyMonitoringUpgrade = 1, $PC.skill.engineering += 1]]
-			//Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>//
+			[[Upgrade the remote surgery|Manage Penthouse][cashX(forceNeg(Math.trunc(50000*$upgradeMultiplierArcology)), "capEx"), $surgeryUpgrade = 1, $PC.skill.engineering += 1]]
+			<span class="detail">Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>></span>
 		<<else>>
-			//You lack the reputation to purchase improved pregnancy monitoring systems//
+			<span class="note">You lack the reputation to secure rare surgery upgrades.</span>
 		<</if>>
 	<<else>>
-		Your pregnancy monitoring systems have been heavily upgraded.
+		Your remote surgery has been heavily upgraded and customized.
 	<</if>>
-<</if>>
+	</div>
+
+	<<if $seePreg == 1>>
+		<div>
+		<<if $pregnancyMonitoringUpgrade == 0>>
+			<<if $rep > 10000>>
+				[[Upgrade the pregnancy monitoring systems|Manage Penthouse][cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx"), $pregnancyMonitoringUpgrade = 1, $PC.skill.engineering += 1]]
+				<span class="detail">Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>></span>
+			<<else>>
+				<span class="note">You lack the reputation to purchase improved pregnancy monitoring systems.</span>
+			<</if>>
+		<<else>>
+			Your pregnancy monitoring systems have been heavily upgraded.
+		<</if>>
+		</div>
+	<</if>>
+</p>