diff --git a/src/npc/surgery/cloningWorkaround.js b/src/npc/surgery/cloningWorkaround.js
index 04780cf1848a8215186d7b6d1a3cc1505cfb65f7..2231b3cbe93e80fa0b972f04b055713fe576040c 100644
--- a/src/npc/surgery/cloningWorkaround.js
+++ b/src/npc/surgery/cloningWorkaround.js
@@ -35,11 +35,12 @@ App.UI.cloningWorkaround = function() {
 		}
 	));
 	for (const slave of V.slaves) {
+		const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
 		if (donatrix !== "undecided" && donatrix.ID === slave.ID) {
-			App.UI.DOM.appendNewElement("div", node, SlaveFullName(slave), "note");
+			div.classList.add("note");
 		} else {
-			App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
-				SlaveFullName(slave),
+			div.append(" ", App.UI.DOM.link(
+				"Select",
 				() => {
 					V.donatrix = slave;
 					App.UI.reload();
@@ -52,18 +53,20 @@ App.UI.cloningWorkaround = function() {
 
 	for (const slave of V.slaves) {
 		if (canBeReceptrix(slave)) {
-			const name = SlaveFullName(slave);
+			const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
 			if (receptrix !== "undecided" && receptrix.ID === slave.ID) {
-				App.UI.DOM.appendNewElement("div", node, name, "note");
+				div.classList.add("note");
 			} else {
-				App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
-					name,
+				div.append(" ", App.UI.DOM.link(
+					"Select",
 					() => {
 						V.receptrix = slave;
 						App.UI.reload();
-					}, [], "",
-					(slave.pregType >= 4) ? `Using a slave carrying multiples is inadvisable` : ``
+					}
 				));
+				if (slave.pregType >= 4) {
+					App.UI.DOM.appendNewElement("span", div, `Using a slave carrying multiples is inadvisable`, ["note"]);
+				}
 			}
 			eligibility = 1;
 		}
diff --git a/src/npc/surgery/ovaTransplantWorkaround.js b/src/npc/surgery/ovaTransplantWorkaround.js
index 26d1d7f063f621f8585b9b40a8980e98cc1ea1b4..3bca0240b073fc030132ced491761903714c0db7 100644
--- a/src/npc/surgery/ovaTransplantWorkaround.js
+++ b/src/npc/surgery/ovaTransplantWorkaround.js
@@ -8,16 +8,23 @@ App.UI.ovaTransplantWorkaround = function() {
 	App.UI.DOM.appendNewElement("h2", node, "Select a slave to serve as the host");
 
 	for (const slave of V.slaves) {
-		if ((V.donatrix.ID !== slave.ID && slave.ovaries > 0 || slave.mpreg > 0) && isSlaveAvailable(slave) && slave.preg >= 0 && slave.preg < slave.pregData.normalBirth / 10 && slave.pregWeek >= 0 && slave.pubertyXX === 1 && slave.pregType < 12 && slave.bellyImplant === -1 && slave.broodmother === 0 && slave.inflation <= 2 && slave.physicalAge < 70) {
-			App.UI.DOM.appendNewElement("div", node, App.UI.DOM.link(
-				SlaveFullName(slave),
+		if ((V.donatrix.ID !== slave.ID && slave.ovaries > 0 || slave.mpreg > 0) &&
+			isSlaveAvailable(slave) && slave.preg >= 0 && slave.preg < slave.pregData.normalBirth / 10 &&
+			slave.pregWeek >= 0 && slave.pubertyXX === 1 && slave.pregType < 12 && slave.bellyImplant === -1 &&
+			slave.broodmother === 0 && slave.inflation <= 2 && slave.physicalAge < 70
+		) {
+			const div = App.UI.DOM.appendNewElement("div", node, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)));
+			div.append(" ", App.UI.DOM.passageLink(
+				"Select", "Surrogacy",
 				() => {
 					V.receptrix = slave;
 					cashX(forceNeg(V.surgeryCost * 2), "slaveSurgery");
 					V.surgeryType = "transplant";
-				}, [], "Surrogacy",
-				(slave.pregType >= 4) ? `Using a slave carrying multiples is inadvisable` : ``
+				}
 			));
+			if (slave.pregType >= 4) {
+				App.UI.DOM.appendNewElement("span", div, `Using a slave carrying multiples is inadvisable`, ["note"]);
+			}
 			eligibility = 1;
 		}
 	}