diff --git a/devNotes/Useful JS Function Documentation.txt b/devNotes/Useful JS Function Documentation.txt
index 0bf3273d18366301b75c1efb80e23d3eda189649..8faea827966d6336569f053c48597e22f77b4bce 100644
--- a/devNotes/Useful JS Function Documentation.txt	
+++ b/devNotes/Useful JS Function Documentation.txt	
@@ -132,7 +132,7 @@ tooBigButt(slave) - Returns if the slave's butt is too big for her to move.
 
 milkAmount(slave) - Returns the slave's expected milk output in liters.
 
-foodAmount(slave) - Returns the slave's expected food output in kilograms.
+App.Facilities.Farmyard.foodAmount(slave) - Returns the slave's expected food output in kilograms.
 
 cumAmount(slave) - Returns the slave's expected cum output in deciliters.
 
diff --git a/src/002-config/mousetrapConfig.js b/src/002-config/mousetrapConfig.js
index b9a4777df342dc25c94783024359336a9042b1f8..2ae1f8c33a798322fa96a4a8c5d653ecc1b09bc6 100644
--- a/src/002-config/mousetrapConfig.js
+++ b/src/002-config/mousetrapConfig.js
@@ -89,6 +89,9 @@ Mousetrap.bind("z", function() {
 	$("#story-caption #SFMButton a.macro-link").trigger("click");
 });
 Mousetrap.bind("d", function() {
+	$("#story-caption #diplomacyButton a.macro-link").trigger("click");
+});
+Mousetrap.bind("e", function() {
 	$("#story-caption #edictButton a.macro-link").trigger("click");
 });
 Mousetrap.bind("shift+s", function() {
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index d2a362218139ad1a8c38899ef300fffa0892095b..af527a4183a69c4b6267f9c1735e96e9aabd7bba 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -38,7 +38,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
 
 	// Open Food Production
 
-	let food = Math.trunc(foodAmount(slave));
+	let food = Math.trunc(App.Facilities.Farmyard.foodAmount(slave));
 	if (food < 1) {
 		food = 1;
 	}
@@ -116,7 +116,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
 
 	// Open Shows
 
-	incomeStats.income += farmShowsIncome(slave);
+	incomeStats.income += App.Facilities.Farmyard.farmShowsIncome(slave);
 
 	if (V.farmyardShows) {
 		t += `${He} also puts on shows with animals this week. `;
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index b739399f525b4307a1c87e00c2898581dc598bfe..038c9347e8ecbf8fdb4ac28e6c4c9ececd2fbdba 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -213,7 +213,6 @@ App.Interact.ToyChest = function(slave) {
 				} else if (slave.actualAge < 30) {
 					r += `${He}'s chosen to wear a slutty nurse outfit, and looks more than ready to minister to any patient's needs.`;
 				} else if (slave.actualAge < 40) {
-					// TODO: is this supposed to be the same as the one above?
 					r += `${He}'s wearing a schoolgirl uniform and sucking on hard candy, a delightfully perverse outfit for a slave in ${his} thirties.`;
 				} else {
 					r += `${He}'s wearing a wifely apron that covers ${his} front, but leaves ${his} backside bare, an appropriate outfit for a slave in ${his} forties.`;
diff --git a/src/js/food.js b/src/js/food.js
index fecc4a67488cdb7614b727edd89419390c626a1f..34040d208fe8ade5b579c3c51c4bdeda4fcbc356 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -2,7 +2,7 @@
  * @param {App.Entity.SlaveState} slave
  * @returns {number}
  */
-window.foodAmount = function(slave) {
+App.Facilities.Farmyard.foodAmount = function(slave) {
 	let food = 400;													// kg / food produced by base slave / week
 	if (!slave) {
 		return null;
@@ -53,8 +53,8 @@ window.foodAmount = function(slave) {
  * @param {App.Entity.SlaveState} slave
  * @returns {number}
  */
-window.farmShowsIncome = function(slave) {
-																	// TODO: incorporate farmyardRestraints
+App.Facilities.Farmyard.farmShowsIncome = function(slave) {
+	// TODO: incorporate farmyardRestraints
 	let arcology = V.arcologies[0];
 	let cash = 100;													// TODO: this is just a placeholder
 	if (!slave) {
@@ -224,7 +224,7 @@ window.farmShowsIncome = function(slave) {
 				cash *= 0.9;
 			}
 		}
-																	// TODO: should I add the ancient cultures FS?
+		// TODO: should I add the ancient cultures FS?
 		/* CLOSE FS EFFECTS */
 
 		if (setup.entertainmentCareers.includes(slave.career)) {
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 28a430801fb3b847c923f69673a8ed269eb6a147..621223bfa308303f7a37d73258dd7c60d29f0700 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -498,8 +498,8 @@ window.actX = function actX(slave, act, count = 1) {
 			// Act was likely entered incorrectly.
 			return;
 	}
-	if (act === "birth") { // Annoyingly at the moment, V.birthsTotal means all the births in your arc.  Within the slave counter though, .birth is all births in your arc and .birthTotal includes births outside your arch.
-		slave.counter.birthToal += count;
+	if (act === "birth") { // Annoyingly at the moment, V.birthsTotal means all the births in your arc.  Within the slave counter though, .births is all births in your arc and .birthsTotal includes births outside your arch.
+		slave.counter.birthsTotal += count;
 	}
 	slave.counter[act] += count;
 };
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index 17ed3d1d45238e965b29c66a632839cea615bbb1..833a6121ad01aa7cb2df64aa517ee4df3dff98ba 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -2,131 +2,146 @@
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
-<br>
-The Implant Manufactory
-<hr>
+<h1>The Implant Manufactory</h1>
 
-//The implant manufactory is running smoothly. It can cheaply produce advanced implants and has freed you from relying on outside sources for specialty implants. It can easily produce more complex implants should you obtain the schematics necessary to build them.//
+<div class="scene-intro">The implant manufactory is running smoothly. It can cheaply produce advanced implants and has freed you from relying on outside sources for specialty implants. It can easily produce more complex implants should you obtain the schematics necessary to build them.</div>
 
-<br><br>
-Implant Production
-<hr>
+<h2>Implant Production</h2>
 
-The manufactory is capable of producing customized fillable implants.
-
-<br>
+<div>The manufactory is capable of producing customized fillable implants.</div>
 
 <<if ($meshImplants != 1) && ($rep <= 10000*_PCSkillCheck)>>
-	//You lack the reputation to access plans for supportive breast implants//
-	<br>
+	<div class="note">
+		You lack the reputation to access plans for supportive breast implants.
+	</div>
 <<elseif ($meshImplants != 1) && ($rep > 10000*_PCSkillCheck)>>
-	[[Purchase plans for supportive mesh breast implants|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $meshImplants = 1]]
-	//Costs <<print cashFormat(40000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of organic and supportive mesh breast implants.//
-	<br>
+	<div>
+		[[Purchase plans for supportive mesh breast implants|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $meshImplants = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(40000*_PCSkillCheck)>>
+			<div class="indent">
+				Will allow the construction of organic and supportive mesh breast implants.
+			</div>
+		</span>
+	</div>
 <<elseif ($meshImplants > 0)>>
-	The manufactory is capable of producing supportive mesh breast implants.
-	<br>
+	<div>The manufactory is capable of producing supportive mesh breast implants.</div>
 <</if>>
 
 <<if $UterineRestraintMesh == 1>>
-	The manufactory is capable of producing supportive mesh uterine implants.
-	<br>
+	<div>The manufactory is capable of producing supportive mesh uterine implants.</div>
 <</if>>
 
 <<if ($bellyImplants == 0) && ($rep <= 2000*_PCSkillCheck)>>
-	//You lack the reputation to access experimental fillable abdominal implants//
-	<br>
+	<div class="note">You lack the reputation to access experimental fillable abdominal implants.</div>
 <<elseif ($bellyImplants == 0) && ($rep > 2000*_PCSkillCheck)>>
-	[[Purchase schematics for fillable abdominal implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $bellyImplants = 1]]
-	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of fillable abdominal implants for the autosurgery.//
-	<br>
+	<div>
+		[[Purchase schematics for fillable abdominal implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $bellyImplants = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(30000*_PCSkillCheck)>>
+			<div class="indent">
+				Will allow the construction of fillable abdominal implants for the autosurgery.
+			</div>
+		</span>
+	</div>
 <<elseif ($bellyImplants > 0)>>
-	The manufactory is capable of crafting fillable abdominal implants.
-	<br>
+	<div>The manufactory is capable of crafting fillable abdominal implants.</div>
 	<<if ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep <= 6000*_PCSkillCheck)>> /* show only after belly implants already researched */
-		//You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants//
-		<br>
+		<div class="note">You lack the reputation to access experimental cervix filter micropumps schematics for abdominal implants.</div>
 	<<elseif ($bellyImplants == 1) && ($cervixImplants == 0) && ($rep > 6000 * _PCSkillCheck)>> /* nanotech like technology much more impressive and costly than simple implant */
-		[[Purchase schematics for cervix filter micropumps|Implant Manufactory][cashX(forceNeg(70000*_PCSkillCheck), "capEx"), $cervixImplants = 1]]
-		//Costs <<print cashFormat(70000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of cervix filter micropumps for fillable abdominal implants using the autosurgery.//
-		<br>
+		<div>
+			[[Purchase schematics for cervix filter micropumps|Implant Manufactory][cashX(forceNeg(70000*_PCSkillCheck), "capEx"), $cervixImplants = 1]]
+			<span class="detail">
+				Costs <<print cashFormat(70000*_PCSkillCheck)>>
+				<div class="indent">
+					Will allow the construction of cervix filter micropumps for fillable abdominal implants using the autosurgery.
+				</div>
+			</span>
+		</div>
 	<<elseif ($cervixImplants == 1) && ($rep <= 8000*_PCSkillCheck)>>
-		The manufactory is capable of crafting cervix filter micropumps for fillable abdominal implants.
-		<br>
-		//You lack the reputation to obtain conversion kits for rectal filter micropumps//
-		<br>
+		<div>The manufactory is capable of crafting cervix filter micropumps for fillable abdominal implants.</div>
+		<div class="note">
+			You lack the reputation to obtain conversion kits for rectal filter micropumps.
+		</div>
 	<<elseif ($cervixImplants == 1) && ($rep > 8000*_PCSkillCheck)>>
-		The manufactory is capable of crafting cervix filter micropumps for fillable abdominal implants.
-		<br>
-		[[Purchase conversion kits for rectal filter micropumps|Implant Manufactory][cashX(forceNeg(60000*_PCSkillCheck), "capEx"), $cervixImplants = 2]]
-		//Costs <<print cashFormat(60000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of the anal equivalent of the cervix micropumps using the autosurgery.//
-		<br>
+		<div>The manufactory is capable of crafting cervix filter micropumps for fillable abdominal implants.</div>
+		<div>
+			[[Purchase conversion kits for rectal filter micropumps|Implant Manufactory][cashX(forceNeg(60000*_PCSkillCheck), "capEx"), $cervixImplants = 2]]
+			<span class="detail">
+				Costs <<print cashFormat(60000*_PCSkillCheck)>>
+				<div class="indent">
+					Will allow the construction of the anal equivalent of the cervix micropumps using the autosurgery.
+				</div>
+			</span>
+		</div>
 	<<elseif ($cervixImplants > 1)>>
-		The manufactory is capable of crafting cervix and rectal filter micropumps for fillable abdominal implants.
-		<br>
+		<div>The manufactory is capable of crafting cervix and rectal filter micropumps for fillable abdominal implants.</div>
 	<</if>>
 <</if>>
 
 <<if $seePreg != 0>>
-	<br>
-	Fertility Implants
-	<hr>
+	<h2>Fertility Implants</h2>
 
 	<<if $fertilityImplant == 1>>
-		The manufactory is capable of crafting fertility enhancing implants for ovaries.
-		<br>
+		<div>The manufactory is capable of crafting fertility enhancing implants for ovaries.</div>
 	<<elseif $fertilityImplant == 0 && ($rep <= 3000*_PCSkillCheck)>>
-		//You lack the reputation to access fertility boosting ovarian implants//
-		<br>
+		<div class="note">
+			You lack the reputation to access fertility boosting ovarian implants.
+		</div>
 	<<else>>
-		[[Purchase schematics for fertility enhancing ovarian implants|Implant Manufactory][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $fertilityImplant = 1]]
-		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of implants that encourage multiple eggs being released during ovulation.//
-		<br>
+		<div>
+			[[Purchase schematics for fertility enhancing ovarian implants|Implant Manufactory][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $fertilityImplant = 1]]
+			<span class="detail">
+				Costs <<print cashFormat(10000*_PCSkillCheck)>>
+				<div class="indent">
+					Will allow the construction of implants that encourage multiple eggs being released during ovulation.
+				</div>
+			</span>
+		</div>
 	<</if>>
 
 	<<if $sympatheticOvaries == 1>>
-		The manufactory is capable of crafting implants that synchronize ovum release.
-		<br>
+		<div>The manufactory is capable of crafting implants that synchronize ovum release.</div>
 	<</if>>
 
 	<<if $seeHyperPreg == 1 && $seeExtreme == 1>>
 		<<if ($permaPregImplant == 0) && ($rep <= 4000*_PCSkillCheck)>>
-			//You lack the reputation to access experimental pregnancy generator schematics//
-			<br>
+			<div class="note">You lack the reputation to access experimental pregnancy generator schematics.</div>
 		<<elseif ($permaPregImplant == 0) && ($rep > 4000*_PCSkillCheck)>>
-			[[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $permaPregImplant = 1]]
-			//Costs <<print cashFormat(40000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of implants that force perpetual pregnancy.//
-			<br>
+			<div>
+				[[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][cashX(forceNeg(40000*_PCSkillCheck), "capEx"), $permaPregImplant = 1]]
+				<span class="detail">
+					Costs <<print cashFormat(40000*_PCSkillCheck)>>
+					<div class="indent">
+						Will allow the construction of implants that force perpetual pregnancy.
+					</div>
+				</span>
+			</div>
 		<<elseif ($permaPregImplant > 0)>>
-			The manufactory is capable of crafting pregnancy generators.
-			<br>
+			<div>The manufactory is capable of crafting pregnancy generators.</div>
 		<</if>>
 		<<if $PGHack == 1>>
+			<div>
 			The tools required to hack the firmware of basic pregnancy generator implants have been produced by the manufactory for use in the remote surgery.
-			<br>
+			</div>
 		<</if>>
 	<</if>>
 <</if>>
 
-<br>
-Fluid Production Implants
-<hr>
+<h2>Fluid Production Implants</h2>
 
 <<if ($prostateImplants != 1) && ($rep <= 3000*_PCSkillCheck)>>
-	//You lack the reputation to access plans for prostate implants//
-	<br>
+	<div class="note">You lack the reputation to access plans for prostate implants.</div>
 <<elseif ($prostateImplants != 1) && ($rep > 3000*_PCSkillCheck)>>
-	[[Purchase plans for ejaculation enhancing prostate implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $prostateImplants = 1]]
-	//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the construction of a prostate implant designed to stimulate fluid production for massive ejaculations. Beware of leaking and dehydration.//
-	<br>
+	<div>
+		[[Purchase plans for ejaculation enhancing prostate implants|Implant Manufactory][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $prostateImplants = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(30000*_PCSkillCheck)>>
+			<div class="indent">
+				Will allow the construction of a prostate implant designed to stimulate fluid production for massive ejaculations. Beware of leaking and dehydration.
+			</div>
+		</span>
+	</div>
 <<elseif ($prostateImplants > 0)>>
-	The manufactory is capable of producing ejaculation enhancing prostate implants.
-	<br>
+	<div>The manufactory is capable of producing ejaculation enhancing prostate implants.</div>
 <</if>>
diff --git a/src/pregmod/widgets/economyWidgets.tw b/src/pregmod/widgets/economyWidgets.tw
index e46b75cca9f245de2ccb2aa45edb0b21c90d66fb..1ab7655c9882a5c1325cb20cbacc7930a17fec35 100644
--- a/src/pregmod/widgets/economyWidgets.tw
+++ b/src/pregmod/widgets/economyWidgets.tw
@@ -175,7 +175,7 @@
 		<<if (_b.adsIncome > 0)>>
 		<tr>
 			<td>Additional rep gain</td>
-			<td style="padding-right: 2px; text-align: right">@@.yellowgreen;¤<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
+			<td style="padding-right: 2px; text-align: right">@@.green;+<<= _b.adsIncome.toFixedHTML(2)>>@@</td>
 			<td></td>
 			<td></td>
 			<td></td>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index e570366f8ed54a12aa20a47c980d4bfb8bbc5a7e..ac8ef253f194f4fbd883eb66443d8d32fd598681 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -2,476 +2,529 @@
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $showEncyclopedia = 1, $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
-<br>
-The Dispensary
-<hr>
+<h1>The Dispensary</h1>
+
+<div class="scene-intro">
 <<if $dispensaryUpgrade == 0>>
-	//The pharmaceutical fabricator is running smoothly. It can cheaply replicate complex medications, and has already cut the cost of drugs for your slaves by a fourth. It can easily produce advanced drugs should you obtain the data necessary to create them.//
-	<br>
+	The pharmaceutical fabricator is running smoothly. It can cheaply replicate complex medications, and has already cut the cost of drugs for your slaves by a fourth. It can easily produce advanced drugs should you obtain the data necessary to create them.
 <<else>>
-	//The pharmaceutical fabricator is running smoothly. It can cheaply and quickly replicate complex medications, and has already cut the cost of drugs for your slaves in half. It can easily produce advanced drugs should you obtain the data necessary to create them.//
-	<br>
+	The pharmaceutical fabricator is running smoothly. It can cheaply and quickly replicate complex medications, and has already cut the cost of drugs for your slaves in half. It can easily produce advanced drugs should you obtain the data necessary to create them.
 <</if>>
+</div>
 
 <<if ($dispensaryUpgrade == 0)>>
 	<<if ($rep > 5000)>>
-		[[Upgrade the pharmaceutical fabricator|Dispensary][cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx"), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
-		//Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will improve production efficiency further decreasing costs.//
-		<br>
+		<div>
+			[[Upgrade the pharmaceutical fabricator|Dispensary][cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "capEx"), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]]
+			<span class="detail">
+				Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>.
+				<div class="indent">
+					Will improve production efficiency further decreasing costs.
+				</div>
+			</span>
+		</div>
 	<<else>>
-		//You lack the reputation to obtain cutting-edge pharmaceutical fabricator upgrades//
-		<br>
+		<div class="note">You lack the reputation to obtain cutting-edge pharmaceutical fabricator upgrades.</div>
 	<</if>>
 <</if>>
 
-<br>
-Hormones Upgrades
-<hr>
+<h2>Hormones Upgrades</h2>
+
+<div>
 The fabricator is producing
 <<if $injectionUpgrade == 0>>
 	standard growth hormones.
 	<<if $rep > 6000>>
 		[[Purchase data on prototype growth hormone tests|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $injectionUpgrade = 1]]
-		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
-		<br>
+		<span class="detail">Costs <<print cashFormat(25000*_PCSkillCheck)>>.
+			<div class="indent">
+				Should improve the reliability of growth injections of all kinds.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain prototype medicines//
-		<br>
+		<span class="note">You lack the reputation to obtain prototype medicines.</span>
 	<</if>>
 <<elseif $injectionUpgrade == 1>>
 	prototype growth hormones.
 	<<if $rep > 10000>>
 		[[Upgrade the fabricator to customize each slave's growth hormones|Dispensary][cashX(forceNeg(50000*_PCSkillCheck), "capEx"), $injectionUpgrade = 2]]
-		//Costs <<print cashFormat(50000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(50000*_PCSkillCheck)>>.
+			<div class="indent">
+				Should improve the reliability of growth injections of all kinds.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain prototype fabricator upgrades//
-		<br>
+		<span class="note">You lack the reputation to obtain prototype fabricator upgrades.</span>
 	<</if>>
 <<elseif $injectionUpgrade == 2>>
-	prototype growth hormones.
+	customized growth hormones.
 	<<if $rep > 14000>>
 		[[Upgrade the fabricator with prototype biomechanical microfactories|Dispensary][cashX(forceNeg(100000*_PCSkillCheck), "capEx"), $injectionUpgrade = 3]]
-		//Costs <<print cashFormat(100000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the reliability of growth injections of all kinds.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(100000*_PCSkillCheck)>>.
+			<div class="indent">
+				Should improve the reliability of growth injections of all kinds.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain prototype biomechanical microfactories//
-		<br>
+		<span class="note">You lack the reputation to obtain prototype biomechanical microfactories.</span>
 	<</if>>
 <<else>>
 	the world's most effective growth hormones.
-	<br>
 <</if>>
+</div>
 
+<div>
 The fabricator is producing
 <<if $hormoneUpgradeMood == 0>>
 	standardized hormone replacement therapies.
 	<<if $rep > 2000>>
 		[[Upgrade for individualized therapy|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $hormoneUpgradeMood = 1]]
-		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should eliminate the occasional moodiness and sexual disinterest caused by generalized therapy.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+			<div class="indent">
+				Should eliminate the occasional moodiness and sexual disinterest caused by generalized therapy.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain advanced drug manufacturing components//
-		<br>
+		<span class="note">You lack the reputation to obtain advanced drug manufacturing components.</span>
 	<</if>>
 <<else>>
 	individualized hormone replacement therapies.
-	<br>
 <</if>>
+</div>
 
+<div>
 The hormone replacement therapies
 <<if $hormoneUpgradePower == 0>>
 	are traditional: they're formulated to mimic natural hormones.
 	<<if $rep > 4000>>
 		[[Purchase data on advanced HRT|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $hormoneUpgradePower = 1]]
-		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should increase the power of hormone therapies.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(25000*_PCSkillCheck)>>.
+			<div class="indent">
+				Should increase the power of hormone therapies.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain prototype medicines//
-		<br>
+		<span class="note">You lack the reputation to obtain prototype medicines.</span>
 	<</if>>
 <<else>>
 	are advanced: they're formulated to improve on natural hormones.
-	<br>
 <</if>>
+</div>
 
+<div>
 The hormone replacement therapies
 <<if $hormoneUpgradeShrinkage == 0>>
 	are broad-spectrum.
 	<<if $rep > 4000>>
 		[[Purchase data on targeted HRT|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $hormoneUpgradeShrinkage = 1]]
-		//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should reduce atrophy of organs corresponding to original sex.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(25000*_PCSkillCheck)>>.
+			<div class="detail">
+				Should reduce atrophy of organs corresponding to original sex.
+			</div>
+		</span>
 	<<else>>
-		//You lack the reputation to obtain prototype medicines//
-		<br>
+		<span class="note">You lack the reputation to obtain prototype medicines.</span>
 	<</if>>
 <<else>>
 	are targeted, reducing atrophy of organs corresponding to original sex.
-	<br>
 <</if>>
+</div>
 
 <<if $precociousPuberty == 1>>
 	<<if ($pubertyHormones == 0) && ($rep <= 4500*_PCSkillCheck)>>
-		//You lack the reputation to fund forced puberty drugs//
-		<br>
+		<div class="note">
+			You lack the reputation to fund forced puberty drugs
+		</div>
 	<<elseif ($pubertyHormones == 0) && ($rep > 4500*_PCSkillCheck)>>
-		[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $pubertyHormones = 1]]
-		//Costs <<print cashFormat(30000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the production of powerful hormonal drugs designed to force a slave through puberty without regard for side effects. //
-		<br>
+		<div>
+			[[Fund research into powerful hormonal injections to jumpstart puberty|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"), $pubertyHormones = 1]]
+			<span class="detail">
+				Costs <<print cashFormat(30000*_PCSkillCheck)>>.
+				<div class="indent">
+					Will allow the production of powerful hormonal drugs designed to force a slave through puberty without regard for side effects.
+				</div>
+			</span>
+		</div>
 	<<elseif ($pubertyHormones == 1)>>
-		The fabricator is producing extra strong hormonal drugs designed to force a slave through puberty.
-		<br>
+		<div>The fabricator is producing extra strong hormonal drugs designed to force a slave through puberty.</div>
 	<</if>>
 <</if>>
 
-<br>
-Dietary Upgrades
-<hr>
+<h2>Dietary Upgrades</h2>
+
+<div>
 <<if $feeder == 1>>
 	<<if ($dietXXY == 0) && ($rep <= 3500*_PCSkillCheck)>>
-		//You lack the reputation to fund research into hermaphrodite hormones//
-		<br>
+		<span class="note">You lack the reputation to fund research into hermaphrodite hormones.</span>
 	<<elseif ($dietXXY == 0) && ($rep > 3500*_PCSkillCheck)>>
 		[[Fund research into developing hermaphrodite hormone therapies|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $dietXXY = 1]]
-		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality. //
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+			<div class="indent">Will allow for specially balanced meals to be served in the cafeteria designed to promote both halves of a herm's sexuality.</div>
+		</span>
 	<<elseif ($dietXXY == 1)>>
 		The fabricator is producing meals to be served in the cafeteria designed to promote both halves of a herm's sexuality.
-		<br>
 	<</if>>
 <<else>>
 	The feeders are incapable of modifying slave diets well enough to adjust hormones for hermaphrodite meals.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if $seePreg == 1>>
 	<<if $feeder == 1>>
 		<<if ($reproductionFormula == 0) && ($rep <= 10000*_PCSkillCheck)>>
-			//You lack the reputation to access breeders' dietary blends//
-			<br>
+			<span class="note">You lack the reputation to access breeders' dietary blends.</span>
 		<<elseif ($reproductionFormula == 0) && ($rep > 10000*_PCSkillCheck)>>
 			[[Purchase reputable breeders' dietary blends|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $reproductionFormula = 1]]
-			//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially refined meals to be served in the cafeteria designed to promote energetic sperm and robust pregnancies. Side effects may include an increased number of twins being conceived.//
-			<br>
+			<span class="detail">
+				Costs <<print cashFormat(25000*_PCSkillCheck)>>.
+				<div class="indent">
+					Will allow for specially refined meals to be served in the cafeteria designed to promote energetic sperm and robust pregnancies. Side effects may include an increased number of twins being conceived.
+				</div>
+			</span>
 		<<elseif ($reproductionFormula == 1)>>
 			The fabricator is producing meals to be served in the cafeteria that promote energetic sperm and robust pregnancies.
-			<br>
 		<</if>>
 	<<else>>
 		The feeders are incapable of modifying slave diets well enough to manage to enhance reproductive ability.
-		<br>
 	<</if>>
 <</if>>
+</div>
 
+<div>
 <<if $cumProDiet == 0>>
 	[[Purchase recipes to encourage cum production|Dispensary][cashX(forceNeg(5000*_PCSkillCheck), "capEx"), $cumProDiet = 1]]
-	//Costs <<print cashFormat(5000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to promote cum production.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(5000*_PCSkillCheck)>>.
+		<div class="indent">
+			Will allow for specially designed meals to be served in the cafeteria to promote cum production.
+		</div>
+	</span>
 <<elseif $cumProDiet == 1>>
 	The fabricator is producing meals to be served in the cafeteria designed to promote cum production.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if $seePreg == 1>>
 	<<if $dietFertility != 1>>
 		[[Purchase recipes to encourage ovulation|Dispensary][cashX(forceNeg(5000*_PCSkillCheck), "capEx"), $dietFertility = 1]]
-		//Costs <<print cashFormat(5000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(5000*_PCSkillCheck)>>.
+			<div class="indent">
+				Will allow for specially designed meals to be served in the cafeteria to promote slave fertility.
+			</div>
+		</span>
 	<<elseif $dietFertility == 1>>
 		The fabricator is producing meals to be served in the cafeteria designed to promote slave fertility.
-		<br>
 	<</if>>
 <</if>>
+</div>
 
+<div>
 <<if $dietCleanse == 0>>
 	[[Purchase cleansing recipes to lessen carcinogen buildup|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $dietCleanse = 1]]
-	//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow for specially designed meals to be served in the cafeteria to counteract excessive drug use.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+		<div class="indent">
+			Will allow for specially designed meals to be served in the cafeteria to counteract excessive drug use.
+		</div>
+	</span>
 <<elseif $dietCleanse == 1>>
 	The fabricator is producing meals to be served in the cafeteria designed to counteract excessive drug use and good health. They smell awful and taste worse than they look, but they're healthy.
-	<br>
 <</if>>
+</div>
 
-<br>
-Pharmacological Upgrades
-<hr>
+<h2>Pharmacological Upgrades</h2>
+
+<div>
 <<if ($curativeUpgrade == 0) && ($rep > 6000*_PCSkillCheck)>>
 	[[Purchase data on advanced curatives|Dispensary][cashX(forceNeg(25000*_PCSkillCheck), "capEx"), $curativeUpgrade = 1]]
-	//Costs <<print cashFormat(25000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the effectiveness of curative treatment.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(25000*_PCSkillCheck)>>.
+		<div class="indent">Should improve the effectiveness of curative treatment.</div>
+	</span>
 <<elseif ($curativeUpgrade == 1)>>
 	The fabricator is producing highly effective curative cocktails.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if ($growthStim == 0) && ($rep > 6000*_PCSkillCheck)>>
 	[[Purchase data on growth stimulants|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $growthStim = 1]]
-	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the manufacturing of drugs to encourage growth in slave height.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(20000*_PCSkillCheck)>>.
+		<div class="indent">Will allow the manufacturing of drugs to encourage growth in slave height.</div>
+	</span>
 <<elseif ($growthStim == 1)>>
 	The fabricator is able to produce growth stimulants.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if ($aphrodisiacUpgradeRefine == 0) && ($rep > 6000*_PCSkillCheck)>>
 	[[Purchase data on refined aphrodisiacs|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $aphrodisiacUpgradeRefine = 1]]
-	//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent most physical side effects of aphrodisiacs. Once the formulas are changed they cannot be changed back.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(20000*_PCSkillCheck)>>.
+		<div class="indent">
+			Will prevent most physical side effects of aphrodisiacs. Once the formulas are changed they cannot be changed back.
+		</div>
+	</span>
 <<elseif ($aphrodisiacUpgradeRefine == 1)>>
 	The fabricator is producing refined aphrodisiacs with limited hormonal effects.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if ($aphrodisiacUpgrade == 0) && ($rep > 6000*_PCSkillCheck)>>
 	[[Purchase data on aphrodisiac withdrawal treatment|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"), $aphrodisiacUpgrade = 1]]
-	//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should prevent most negative effects of withdrawal.//
-	<br>
+	<span class="detail">
+		Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+		<div class="indent">Should prevent most negative effects of withdrawal.</div>
+	</span>
 <<elseif ($aphrodisiacUpgrade == 1)>>
 	The fabricator is producing a substitute that will protect slaves from aphrodisiac withdrawal.
-	<br>
 <</if>>
+</div>
 
+<div>
 <<if ($healthyDrugsUpgrade == 0)>>
 	<<if ($injectionUpgrade != 0) && ($curativeUpgrade == 1) && ($aphrodisiacUpgrade == 1)>>
 		<<if ($rep >= 15000*_PCSkillCheck)>>
 			[[Fund research into drug formulations without negative physical side effects|Dispensary][cashX(forceNeg(500000*_PCSkillCheck), "capEx"),$healthyDrugsUpgrade = 1]]
-			//Costs <<print cashFormat(500000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will prevent the negative side effects of excessive drug usage on your slaves.//
-			<br>
+			<span class="detail">
+				Costs <<print cashFormat(500000*_PCSkillCheck)>>.
+				<div class="indent">
+					Will prevent the negative side effects of excessive drug usage on your slaves.
+				</div>
+			</span>
 		<<else>>
-			// You lack the reputation to access the technology necessary to develop advanced drug formulations. //
-			<br>
+			<span class="note">
+				You lack the reputation to access the technology necessary to develop advanced drug formulations.
+			</span>
 		<</if>>
 	<<else>>
-		// You must purchase all other major upgrades before developing advanced drug formulations. //
-		<br>
+		<span class="note">
+			You must purchase all other major upgrades before developing advanced drug formulations.
+		</span>
 	<</if>>
 <<else>>
 	The fabricator has been upgraded to optimize the structures of your other drugs, eliminating their negative side effects.
-	<br>
 <</if>>
-/* Code [draft] contributed by Anon1888 */
+</div>
 
 <<if ($arcologies[0].FSBodyPuristLaw == 1)>>
-	//The pharmaceutical fabricator is working with your body purist arcology to reduce long term drug side effects.//
-	<br>
+	<div class="note">
+		The pharmaceutical fabricator is working with your body purist arcology to reduce long term drug side effects.
+	</div>
 <</if>>
 
 <<if $seePreg != 0>>
-	<br>
-	Fertility Focused Pharmacology
-	<hr>
+	<h2>Fertility Focused Pharmacology</h2>
+	
+	<div>
 	<<if $seeHyperPreg == 1>>
 		<<if $superFertilityDrugs == 1 && ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
 			[[Fund research pregnancy speed control methods|Dispensary][cashX(forceNeg(200000*_PCSkillCheck), "capEx"), $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
-			//Costs <<print cashFormat(200000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
-			<br>
+			<span class="detail">
+				Costs <<print cashFormat(200000*_PCSkillCheck)>>.
+				<div class="indent">
+					Fund underground research labs to develop methods for controlling pregnancy progress.
+				</div>
+			</span>
 		<<elseif ($rep <= 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
-			//You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.//
-			<br>
+			<span class="note">
+				You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.
+			</span>
 		<<elseif ($pregSpeedControl == 1)>>
-			The fabricator is producing extremely complex gestation control agents. They can be used to control gestation speed, and even suppress labor for some time. //
-			<br>
+			The fabricator is producing extremely complex gestation control agents. They can be used to control gestation speed, and even suppress labor for some time.
 		<</if>>
 	<<elseif $birthsTotal > 10>>
 		<<if ($rep > 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
 			[[Fund research pregnancy speed control methods|Dispensary][cashX(forceNeg(200000*_PCSkillCheck), "capEx"), $pregSpeedControl = 1, $clinicSpeedGestation = 0]]
-			//Costs <<print cashFormat(200000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;// Fund underground research labs to develop methods for controlling pregnancy progress. //
-			<br>
+			<span class="detail">
+				Costs <<print cashFormat(200000*_PCSkillCheck)>>.
+				<div class="indent">Fund underground research labs to develop methods for controlling pregnancy progress.</div>
+			</span>
 		<<elseif ($rep <= 10000*_PCSkillCheck) && $pregSpeedControl != 1>>
-			//You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.//
-			<br>
+			<span class="detail">You lack the reputation required to contact underground research labs to develop methods for controlling pregnancy progress.</span>
 		<<elseif ($pregSpeedControl == 1)>>
-			The fabricator is producing extremely complex gestation control agents. They can be used to control gestation speed, and even suppress labor for some time. //
-			<br>
+			The fabricator is producing extremely complex gestation control agents. They can be used to control gestation speed, and even suppress labor for some time.
 		<</if>>
 	<<else>>
-		//You lack the experience handling pregnant slaves required to convince underground research labs to do business with you in the development of controlled fetal development.//
-		<br>
+		<span class="note">
+			You lack the experience handling pregnant slaves required to convince underground research labs to do business with you in the development of controlled fetal development.
+		</span>
 	<</if>>
+	</div>
 
+	<div>
 	<<if ($superFertilityDrugs == 0) && ($rep > 2500*_PCSkillCheck) && $seeHyperPreg == 1>>
 		[[Purchase data on powerful fertility drugs|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $superFertilityDrugs = 1]]
-		//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Should improve the likelihood of conception and multiples. //
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(20000*_PCSkillCheck)>>.
+			<div class="indent">Should improve the likelihood of conception and multiples.</div>
+		</span>
 	<<elseif ($superFertilityDrugs == 1)>>
 		The fabricator is producing highly effective fertility agents. There is a warning present involving overdosing and instances of ten or more children.
-		<br>
 	<</if>>
+	</div>
 <</if>>
 
-<br>
-Future Societies Research
-<hr>
+<h2>Future Societies Research</h2>
 
+<div>
 <<if ($ImplantProductionUpgrade == 1) && ($arcologies[0].FSTransformationFetishistDecoration >= 100)>>
 	<<if ($arcologies[0].FSTransformationFetishistResearch == 0) && ($rep <= 5000*_PCSkillCheck)>>
-		//You lack the reputation to access experimental gigantic implants and elasticizing filler.//
-		<br>
+		<span class="note">You lack the reputation to access experimental gigantic implants and elasticizing filler.</span>
 	<<elseif ($arcologies[0].FSTransformationFetishistResearch == 0)>>
 		[[Purchase data on gigantic implants and elasticizing filler|Dispensary][cashX(forceNeg(20000*_PCSkillCheck), "capEx"), $arcologies[0].FSTransformationFetishistResearch = 1]]
-		//Costs <<print cashFormat(20000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//Will allow the fabrication of gigantic implants using the autosurgery and filler capable of overfilling existing fillable implants.//
-		<br>
+		<span class="detail">
+			Costs <<print cashFormat(20000*_PCSkillCheck)>>.
+			<div class="indent">Will allow the fabrication of gigantic implants using the autosurgery and filler capable of overfilling existing fillable implants.</div>
+		</span>
 	<<elseif ($arcologies[0].FSTransformationFetishistResearch > 0)>>
 		The fabricator is capable of crafting gigantic implants and elasticizing filler designed to overfill existing implants.
-		<br>
 	<</if>>
 <<elseif $arcologies[0].FSTransformationFetishistResearch == 1>>
 	The fabricator is capable of crafting gigantic implants and elasticizing filler designed to overfill existing implants.
-	<br>
 <<else>>
-	// Transformation Fetishist focused research unavailable. //
-	<br>
+	<span class="note">Transformation Fetishist focused research unavailable.</span>
 <</if>>
+</div>
 
-<<if $arcologies[0].FSAssetExpansionistDecoration == 100>>
-	<<if ($arcologies[0].FSAssetExpansionistResearch == 0)>>
-		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into drug formulations for growth without limit|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSAssetExpansionistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to push assets to unthinkable sizes.//
-			<br>
-		<<else>>
-			// You lack the reputation to access the research necessary to develop advanced growth drug formulations. //
-			<br>
-		<</if>>
+<div>
+<<if $arcologies[0].FSAssetExpansionistResearch == 1>>
+	The fabricator has been upgraded to manufacture extremely powerful growth drugs.
+<<elseif $arcologies[0].FSAssetExpansionistDecoration == 100>>
+	<<if ($rep >= 5000*_PCSkillCheck)>>
+		[[Fund research into drug formulations for growth without limit|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSAssetExpansionistResearch = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(30000*_PCSkillCheck)>>.
+			<div class="indent">
+				Will allow creation of drugs to push assets to unthinkable sizes.
+			</div>
+		</span>
 	<<else>>
-		The fabricator has been upgraded to manufacture extremely powerful growth drugs.
-		<br>
+		<span class="note">You lack the reputation to access the research necessary to develop advanced growth drug formulations.</span>
 	<</if>>
-<<elseif $arcologies[0].FSAssetExpansionistResearch == 1>>
-	The fabricator has been upgraded to manufacture extremely powerful growth drugs.
-	<br>
 <<else>>
-	// Asset Expansionist focused research unavailable. //
-	<br>
+	<span class="note">Asset Expansionist focused research unavailable.</span>
 <</if>>
+</div>
 
-<<if $arcologies[0].FSSlaveProfessionalismDecoration == 100>>
-	<<if ($arcologies[0].FSSlaveProfessionalismResearch == 0)>>
-		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into producing an intelligence boosting compound|Dispensary][cashX(forceNeg(60000*_PCSkillCheck), "capEx"),$arcologies[0].FSSlaveProfessionalismResearch = 1]] //Costs <<print cashFormat(60000*_PCSkillCheck)>>. Will allow the creation of a drug that improves mental faculties.//
-			<br>
-		<<else>>
-			// You lack the reputation to access the research necessary to produce an intelligence boosting compound. //
-			<br>
-		<</if>>
+<div>
+<<if $arcologies[0].FSSlaveProfessionalismResearch == 1>>
+	The fabricator has been upgraded to manufacture a compound that steadily improves intelligence.
+<<elseif $arcologies[0].FSSlaveProfessionalismDecoration == 100>>
+	<<if ($rep >= 5000*_PCSkillCheck)>>
+		[[Fund research into producing an intelligence boosting compound|Dispensary][cashX(forceNeg(60000*_PCSkillCheck), "capEx"),$arcologies[0].FSSlaveProfessionalismResearch = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(60000*_PCSkillCheck)>>.
+			<div class="indent">
+				Will allow the creation of a drug that improves mental faculties.
+			</div>
+		</span>
 	<<else>>
-		The fabricator has been upgraded to manufacture a compound that steadily improves intelligence.
-		<br>
+		<span class="note">You lack the reputation to access the research necessary to produce an intelligence boosting compound.</span>
 	<</if>>
-<<elseif $arcologies[0].FSSlaveProfessionalismResearch == 1>>
-	The fabricator has been upgraded to manufacture a compound that steadily improves intelligence.
-	<br>
 <<else>>
-	// Slave Professionalism focused research unavailable. //
-	<br>
+	<span class="note">Slave Professionalism focused research unavailable.</span>
 <</if>>
+</div>
 
-<<if $arcologies[0].FSSlimnessEnthusiastDecoration == 100>>
-	<<if ($arcologies[0].FSSlimnessEnthusiastResearch == 0)>>
-		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into drug formulations for slimming slaves|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSSlimnessEnthusiastResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of drugs to shrink assets.//
-			<br>
-		<<else>>
-			// You lack the reputation to access the research necessary to develop asset reducing drug formulations. //
-			<br>
-		<</if>>
+<div>
+<<if $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
+	The fabricator has been upgraded to manufacture growth reversing drugs.
+<<elseif $arcologies[0].FSSlimnessEnthusiastDecoration == 100>>
+	<<if ($rep >= 5000*_PCSkillCheck)>>
+		[[Fund research into drug formulations for slimming slaves|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSSlimnessEnthusiastResearch = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(30000*_PCSkillCheck)>>.
+			<div class="indent">Will allow creation of drugs to shrink assets.</div>
+		</span>
 	<<else>>
-		The fabricator has been upgraded to manufacture growth reversing drugs.
-		<br>
+		<span class="note">You lack the reputation to access the research necessary to develop asset reducing drug formulations.</span>
 	<</if>>
-<<elseif $arcologies[0].FSSlimnessEnthusiastResearch == 1>>
-	The fabricator has been upgraded to manufacture growth reversing drugs.
-	<br>
 <<else>>
-	// Slimness Enthusiast focused research unavailable. //
-	<br>
+	<span class="note">Slimness Enthusiast focused research unavailable.</span>
 <</if>>
+</div>
 
-<<if $arcologies[0].FSYouthPreferentialistDecoration == 100>>
-	<<if ($arcologies[0].FSYouthPreferentialistResearch == 0)>>
-		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Fund research into skin care designed to reverse the effects of aging|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSYouthPreferentialistResearch = 1]] //Costs <<print cashFormat(30000*_PCSkillCheck)>>. Will allow creation of beauty creams designed to make slaves look young again.//
-			<br>
-		<<else>>
-			// You lack the reputation to access the research necessary to develop beauty creams designed to make slaves look young again. //
-			<br>
-		<</if>>
+<div>
+<<if $arcologies[0].FSYouthPreferentialistResearch == 1>>
+	The fabricator has been upgraded to manufacture extremely effective beauty creams designed to combat aging.
+<<elseif $arcologies[0].FSYouthPreferentialistDecoration == 100>>
+	<<if ($rep >= 5000*_PCSkillCheck)>>
+		[[Fund research into skin care designed to reverse the effects of aging|Dispensary][cashX(forceNeg(30000*_PCSkillCheck), "capEx"),$arcologies[0].FSYouthPreferentialistResearch = 1]]
+		<span class="detail">
+			Costs <<print cashFormat(30000*_PCSkillCheck)>>.
+			<div class="indent">Will allow creation of beauty creams designed to make slaves look young again.</div>
+		</span>
 	<<else>>
-		The fabricator has been upgraded to manufacture extremely effective beauty creams designed to combat aging.
-		<br>
+		<span class="note">You lack the reputation to access the research necessary to develop beauty creams designed to make slaves look young again.</span>
 	<</if>>
-<<elseif $arcologies[0].FSYouthPreferentialistResearch == 1>>
-	The fabricator has been upgraded to manufacture extremely effective beauty creams designed to combat aging.
-	<br>
 <<else>>
-	// Youth Preferentialist focused research unavailable. //
-	<br>
+	<span class="note">Youth Preferentialist focused research unavailable.</span>
 <</if>>
+</div>
 
+<div>
 <<if $arcologies[0].FSHedonisticDecadenceDecoration == 100>>
 	<<if ($arcologies[0].FSHedonisticDecadenceResearch == 0)>>
 		<<if ($rep >= 5000*_PCSkillCheck)>>
-			[[Purchase recipes for concentrated, shaped slave food|Dispensary][cashX(forceNeg(50000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceResearch = 1]] //Costs <<print cashFormat(50000*_PCSkillCheck)>>. Will allow production of solid slave food in various familiar shapes and flavors. Addictive and a little fatty.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, a modified recipe formulated to cause severe stomach cramps minutes after ingestion will be developed.<</if>> //
-			<br>
+			[[Purchase recipes for concentrated, shaped slave food|Dispensary][cashX(forceNeg(50000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceResearch = 1]]
+			<span class="detail">
+				Costs <<print cashFormat(50000*_PCSkillCheck)>>.
+				<div class="indent">
+					Will allow production of solid slave food in various familiar shapes and flavors. Addictive and a little fatty. <<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, a modified recipe formulated to cause severe stomach cramps minutes after ingestion will be developed.<</if>>
+				</div>
+			</span>
 		<<else>>
-			// You lack the reputation to access the research necessary to purchase concentrated, shaped slave food recipes. //
-			<br>
+			<span class="note">You lack the reputation to access the research necessary to purchase concentrated, shaped slave food recipes.</span>
 		<</if>>
 	<<else>>
 		The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
 		<<if $arcologies[0].FSSlimnessEnthusiast > 50 && $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
-			//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
-			Will prevent rampant weight gain from ruining your slim slaves.
-			<br>
+			<div class="indent">
+				[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
+				<span class="detail">
+					Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+					<div class="double-indent">Will prevent rampant weight gain from ruining your slim slaves.</div>
+				</span>
+			</div>
 		<<elseif $arcologies[0].FSHedonisticDecadenceDietResearch == 1>>
 			A diet recipe is being utilized to prevent unwanted weight gain.
-			<br>
 		<</if>>
 	<</if>>
 <<elseif $arcologies[0].FSHedonisticDecadenceResearch == 1>>
 	The fabricator has been upgraded to manufacture tasty, extremely addictive, solid slave food in various familiar shapes and flavors. While they look and taste like real food, their consistency is all wrong. Slaves gorging on them are likely to experience steady weight gain.<<if $arcologies[0].FSDegradationist != "unset">> Since your slaves don't deserve luxuries, all food crafted will cause severe stomach cramps minutes after ingestion. Coupled with their addictive nature, it ought to be quite torturous.<</if>>
 	<<if $arcologies[0].FSHedonisticDecadenceDietResearch == 0>>
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;
-		[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
-		//Costs <<print cashFormat(10000*_PCSkillCheck)>>//
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		Will prevent rampant unwanted weight gain from ruining your <<if $arcologies[0].FSSlimnessEnthusiast > 20>>slim <</if>>slaves.
-		<br>
+		<div class="indent">
+			[[Purchase diet recipes|Dispensary][cashX(forceNeg(10000*_PCSkillCheck), "capEx"),$arcologies[0].FSHedonisticDecadenceDietResearch = 1]]
+			<span class="detail">
+				Costs <<print cashFormat(10000*_PCSkillCheck)>>.
+				<div class="double-indent">
+					Will prevent rampant unwanted weight gain from ruining your <<if $arcologies[0].FSSlimnessEnthusiast > 20>>slim <</if>>slaves.
+				</div>
+			</span>
+		</div>
 	<<elseif $arcologies[0].FSHedonisticDecadenceDietResearch == 1>>
 		A diet recipe is being utilized to prevent unwanted weight gain.
-		<br>
 	<</if>>
-	&nbsp;&nbsp;&nbsp;&nbsp;
-	<<link "Cancel solid slave food production" "Dispensary">><<set $arcologies[0].FSHedonisticDecadenceResearch = 0>><<set $merchantFSWares.push("HedonisticDecadenceResearch")>><</link>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	Will //completely// remove this research.
-	<br>
+	<div class="indent">
+		<<link "Cancel solid slave food production" "Dispensary">><<set $arcologies[0].FSHedonisticDecadenceResearch = 0>><<set $merchantFSWares.push("HedonisticDecadenceResearch")>><</link>>
+		<div class="double-indent">
+			Will <span class="noteworthy">completely</span> remove this research.
+		</div>
+	</div>
 <<else>>
-	// Hedonistic Decadence focused research unavailable. //
-	<br>
+	<span class="note">Hedonistic Decadence focused research unavailable.</span>
 <</if>>
+</div>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index e822ad7a689d15f6682416317447fd3a0a73c5bd..4cc59ee318b7f9748fb56b27fbc2a9b8bdcc16a1 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -699,10 +699,12 @@
 			<<if $secExpEnabled > 0>>
 				<span id="edictButton"> <br>
 					<<link [[Edicts|edicts]]>><</link>>
-				</span> @@.cyan;[D]@@
+				</span> @@.cyan;[E]@@
 			<</if>>
-			<<if $arcologies.length > 1>> <br>
-				[[Diplomacy|Neighbor Interact]]
+			<<if $arcologies.length > 1>>
+				<span id="diplomacyButton"> <br>
+					<<link [[Diplomacy|Neighbor Interact]]>><</link>>
+				</span> @@.cyan;[D]@@
 			<</if>>
 
 			<span id="Security">