diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 3482e9d64cb505ff16d530eda7b539eeabaed984..b3fa4b180e20228d2db868d674857a0ef852c0d1 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1562,7 +1562,7 @@ window.rulesAssistantOptions = (function() {
 			const element = document.createElement("div");
 			element.className = "ra-setters";
 			this.tabButtons_ = document.createElement("div");
-			this.tabButtons_.className = "tab";
+			this.tabButtons_.className = "tabbar";
 			element.appendChild(this.tabButtons_);
 			return element;
 		}
diff --git a/src/npc/slaveStats.tw b/src/npc/slaveStats.tw
index b3ad5f10e0de1a7e662c7d007243a145c8a7a79a..689bb69975696b6c889cd0c207319fdfd5c852aa 100644
--- a/src/npc/slaveStats.tw
+++ b/src/npc/slaveStats.tw
@@ -71,15 +71,15 @@ Income: <<= num($activeSlave.lifetimeRepIncome)>>
 Expenses: <<= num($activeSlave.lastWeeksRepExpenses)>>,
 Income: <<= num($activeSlave.lastWeeksRepIncome)>>
 
-<br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Impants_Piercings_Tattoos')" id="tab Impants_Piercings_Tattoos">Impants, piercings & Tattoos</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
-<br>
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Skills')" id="tab Skills">Skills</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Mental')" id="tab Mental">Mental</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Body')" id="tab Body">Body</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Porn')" id="tab Porn">Porn</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Impants_Piercings_Tattoos')" id="tab Impants_Piercings_Tattoos">Impants, piercings & Tattoos</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Family')" id="tab Family">Family</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Misc')" id="tab Misc">Misc</button>
+</div>
 
 <div id="Skills" class="tabcontent">
 	<div class="content">
diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index a61b86918b6c4a32add5989d448344ef4d5e2d8a..6fd3131b26a4d0227cf2e0296dfe17d3cab15d73 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -34,14 +34,15 @@ Seated at your desk, you glance at the visual representation of
 <br><br>
 
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Assistant)>>
-
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
-<<if $week >= 11>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
-	<<if $assistant.personality != 0>>
-		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upgrades')" id="tab upgrades">Computer Core Upgrades</button>
+	<<if $week >= 11>>
+		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'settings')" id="tab settings">Settings</button>
+		<<if $assistant.personality != 0>>
+			<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'appearance')" id="tab appearance">Appearance</button>
+		<</if>>
 	<</if>>
-<</if>>
+</div>
 
 <div id="upgrades" class="tabcontent">
 <div class="content">
@@ -1074,4 +1075,4 @@ Seated at your desk, you glance at the visual representation of
 		<</if>>
  <</if>>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 32670ed035e5e20501b921b347375e70f528f14d..88a36a5a7d19ca6016e3c4cec717de9d10fcf785 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -89,13 +89,13 @@ This save was created using FC version $ver build $releaseID.
 
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
 
-<br>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
-<br>
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Display')" id="tab Display">Display</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'CONTENT&FLAVOR')" id="tab CONTENT&FLAVOR">Content & flavour</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'MODS')" id="tab MODS">Mods</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'DEBUG/CHEATING')" id="tab DEBUG/CHEATING">Debug/cheating</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Experimental')" id="tab Experimental">Experimental</button>
+</div>
 
 <div id="Display" class="tabcontent">
 	<div class="content">
diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 7ca66420eae2ef81a98a4f7d14e419e572207f46..53a8e26e1604cac5c3535bb15e9476596e1b3233 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -72,12 +72,14 @@
 	<</if>>
 </div>
 
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and face</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">ExtremeSurgery</button>
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'hairFace')" id="tab hairFace">Hair and face</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'upper')" id="tab upper">Upper</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'lower')" id="tab lower">Lower</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Race')" id="tab Race">Race</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Structural')" id="tab Structural">Structural</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'ExtremeSurgery')" id="tab ExtremeSurgery">ExtremeSurgery</button>
+</div>
 
 <div id="hairFace" class="tabcontent">
 <div class="content">
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 43864863a587b1c31625f7e42026891773d2c440..3497c1e55a2823362196b67fc13759976dbe920d 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -80,16 +80,18 @@
 		[E,→]
 	</span>
 </p>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), App.UI.replace('#LSD', '_desc')" id="tab Description">Description</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, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
-<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, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
-<<if $familyTesting == 1>>
-	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
-<</if>>
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), App.UI.replace('#LSD', '_desc')" id="tab Description">Description</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, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button>
+	<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, 'Customize'), App.UI.SlaveInteract.custom(getSlave(V.activeSlave.ID))" id="tab Customize">Customize</button>
+	<<if $familyTesting == 1>>
+		<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'FamilyTab'), renderFamilyTree(V.slaves, V.activeSlave.ID)" id="tab FamilyTab">Family</button>
+	<</if>>
+</div>
 
 <div id="artFrame">
 	<<if $seeImages == 1 && $eventDescription != 1>>
@@ -690,4 +692,4 @@
 			</p>
 		<</if>>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/uncategorized/underperformingSlaves.tw b/src/uncategorized/underperformingSlaves.tw
index a6182dbb49c59a25e746861b4f08e87c1499be4b..170d9cd73ede987b4de9333bdaf51677c61819f1 100644
--- a/src/uncategorized/underperformingSlaves.tw
+++ b/src/uncategorized/underperformingSlaves.tw
@@ -20,10 +20,10 @@
 	</div>
 </p>
 <<run App.UI.tabbar.handlePreSelectedTab($tabChoice.Options)>>
-
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
-<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
-
+<div class="tabbar">
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'highSale')" id="tab highSale">Worth much but earning little</button>
+	<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'expensive')" id="tab expensive">Costing vs earning</button>
+</div>
 <div id="highSale" class="tabcontent">
 	<div class="content">
 		<div style="font-style:italic">
@@ -78,4 +78,4 @@
 			).get(0)
 		)>>
 	</div>
-</div>
\ No newline at end of file
+</div>