diff --git a/src/js/slaveCostJS.js b/src/js/slaveCostJS.js
index 2b315489b941c9b2f82319479191c38a8a77acf4..c8c1bd2d769e90d408406ad2e802115e83dedf80 100644
--- a/src/js/slaveCostJS.js
+++ b/src/js/slaveCostJS.js
@@ -1614,28 +1614,13 @@ globalThis.BeautyTooltip = function(slave) {
 		let el = document.createElement('div');
 		el.className = "clear-formatting";
 
-		let textNode = document.createTextNode(`Sort by: `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Text", () => { criteria = "text", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Value", () => { criteria = "value", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Ascending", () => { direction = "ascending", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Descending", () => { direction = "descending", jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
+		el.appendChild(document.createTextNode(`Sort by: `));
+		el.appendChild(App.UI.DOM.generateLinksStrip([
+			App.UI.DOM.link("Text", () => { criteria = "text"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+			App.UI.DOM.link("Value", () => { criteria = "value"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+			App.UI.DOM.link("Ascending", () => { direction = "ascending"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, []),
+			App.UI.DOM.link("Descending", () => { direction = "descending"; jQuery('#cheatBeautyContents').empty().append(BeautyFrame(slave)); }, [])
+		]));
 
 		let cheatBeautyContents = document.createElement('div');
 		cheatBeautyContents.id = "cheatBeautyContents";
@@ -2078,11 +2063,11 @@ globalThis.FResultArray = (function() {
 	 */
 	function calcAge(slave) {
 		if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.minimumSlaveAge && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
-			adjustFResult(`Young and Fertile: Repopulationist /Gender Fundamentalist`, 1);
+			adjustFResult(`Young and Fertile: Repopulationist/Gender Fundamentalist`, 1);
 			if (slave.birthWeek === 0) {
-				adjustFResult(`Newborn and Fertile: Repopulationist /Gender Fundamentalist`, result);
+				adjustFResult(`Newborn and Fertile: Repopulationist/Gender Fundamentalist`, result);
 			} else if (slave.birthWeek < 4) {
-				adjustFResult(`Very Young and Fertile: Repopulationist /Gender Fundamentalist`, 0.2 * result);
+				adjustFResult(`Very Young and Fertile: Repopulationist/Gender Fundamentalist`, 0.2 * result);
 			}
 		} else if (slave.physicalAge === V.minimumSlaveAge) {
 			adjustFResult(`Young`, 1);
@@ -2092,11 +2077,11 @@ globalThis.FResultArray = (function() {
 				adjustFResult(`Very Young`, 0.1 * result);
 			}
 		} else if ((V.arcologies[0].FSRepopulationFocus !== "unset" || V.arcologies[0].FSGenderFundamentalist !== "unset") && slave.physicalAge === V.fertilityAge && canGetPregnant(slave)) {
-			adjustFResult(`Young and Fertile: Repopulationist /Gender Fundamentalist`, 1);
+			adjustFResult(`Young and Fertile: Repopulationist/Gender Fundamentalist`, 1);
 			if (slave.birthWeek === 0) {
-				adjustFResult(`Newborn and Fertile: Repopulationist /Gender Fundamentalist`, 0.5 * result);
+				adjustFResult(`Newborn and Fertile: Repopulationist/Gender Fundamentalist`, 0.5 * result);
 			} else if (slave.birthWeek < 4) {
-				adjustFResult(`Very Young and Fertile: Repopulationist /Gender Fundamentalist`, 0.1 * result);
+				adjustFResult(`Very Young and Fertile: Repopulationist/Gender Fundamentalist`, 0.1 * result);
 			}
 		}
 	}
@@ -2162,28 +2147,13 @@ globalThis.FResultTooltip = function(slave) {
 		let el = document.createElement('div');
 		el.className = "clear-formatting";
 
-		let textNode = document.createTextNode(`Sort by: `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Text", () => { criteria = "text", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Value", () => { criteria = "value", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Ascending", () => { direction = "ascending", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
-
-		el.appendChild(App.UI.DOM.link("Descending", () => { direction = "descending", jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []));
-
-		textNode = document.createTextNode(` | `);
-		el.appendChild(textNode);
+		el.appendChild(document.createTextNode(`Sort by: `));
+		el.appendChild(App.UI.DOM.generateLinksStrip([
+			App.UI.DOM.link("Text", () => { criteria = "text"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+			App.UI.DOM.link("Value", () => { criteria = "value"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+			App.UI.DOM.link("Ascending", () => { direction = "ascending"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, []),
+			App.UI.DOM.link("Descending", () => { direction = "descending"; jQuery('#cheatFResultContents').empty().append(FResultFrame(slave)); }, [])
+		]));
 
 		let cheatFResultContents = document.createElement('div');
 		cheatFResultContents.id = "cheatFResultContents";