diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 3f98f23dfa5263aa6f8a1a3ca8775a09845bb881..99e33316b8f8fabb12cd6c4c2a3f9202a25d5165 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -1009,7 +1009,7 @@ All the things you need to run your arcology are getting more expensive
 
 	<p>
 		You are a $PC.nationality $PC.race with <<if $PC.markings == "heavily freckled">>heavily freckled<<elseif $PC.markings == "freckles">>lightly freckled<<else>>clear<</if>> $PC.skin skin, $PC.hColor hair and <<print App.Desc.eyesColor($PC)>>. You have a $PC.faceShape face.
-	</P>
+	</p>
 
 	<p>
 		Your preferred refreshment is <<textbox2 "$PC.refreshment" $PC.refreshment "Intro Summary">> [[Cigars|Intro Summary][$PC.refreshment = "cigar",$PC.refreshmentType = 0]] | [[Whiskey|Intro Summary][$PC.refreshment = "whiskey",$PC.refreshmentType = 1]]
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 8267f5b840a728db5394f8534a851d4c8791f490..58ec96ef6247a4ddb8f7d5e79d5b4985793e803a 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -182,9 +182,11 @@
 	<div>
 		<<setLocalPronouns $Madam>>
 		<<if $MadamIgnoresFlaws != 1>>
-			$Madam.slaveName will attempt to fix flaws in whores serving under $him. [[Ignore flaws|Brothel][$MadamIgnoresFlaws = 1]]
+			$Madam.slaveName will attempt to fix flaws in whores serving under $him.
+			[[Ignore flaws|Brothel][$MadamIgnoresFlaws = 1]]
 		<<else>>
-			$Madam.slaveName has been instructed to ignore flaws in the whores serving under $him. [[Fix flaws|Brothel][$MadamIgnoresFlaws = 0]]
+			$Madam.slaveName has been instructed to ignore flaws in the whores serving under $him.
+			[[Fix flaws|Brothel][$MadamIgnoresFlaws = 0]]
 		<</if>>
 	</div>
 <</if>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 0c02a20107e39a5d657064fc68e87b34d175085f..31c41910bf739dc5771e7292caa59ba63fa37c45 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -2,259 +2,298 @@
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Club", $showEncyclopedia = 1, $encyclopedia = "Club", _CL = $ClubiIDs.length>>
 
-<<if $clubName != "the Club">>
-	<<set $clubNameCaps = $clubName.replace("the ", "The ")>>
-<</if>>
-$clubNameCaps
-<<switch $clubDecoration>>
-<<case "Roman Revivalist">>
-	is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
-<<case "Aztec Revivalist">>
-	is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
-<<case "Egyptian Revivalist">>
-	is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
-<<case "Edo Revivalist">>
-	is furnished as an Edo period theater. Performances of the traditional Japanese arts can be seen here, though more modern dancing happens in the evenings. In either case, geisha girls are present and willing.
-<<case "Arabian Revivalist">>
-	is designed like an open plaza in an Arabian palace, with a raised stage in the center for erotic dancing. Diaphanous, flowing curtains billow across the space, dispersing the narcotic smoke billowing from a score of hookahs.
-<<case "Chinese Revivalist">>
-	is furnished as an old Chinese disorderly house. It's intentionally packed in so that closeness and good cheer is obligatory here; prominent citizens share tables while their hangers-on jostle for room.
-<<case "Chattel Religionist">>
-	isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
-<<case "Degradationist">>
-	has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
-<<case "Repopulation Focus">>
-	has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
-<<case "Eugenics">>
-	has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
-<<case "Asset Expansionist">>
-	has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.
-<<case "Transformation Fetishist">>
-	has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.
-<<case "Gender Radicalist">>
-	has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.
-<<case "Gender Fundamentalist">>
-	has an old world appearance, a decidedly throwback atmosphere harking back to the glory days of cultures past.
-<<case "Physical Idealist">>
-	isn't a gym, but it smells like one. The dancing is rough and competitive, and the drinks are rich with protein.
-<<case "Supremacist">>
-	is decorated like an upper-class gentleman's club in the old countries of $arcologies[0].FSSupremacistRace people.
-<<case "Subjugationist">>
-	is decorated like an upper-class gentleman's club in the old countries which favored $arcologies[0].FSSubjugationistRace slaves.
-<<case "Paternalist">>
-	is handsome and well-kept, even romantic. Though the slaves here are sex slaves, every provision is made to encourage them to enjoy themselves.
-<<case "Pastoralist">>
-	is decorated to resemble a frontier disorderly house. The drinks are pounded straight, and there's a set of swinging doors for bad men to part dramatically as they enter.
-<<case "Maturity Preferentialist">>
-	is surprisingly elegant. The music consists of refined remixes of traditional dance music, offering slaves and citizens the chance to dance beautifully together.
-<<case "Youth Preferentialist">>
-	is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
-<<case "Body Purist">>
-	is gorgeous, decorated and kept in the height of fashionable night establishment style. The music is cutting edge and everything and everyone is elegant.
-<<case "Slimness Enthusiast">>
-	is distinctly gaudy, with lots of sugary drinks on offer. The music and décor are of a decidedly bubblegum quality.
-<<case "Hedonistic">>
-	has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
-<<case "Intellectual Dependency">>
-	is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
-<<case "Slave Professionalism">>
-	is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
-<<case "Petite Admiration">>
-	has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
-<<case "Statuesque Glorification">>
-	has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
-<<default>>
-	is set up in an uncomplicated way. There's a bar for drinks, a dance floor for slave girls, and private rooms for slave sex.
-<</switch>>
-
-<<if $clubAdsSpending > 0>>
-	Screens outside the entrance are showing softcore music videos to advertise $clubNameCaps.
-	<<if $clubAdsOld == 1>>
-		The featured strippers are all MILFs.
-	<<elseif $clubAdsOld == -1>>
-		The featured strippers are all nice and young.
-	<<elseif $clubAdsOld == -2>>
-		The featured strippers are all teenagers.
-	<<elseif $clubAdsOld == -3>>
-		The featured strippers are all lolis.
-	<<else>>
-		The featured strippers vary in age.
+<p class="scene-intro">
+	<<if $clubName != "the Club">>
+		<<set $clubNameCaps = $clubName.replace("the ", "The ")>>
 	<</if>>
-	<<if $clubAdsStacked == 1>>
-		Lots of bouncing breasts and butts
-	<<elseif $clubAdsStacked == -1>>
-		Lots of trim breasts and shapely butts
-	<<else>>
-		A variety of breast and butt sizes and shapes
-	<</if>>
-	are on display, and
-	<<if $clubAdsImplanted == 1>>
-		most of these are augmented by implants.
-	<<elseif $clubAdsImplanted == -1>>
-		they're all natural.
-	<<else>>
-		some are augmented by implants.
-	<</if>>
-	<<if $seePreg == 1>>
-		<<if $clubAdsPreg == 1>>
-			Most of strippers have firm, rounded bellies.
-		<<elseif $clubAdsPreg == -1>>
-			Most of the strippers have firm, flat bellies.
+	$clubNameCaps
+	<<switch $clubDecoration>>
+		<<case "Roman Revivalist">>
+			is decorated like a Roman villa's entertainment rooms. There is a lot of white stone, plaster, and terracotta.
+		<<case "Aztec Revivalist">>
+			is decorated with obsidian figures inserted in the lime walls and giant oak pillars that give a homey feeling to the otherwise cold building.
+		<<case "Egyptian Revivalist">>
+			is decorated like a room in an ancient Egyptian palace. There are columns of warm stone and pools of clear water full of aquatic plants.
+		<<case "Edo Revivalist">>
+			is furnished as an Edo period theater. Performances of the traditional Japanese arts can be seen here, though more modern dancing happens in the evenings. In either case, geisha girls are present and willing.
+		<<case "Arabian Revivalist">>
+			is designed like an open plaza in an Arabian palace, with a raised stage in the center for erotic dancing. Diaphanous, flowing curtains billow across the space, dispersing the narcotic smoke billowing from a score of hookahs.
+		<<case "Chinese Revivalist">>
+			is furnished as an old Chinese disorderly house. It's intentionally packed in so that closeness and good cheer is obligatory here; prominent citizens share tables while their hangers-on jostle for room.
+		<<case "Chattel Religionist">>
+			isn't a religious establishment, but it almost looks like one. It's clean and proper, with beams of natural light that come down to highlight holy sex slaves' bodies.
+		<<case "Degradationist">>
+			has a perverted, debauched appearance. The décor is utilitarian so it can be cleaned easily, and the reason is obvious. Many patrons have brought their own slaves to publicly rape here.
+		<<case "Repopulation Focus">>
+			has a gaudy appearance. There are lots of deep soft chairs for pregnant patrons and slaves to rest in and screens showing girls with large bellies lining the walls.
+		<<case "Eugenics">>
+			has a gaudy appearance. There are screens lining the walls discouraging unprotected slave sex. The real action happens in the several exclusive rooms reserved for society's best.
+		<<case "Asset Expansionist">>
+			has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off big tits and plush asses.
+		<<case "Transformation Fetishist">>
+			has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing off huge fake tits and plastic dick sucking lips.
+		<<case "Gender Radicalist">>
+			has a gaudy appearance. There are a lot of neon lights and there are screens everywhere, showing closeups of cocks fucking every imaginable orifice.
+		<<case "Gender Fundamentalist">>
+			has an old world appearance, a decidedly throwback atmosphere harking back to the glory days of cultures past.
+		<<case "Physical Idealist">>
+			isn't a gym, but it smells like one. The dancing is rough and competitive, and the drinks are rich with protein.
+		<<case "Supremacist">>
+			is decorated like an upper-class gentleman's club in the old countries of $arcologies[0].FSSupremacistRace people.
+		<<case "Subjugationist">>
+			is decorated like an upper-class gentleman's club in the old countries which favored $arcologies[0].FSSubjugationistRace slaves.
+		<<case "Paternalist">>
+			is handsome and well-kept, even romantic. Though the slaves here are sex slaves, every provision is made to encourage them to enjoy themselves.
+		<<case "Pastoralist">>
+			is decorated to resemble a frontier disorderly house. The drinks are pounded straight, and there's a set of swinging doors for bad men to part dramatically as they enter.
+		<<case "Maturity Preferentialist">>
+			is surprisingly elegant. The music consists of refined remixes of traditional dance music, offering slaves and citizens the chance to dance beautifully together.
+		<<case "Youth Preferentialist">>
+			is deafeningly loud. There's a bright light show running, offering staccato glimpses of the scene out on the dance floor.
+		<<case "Body Purist">>
+			is gorgeous, decorated and kept in the height of fashionable night establishment style. The music is cutting edge and everything and everyone is elegant.
+		<<case "Slimness Enthusiast">>
+			is distinctly gaudy, with lots of sugary drinks on offer. The music and décor are of a decidedly bubblegum quality.
+		<<case "Hedonistic">>
+			has a gaudy appearance. The dance floor is extra large to accommodate its extra wide dancers, though bodies grinding against each other is an inevitability. Plenty of roomy, comfortable booths encircle the room for an exhausted citizen to relax with his plush dance partner, and a wide selection of greasy food accompanies the drinks. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food are complementary for feeding slaves<<else>>Feeders are available in the booths to feed tired slaves<</if>> while they get fondled.
+		<<case "Intellectual Dependency">>
+			is distinctly gaudy and easy for slaves to move around in. The dancing is as energetic and sexual, and the drinks sugary and sweet.
+		<<case "Slave Professionalism">>
+			is decorated like an upper-class gentleman's club. It is where a true courtesan works their craft.
+		<<case "Petite Admiration">>
+			has a gaudy appearance. The dance floor is surrounded by raised platforms so even the shortest slave can be seen by the crowd.
+		<<case "Statuesque Glorification">>
+			has a tiered appearance. The booths and bar are positioned overlooking the dance floor so patrons may loom over the dancing slaves even when seated.
+		<<default>>
+			is set up in an uncomplicated way. There's a bar for drinks, a dance floor for slave girls, and private rooms for slave sex.
+	<</switch>>
+
+	<<if $clubAdsSpending > 0>>
+		Screens outside the entrance are showing softcore music videos to advertise $clubNameCaps.
+		<<if $clubAdsOld == 1>>
+			The featured strippers are all MILFs.
+		<<elseif $clubAdsOld == -1>>
+			The featured strippers are all nice and young.
+		<<elseif $clubAdsOld == -2>>
+			The featured strippers are all teenagers.
+		<<elseif $clubAdsOld == -3>>
+			The featured strippers are all lolis.
 		<<else>>
-			Some of the strippers are pregnant.
+			The featured strippers vary in age.
+		<</if>>
+		<<if $clubAdsStacked == 1>>
+			Lots of bouncing breasts and butts
+		<<elseif $clubAdsStacked == -1>>
+			Lots of trim breasts and shapely butts
+		<<else>>
+			A variety of breast and butt sizes and shapes
+		<</if>>
+		are on display, and
+		<<if $clubAdsImplanted == 1>>
+			most of these are augmented by implants.
+		<<elseif $clubAdsImplanted == -1>>
+			they're all natural.
+		<<else>>
+			some are augmented by implants.
+		<</if>>
+		<<if $seePreg == 1>>
+			<<if $clubAdsPreg == 1>>
+				Most of strippers have firm, rounded bellies.
+			<<elseif $clubAdsPreg == -1>>
+				Most of the strippers have firm, flat bellies.
+			<<else>>
+				Some of the strippers are pregnant.
+			<</if>>
+		<</if>>
+		<<if $clubAdsModded == 1>>
+			Everything is heavily pierced and tattooed.
+		<<elseif $clubAdsModded == -1>>
+			Everything is free of tattoos and piercings.
+		<<else>>
+			Some of these assets are tattooed and pierced, and some aren't.
+		<</if>>
+		The strippers get naked quickly, and show off
+		<<if $clubAdsXX == 1>>
+			their pussies and assholes.
+		<<elseif $clubAdsXX == -1>>
+			their assholes.
+		<<else>>
+			their holes.
+		<</if>>
+		The ads are shown across the arcology.
+		<<if ($clubAdsXX == 1) && ($clubAdsImplanted == 1) && ($clubAdsStacked == 1)>>
+			As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> bimbos.
+		<<elseif ($clubAdsXX == 1) && ($clubAdsOld == 1)>>
+			As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> MILFs.
+		<<elseif ($clubAdsXX == 1) && ($clubAdsOld == -3)>>
+			As a result, $clubName is known as the place to spend a night partying with<<if $clubAdsPreg == 1>> pregnant<</if>><<if $clubAdsStacked == 1>> oppai<</if>> lolis.
+		<<elseif ($clubAdsXX == 1) && ($clubAdsPreg == 1)>>
+			As a result, $clubName is known as the place to spend a night partying with pregnant sluts.
+		<<elseif ($clubAdsXX == -1) && ($clubAdsStacked == 1)>>
+			As a result, $clubName is known as the place to spend a night partying with shemales.
+		<<elseif ($clubAdsXX == -1) && ($clubAdsStacked == -1)>>
+			As a result, $clubName is known as the place to spend a night partying with traps.
 		<</if>>
 	<</if>>
-	<<if $clubAdsModded == 1>>
-		Everything is heavily pierced and tattooed.
-	<<elseif $clubAdsModded == -1>>
-		Everything is free of tattoos and piercings.
-	<<else>>
-		Some of these assets are tattooed and pierced, and some aren't.
-	<</if>>
-	The strippers get naked quickly, and show off
-	<<if $clubAdsXX == 1>>
-		their pussies and assholes.
-	<<elseif $clubAdsXX == -1>>
-		their assholes.
+
+	<<if _CL > 2>>
+		$clubNameCaps is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
+	<<elseif _CL > 0>>
+		There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
+	<<elseif $DJ != 0>>
+		<<setLocalPronouns $DJ>>
+		$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. $DJ.slaveName is alone in $clubName, and can accomplish little by $himself.
 	<<else>>
-		their holes.
+		$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
+		<<link "Decommission the club" "Main">>
+			<<set $club = 0, $clubDecoration = "standard", $clubUpgradePDAs = 0, $clubAdsSpending = 0>>
+			<<set _club = $sectors.findIndex(function(s) { return s.type == "Club"; })>>
+			<<if _club != -1>>
+				<<set $sectors[_club].type = "Shops">>
+			<</if>>
+		<</link>>
 	<</if>>
-	The ads are shown across the arcology.
-	<<if ($clubAdsXX == 1) && ($clubAdsImplanted == 1) && ($clubAdsStacked == 1)>>
-		As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> bimbos.
-	<<elseif ($clubAdsXX == 1) && ($clubAdsOld == 1)>>
-		As a result, $clubName is known as the place to spend a night partying with<<if ($clubAdsPreg == 1)>>pregnant<</if>> MILFs.
-	<<elseif ($clubAdsXX == 1) && ($clubAdsOld == -3)>>
-		As a result, $clubName is known as the place to spend a night partying with<<if $clubAdsPreg == 1>> pregnant<</if>><<if $clubAdsStacked == 1>> oppai<</if>> lolis.
-	<<elseif ($clubAdsXX == 1) && ($clubAdsPreg == 1)>>
-		As a result, $clubName is known as the place to spend a night partying with pregnant sluts.
-	<<elseif ($clubAdsXX == -1) && ($clubAdsStacked == 1)>>
-		As a result, $clubName is known as the place to spend a night partying with shemales.
-	<<elseif ($clubAdsXX == -1) && ($clubAdsStacked == -1)>>
-		As a result, $clubName is known as the place to spend a night partying with traps.
+
+	<<if _CL > 2>>
+		<<switch $clubDecoration>>
+			<<case "Chattel Religionist">>
+				From one of the private rooms, praying interspersed with the slap of leather on flesh can be heard.
+			<<case "Degradationist">>
+				Agonized screaming can be heard from one of the private rooms.
+			<<case "Repopulation Focus">>
+				A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very milky breasts. Occasionally crying can be heard from one of the rooms specially designed for patrons wishing to assfuck a slave as she gives birth.
+			<<case "Eugenics">>
+				The slight sounds of whispering can be heard emanating from one of the restricted rooms.
+			<<case "Asset Expansionist">>
+				A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very large breasts.
+			<<case "Transformation Fetishist">>
+				A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very large fake breasts.
+			<<case "Gender Radicalist">>
+				Uncomfortable moaning from one of the private rooms suggests that a slave inside is taking a painfully large cock up their tight butt.
+			<<case "Gender Fundamentalist">>
+				The unmistakable sound of vigorous vaginal intercourse can be heard from one of the private rooms.
+			<<case "Physical Idealist">>
+				Bestial grunting can be heard from one of the private rooms.
+			<<case "Supremacist">>
+				The sound of a beating, interspersed with desperate begging, can be heard from one of the private rooms.
+			<<case "Subjugationist">>
+				The sound of a beating, interspersed with desperate begging, can be heard from one of the private rooms.
+			<<case "Paternalist">>
+				The unmistakable sound of a slave experiencing an authentic orgasm can be heard from one of the private rooms.
+			<<case "Body Purist">>
+				The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
+			<<case "Slimness Enthusiast">>
+				The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
+			<<case "Pastoralist">>
+				A faint gushing sound is audible from one of the private rooms.
+			<<case "Roman Revivalist">>
+				A business meeting is just audible from one of the private rooms; only an occasional moan indicates that the businessmen are enjoying a couple of serving girls at the same time.
+			<<case "Aztec Revivalist">>
+				A muffled <<if $arcologies[0].FSPaternalist != "unset">>moan<<else>>scream<</if>>, followed by the sounds of liquid gently dripping on the stone floors denote the goings-on in the building.
+			<<case "Egyptian Revivalist">>
+				The smell of incense and the sounds of sex are drifting out of the private rooms.
+			<<case "Edo Revivalist">>
+				The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
+			<<case "Arabian Revivalist">>
+				The faint sound of multiple slaves pleasuring a single patron can be heard from one of the private rooms.
+			<<case "Chinese Revivalist">>
+				The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
+			<<case "Maturity Preferentialist">>
+				The faint sound of a well traveled slave showing off their experience can be heard from one of the private rooms.
+			<<case "Youth Preferentialist">>
+				The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
+			<<case "Hedonistic">>
+				The sound of fat bodies fucking while feeding each other can be heard from one of the private rooms.
+			<<case "Intellectual Dependency">>
+				The sounds of an overstimulated bimbo can be heard from one of the private rooms.
+			<<case "Slave Professionalism">>
+				The sounds of an overstimulated patron can be heard from one of the private rooms.
+			<<case "Petite Admiration">>
+				The faint sound of a slave giving head can be heard from one of the private rooms.
+			<<case "Statuesque Glorification">>
+				The faint banging of a patron banging a slave against the wall can be heard echoing from one of the private rooms.
+			<<default>>
+				The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
+		<</switch>>
 	<</if>>
-<</if>>
+</p>
 
-<<if _CL > 2>>
-	$clubNameCaps is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
-<<elseif _CL > 0>>
-	There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
-<<elseif $DJ != 0>>
-	<<setLocalPronouns $DJ>>
-	$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up. $DJ.slaveName is alone in $clubName, and can accomplish little by $himself.
-<<else>>
-	$clubNameCaps is doing business normally, without a complement of sex slaves to spice things up.
-	<<link "Decommission the club" "Main">>
-		<<set $club = 0, $clubDecoration = "standard", $clubUpgradePDAs = 0, $clubAdsSpending = 0>>
-		<<set _club = $sectors.findIndex(function(s) { return s.type == "Club"; })>>
-		<<if _club != -1>>
-			<<set $sectors[_club].type = "Shops">>
-		<</if>>
-	<</link>>
-<</if>>
 
-<<if _CL > 2>>
-	<<switch $clubDecoration>>
-	<<case "Chattel Religionist">>
-		From one of the private rooms, praying interspersed with the slap of leather on flesh can be heard.
-	<<case "Degradationist">>
-		Agonized screaming can be heard from one of the private rooms.
-	<<case "Repopulation Focus">>
-		A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very milky breasts. Occasionally crying can be heard from one of the rooms specially designed for patrons wishing to assfuck a slave as she gives birth.
-	<<case "Eugenics">>
-		The slight sounds of whispering can be heard emanating from one of the restricted rooms.
-	<<case "Asset Expansionist">>
-		A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very large breasts.
-	<<case "Transformation Fetishist">>
-		A wet slapping sound is coming from one of the private rooms, the kind of sound made by mammary intercourse with very large fake breasts.
-	<<case "Gender Radicalist">>
-		Uncomfortable moaning from one of the private rooms suggests that a slave inside is taking a painfully large cock up their tight butt.
-	<<case "Gender Fundamentalist">>
-		The unmistakable sound of vigorous vaginal intercourse can be heard from one of the private rooms.
-	<<case "Physical Idealist">>
-		Bestial grunting can be heard from one of the private rooms.
-	<<case "Supremacist">>
-		The sound of a beating, interspersed with desperate begging, can be heard from one of the private rooms.
-	<<case "Subjugationist">>
-		The sound of a beating, interspersed with desperate begging, can be heard from one of the private rooms.
-	<<case "Paternalist">>
-		The unmistakable sound of a slave experiencing an authentic orgasm can be heard from one of the private rooms.
-	<<case "Body Purist">>
-		The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
-	<<case "Slimness Enthusiast">>
-		The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
-	<<case "Pastoralist">>
-		A faint gushing sound is audible from one of the private rooms.
-	<<case "Roman Revivalist">>
-		A business meeting is just audible from one of the private rooms; only an occasional moan indicates that the businessmen are enjoying a couple of serving girls at the same time.
-	<<case "Aztec Revivalist">>
-		A muffled <<if $arcologies[0].FSPaternalist != "unset">>moan<<else>>scream<</if>>, followed by the sounds of liquid gently dripping on the stone floors denote the goings-on in the building.
-	<<case "Egyptian Revivalist">>
-		The smell of incense and the sounds of sex are drifting out of the private rooms.
-	<<case "Edo Revivalist">>
-		The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
-	<<case "Arabian Revivalist">>
-		The faint sound of multiple slaves pleasuring a single patron can be heard from one of the private rooms.
-	<<case "Chinese Revivalist">>
-		The faint but unmistakable sound of a slave trying to keep quiet while orgasming can be heard from one of the private rooms.
-	<<case "Maturity Preferentialist">>
-		The faint sound of a well traveled slave showing off their experience can be heard from one of the private rooms.
-	<<case "Youth Preferentialist">>
-		The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
-	<<case "Hedonistic">>
-		The sound of fat bodies fucking while feeding each other can be heard from one of the private rooms.
-	<<case "Intellectual Dependency">>
-		The sounds of an overstimulated bimbo can be heard from one of the private rooms.
-	<<case "Slave Professionalism">>
-		The sounds of an overstimulated patron can be heard from one of the private rooms.
-	<<case "Petite Admiration">>
-		The faint sound of a slave giving head can be heard from one of the private rooms.
-	<<case "Statuesque Glorification">>
-		The faint banging of a patron banging a slave against the wall can be heard echoing from one of the private rooms.
-	<<default>>
-		The faint but unmistakable sound of a shrill climax can be heard from one of the private rooms.
-	<</switch>>
-<</if>>
 
-<<if _CL > 0>>
-	<<removeFacilityWorkers "club" "rest" "serve the public">>
-<</if>>
+<div>
+	<<set _Tmult0 = Math.trunc($club*1000*$upgradeMultiplierArcology)>>
+	There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. There
+	<<if _CL == 1>>
+		is
+	<<else>>
+		are
+	<</if>>
+	currently _CL slave<<if _CL != 1>>s<</if>> serving in $clubName.
+	<div class="choices">
+		[[Expand the club|Club][cashX(forceNeg(_Tmult0), "capEx"), $club += 5, $PC.skill.engineering += .1]]
+		<span class="note">
+			Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs
+		</span>
+	</div>
+	<div class="choices">
+		<<if _CL > 0>>
+			<<removeFacilityWorkers "club" "rest" "serve the public">>
+		<</if>>
+	</div>
+</div>
 
-<<set _Tmult0 = Math.trunc($club*1000*$upgradeMultiplierArcology)>>
-<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> serving in $clubName.
-[[Expand the club|Club][cashX(forceNeg(_Tmult0), "capEx"), $club += 5, $PC.skill.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<div>
+	<<if $clubUpgradePDAs == 1>>
+		$clubNameCaps has been wired for unobtrusive personal data assistants to let your sluts pass tips about enslaveable people to your recruiter.
+	<<else>>
+		<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
+		The rooms are standard.
+		<div class="choices">
+			[[Upgrade them with PDAs to help your recruiter|Club][cashX(forceNeg(_Tmult1), "capEx"), $clubUpgradePDAs = 1, $PC.skill.hacking += 0.1]]
+			<span class="note">
+				Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs
+			</span>
+		</div>
+	<</if>>
+</div>
 
-<br>
-<<if $clubUpgradePDAs == 1>>
-	$clubNameCaps has been wired for unobtrusive personal data assistants to let your sluts pass tips about enslaveable people to your recruiter.
-<<else>>
-	<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
-	The rooms are standard. [[Upgrade them with PDAs to help your recruiter|Club][cashX(forceNeg(_Tmult1), "capEx"), $clubUpgradePDAs = 1, $PC.skill.hacking += 0.1]] //Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs//
-<</if>>
+<div>
+	<<if $DJ != 0>>
+		<<if $DJignoresFlaws != 1>>
+			$DJ.slaveName will attempt to fix flaws in <<print $clubName>>'s sluts.
+			[[Ignore flaws|Club][$DJignoresFlaws = 1]]
+		<<else>>
+			$DJ.slaveName has been instructed to ignore flaws in <<print $clubName>>'s sluts.
+			[[Fix flaws|Club][$DJignoresFlaws = 0]]
+		<</if>>
+	<</if>>
+</div>
 
-<<if $DJ != 0>>
-	<br>
-	<<if $DJignoresFlaws != 1>>
-		$DJ.slaveName will attempt to fix flaws in <<print $clubName>>'s sluts. [[Ignore flaws|Club][$DJignoresFlaws = 1]]
+<div>
+	<<if $clubAdsSpending > 0>>
+		$clubNameCaps is the subject of an active ad campaign.
 	<<else>>
-		$DJ.slaveName has been instructed to ignore flaws in <<print $clubName>>'s sluts. [[Fix flaws|Club][$DJignoresFlaws = 0]]
+		$clubNameCaps is not being advertised.
 	<</if>>
-<</if>>
-
-<br>
-<<if $clubAdsSpending > 0>>
-	$clubNameCaps is the subject of an active ad campaign.
-<<else>>
-	$clubNameCaps is not being advertised.
-<</if>>
-<<link "Manage club advertisements" "Club Advertisement">><<set $nextLink = passage()>><<set $nextButton = "Back">><</link>>
+	<div class="choices">
+		<<link "Manage club advertisements" "Club Advertisement">>
+			<<set $nextLink = passage(), set $nextButton = "Back">>
+		<</link>>
+	</div>
+</div>
 
 <!-- Statistics output -->
 <<ClubStatistics 1>>
 
-<br><br>
-<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.club)>>
+<p>
+	<<print App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.club)>>
+</p>
 
-<br><br>Rename $clubName: <<textbox "$clubName" $clubName "Club">> //Use a noun or similar short phrase//
+<p>
+	Rename $clubName: <<textbox "$clubName" $clubName "Club">>
+	<span class="note">
+		Use a noun or similar short phrase
+	</span>
+</p>
 
 <<run App.UI.SlaveList.ScrollPosition.restore()>>