diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index d02e71e8e59d3cafe1972dfe954520c557a95ccd..d0cdc78b006b7f9f1f284a1158516c0d03af388c 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -55,6 +55,13 @@ Yes, I am aware this is horrible. If anyone can figure out how to get widgets to
 	td#Dairy			{ border-color: white; }
 	td#Farmyard			{ border-color: brown; }
 	td#Nursery			{ border-color: deepskyblue; }
+
+    .arcology .penthouse {
+        display:inline-block;
+    }
+    .arcology.verticalLinks .penthouse{
+        display:block;
+    }
 </style>
 
 <<script>>
@@ -136,56 +143,69 @@ if(!Macro.has('sectorblock')) {
 }
 <</script>>
 <center>
-<table class="arcology">
+<<set _arcologyTableClass = "arcology">>
+<<if $verticalizeArcologyLinks>><<set _arcologyTableClass += " verticalLinks">><</if>>
+<table @class="_arcologyTableClass">
 	<tr> /* Level 9, penthouse, sector 0 */
 		<td colspan="3"></td>
 		<td id="Penthouse" colspan="4">
+            <span class="penthouse">
 			<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
-			<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>>
-				<<if $masterSuite>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)
-				<</if>>
-				<<if $HGSuite>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
-				<</if>>
-				<<if $dojo > 1>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>>
-				<</if>>
-				<<if $servantsQuarters>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)
-				<</if>>
-				<<if $spa>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
-				<</if>>
-				<<if $nursery>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>>
-				<</if>>
-				<<if $clinic>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)
-				<</if>>
-				<<if $schoolroom>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
-				<</if>>
-				<<if $cellblock>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)
-				<</if>>
-				<<if $incubator>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					<<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>>
-				<</if>>
-				<<if $researchLab.level > 0>>
-					<<if $verticalizeArcologyLinks>><br><</if>>
-					[[Prosthetic Lab]]
-				<</if>>
+            </span>
+			<<if $masterSuite>>
+                <span class="penthouse masterSuite">
+				<<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)
+                </span>
+			<</if>>
+			<<if $HGSuite>>
+                <span class="penthouse headGirlSuite">
+				<<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
+                </span>
+			<</if>>
+			<<if $dojo > 1>>
+                <span class="penthouse armory">
+				[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>>
+                </span>
+			<</if>>
+			<<if $servantsQuarters>>
+                <span class="penthouse servantsQuarters">
+				<<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)
+                </span>
+			<</if>>
+			<<if $spa>>
+                <span class="penthouse spa">
+				<<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
+                </span>
+			<</if>>
+			<<if $nursery>>
+                <span class="penthouse nursery">
+				<<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>>
+                </span>
+			<</if>>
+			<<if $clinic>>
+                <span class="penthouse clinic">
+				<<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)
+                </span>
+			<</if>>
+			<<if $schoolroom>>
+                <span class="penthouse schoolroom">
+				<<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
+                </span>
+			<</if>>
+			<<if $cellblock>>
+                <span class="penthouse cellblock">
+				<<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)
+                </span>
+			<</if>>
+			<<if $incubator>>
+                <span class="penthouse incubator">
+				<<print IncubatorUIName()>> (<<=numberWithPluralOne($incubator-$tanks.length, "empty tank")>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>>
+                </span>
+			<</if>>
+			<<if $researchLab.level > 0>>
+                <span class="penthouse researchLab">
+				[[Prosthetic Lab]]
+                </span>
 			<</if>>
 		</td>
 		<td colspan="3"></td>