diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index b66e90b5d4e564898d001f1de8e2b319a4c995bc..af4a0b6409171db61ea066a04cc63fc59985af9a 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -54,7 +54,6 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
 	td#Penthouse		{ border-color: teal; }
 	td#Dairy			{ border-color: white; }
 	td#Farmyard			{ border-color: brown; }
-	td#Nursery			{ border-color: deepskyblue; }
 </style>
 
 <<script>>
@@ -84,7 +83,6 @@ if(!Macro.has('sectorblock')) {
 			transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
 			Barracks: { base: 'Barracks', name: 'Garrison', extra: ' of $mercenariesTitle' },
 			Farmyard: { extra: ' <<if $farmyardNameCaps != "The Farmyard">>$farmyardNameCaps<</if>>'},
-			Nursery: { extra: ' <<if $nurseryNameCaps != "The Nursery">>$nurseryNameCaps<</if>> ($nurseryBabies babies, $nurserySlaves/<<print $nursery>><<if $Matron>>,L<</if>>)'},
 			/* speciality shop types */
 			'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
 			'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
@@ -139,17 +137,17 @@ if(!Macro.has('sectorblock')) {
 			<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
 			<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.built=="true">>
 				<br>
-				<<if $masterSuite>> <<print MS()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
-				<<if $HGSuite>> <<print HS()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
+				<<if $masterSuite>> <<print MasterSuiteUIName()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
+				<<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
 				<<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>>
-				<<if $servantsQuarters>> <<print SQ()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
-				<<if $spa>> <<print S()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
-				<<if $clinic>> <<print CI()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
-				<<if $schoolroom>> <<print SC()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
-				<<if $cellblock>> <<print CB()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
-				<<if $incubator>> <<print I()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
+				<<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
+				<<if $spa>> <<print SpaUIName()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
+				<<if $nursery>> <<print NurseryUIName()>> ($nurseryBabies, $nurserySlaves/$nursery<<if $Matron>>, L<</if>>)<</if>>
+				<<if $clinic>> <<print ClinicUIName()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
+				<<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
+				<<if $cellblock>> <<print CellblockUIName()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
+				<<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>)<</if>>
 				<<if $researchLab.built == "true">>[[Research Lab][$temp = 0]]<</if>>
-				<<if $nursery>> <<print N()>> ($nurserySlaves/$nursery<<if $Matron>>, L<</if>>)<</if>>
 			<</if>>
 		</td>
 		<td colspan="3"></td>