diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 8efe26db319872fe67c36952cc6970bf06b43a92..415e56c6bd34903193351db628a93592e6dc5d21 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -212,38 +212,46 @@ Last week this
 <</if>>
 
 <br><br>
-<<if ($brothel <= $brothelSlaves)>>
-	''$brothelNameCaps is full and cannot hold any more slaves''
-<<elseif ($slaves.length > $brothelSlaves)>>
-	<<link "''Send a slave to $brothelName''">>
-		<<replace #ComingGoing>>
-			<<resetAssignmentFilter>>
-			<<set $Flag = 0>>
-			<<include "Slave Summary">>
-		<</replace>>
-	<</link>>
-<</if>>
 
-<<if $brothelSlaves > 0>>
-	| <<link "''Bring a slave out of $brothelName''">>
-		<<replace #ComingGoing>>
+<<CreateSimpleTabs>>
+<body>
+
+<div class="tab">
+	<button class="tablinks" onclick="opentab(event, 'assign')" id="tab assign">Assign a slave</button>
+	<button class="tablinks" onclick="opentab(event, 'remove')" id="tab remove">Remove a slave</button>
+</div>
+
+<div id="remove" class="tabcontent">
+	<div class="content">
+		<<if $brothelSlaves > 0>>
 			<<brothelAssignmentFilter>>
 			<<set $Flag = 1>>
 			<<include "Slave Summary">>
 			<<resetAssignmentFilter>>
-		<</replace>>
-	<</link>>
+		<<else>>
+			<br><br>//$brothelNameCaps is empty for the moment.<br>//
+		<</if>>
+	</div>
+</div>
+
+<div id="assign" class="tabcontent">
+	<div class="content">
+		<<if ($brothel <= $brothelSlaves)>>
+			''$brothelNameCaps is full and cannot hold any more slaves''
+		<<elseif ($slaves.length > $brothelSlaves)>>
+			<<resetAssignmentFilter>>
+			<<set $Flag = 0>>
+			<<include "Slave Summary">>
+		<</if>>
+	</div>
+</div>
+
+<<if ($tabChoice.Brothel == "assign")>>
+	<script>document.getElementById("tab assign").click();</script>
 <<else>>
-	<br><br>//$brothelNameCaps is empty for the moment.<br>//
+	<script>document.getElementById("tab remove").click();</script>
 <</if>>
 
-<br><br>
-<<assignmentFilter >>
-<span id="ComingGoing">
-	<<brothelAssignmentFilter>>
-	<<set $Flag = 1>>
-	<<include "Slave Summary">>
-	<<resetAssignmentFilter>>
-</span>
+</body>
 
 <br><br>Rename $brothelName: <<textbox "$brothelName" $brothelName "Brothel">> //Use a noun or similar short phrase//