diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index e3921b723c1769aaa1004129b9a22f403a52b26e..840f4c76ef3006ba93cc8f279f82ab2e5d78e4f5 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -77,13 +77,13 @@
 	</span>
 </p>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description')" id="tab Description">Description</button>
+<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Location')" id="tab Location">Location</button>
 <<if $showWardrobe > 0 && $activeSlave.fuckdoll == 0>>
 	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance')" id="tab Appearance">Appearance</button>
 <</if>>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'PhysicalRegimen')" id="tab PhysicalRegimen">Physical Regimen</button>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Rules')" id="tab Rules">Rules</button>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Financial')" id="tab Financial">Financial</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Location')" id="tab Location">Location</button>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Customize')" id="tab Customize">Customize</button>
 <<if $familyTesting == 1>>
 	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab')" id="tab FamilyTab">Family</button>
@@ -138,6 +138,21 @@
 
 <div id="Location" class="tabcontent">
 	<div class="content">
+		<p>
+			Take slave to another room:
+			[[Wardrobe|Wardrobe Use][$degradation = 0]]
+			| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
+			| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
+			| [[Remote surgery|Remote Surgery][$degradation = 0]]
+			<<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]<</if>>
+
+
+			<div id="miniscene"></div>
+			<span id="useSlave"></span>
+			<script>
+				App.UI.SlaveInteract.useSlaveDisplay(V.activeSlave)
+			</script>
+		</p>
 		<p>
 			<<switch $activeSlave.assignment>>
 				<<case "recover from surgery">>
@@ -172,19 +187,19 @@
 					//$He is the Wardeness and is not available for other work//
 				<<default>>
 
-				/* CAN BE REASSIGNED */
+					/* CAN BE REASSIGNED */
 
-				<span id="assignmentLinks"></span>
-				<script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", V.activeSlave)</script>
+					<span id="assignmentLinks"></span>
+					<script>App.UI.SlaveInteract.assignmentBlock("assignmentLinks", V.activeSlave)</script>
 
-				<<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
+					<<set _numFacilities = $brothel+$club+$dairy+$farmyard+$servantsQuarters+$masterSuite+$spa+$nursery+$clinic+$schoolroom+$cellblock+$arcade+$HGSuite>>
 
-				<<if _numFacilities > 0>>
-					Transfer to: <<= App.UI.jobLinks.transfers(-1)>>
-				<</if>> /* closes _numFacilities */
+					<<if _numFacilities > 0>>
+						Transfer to: <<= App.UI.jobLinks.transfers(-1)>>
+					<</if>> /* closes _numFacilities */
 
-				<div id="fucktoypref"></div>
-				<script>App.UI.SlaveInteract.fucktoyPref(V.activeSlave)</script>
+					<div id="fucktoypref"></div>
+					<script>App.UI.SlaveInteract.fucktoyPref(V.activeSlave)</script>
 
 			<</switch>> /* END CAN BE REASSIGNED */
 
@@ -197,22 +212,6 @@
 				<<link "Millionaires">><<set $activeSlave.whoreClass = 4>><<replace "#whoreClass">>millionaires<</replace>><</link>>
 			<</if>>
 		</p>
-		
-		<p>
-			__Take slave to another room:__
-			[[Wardrobe|Wardrobe Use][$degradation = 0]]
-			| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$primaryEarColor = "",$secondaryEarColor = "",$primaryTailColor = "",$secondaryTailColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
-			| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
-			| [[Remote surgery|Remote Surgery][$degradation = 0]]
-			<<if $prostheticsUpgrade > 0>>| [[Configure cybernetics|Prosthetics Configuration][$prostheticsConfig = "main"]]<</if>>
-
-
-			<div id="miniscene"></div>
-			<span id="useSlave"></span>
-			<script>
-				App.UI.SlaveInteract.useSlaveDisplay(V.activeSlave)
-			</script>
-		</p>
 	</div>
 </div>