diff --git a/js/003-data/policiesData.js b/js/003-data/policiesData.js
index f56724711a4e5960b54004cebd3682678ceb6cd3..19f9642ea8557c00f6979620525cb3b904837b5c 100644
--- a/js/003-data/policiesData.js
+++ b/js/003-data/policiesData.js
@@ -660,12 +660,67 @@ App.Data.Policies.Selection = {
 		],
 	],
 	RetirementPolicies: [
+		[
+			{
+				title: "Redefined Mandatory Retirement Age",
+				get text() {
+					const el = new DocumentFragment;
+					el.append(`you will set your arcology's standard retirement age for sex slaves at age `);
+					el.append(
+						App.UI.DOM.makeElement(
+							"div",
+							App.UI.DOM.makeTextBox(
+								V.customRetirementAge,
+								v => {
+									V.customRetirementAge = v;
+									policy("RetirementPolicies");
+								},
+								true
+							),
+							"indent"
+						)
+					);
+					return el;
+				},
+				activatedText: "you have set your arcology's standard retirement age for sex slaves at $retirementAge.",
+				policy: "policies.retirement.physicalAgePolicy",
+				onRepeal: function() { V.retirementAge = 45; }
+
+			}
+		],
+		[
+			{
+				title: "Physical Retirement Age",
+				get text() {
+					const el = new DocumentFragment;
+					el.append(`you will set your arcology's standard retirement age for sex slaves once their bodies reach age `);
+					el.append(
+						App.UI.DOM.makeElement(
+							"div",
+							App.UI.DOM.makeTextBox(
+								V.customRetirementAge,
+								v => {
+									V.customRetirementAge = v;
+									policy("RetirementPolicies");
+								},
+								true
+							),
+							"indent"
+						)
+					);
+					return el;
+				},
+				activatedText: "you have set your arcology's standard retirement age for sex slaves at $retirementAge.",
+				policy: "policies.retirement.physicalAgePolicy",
+				onRepeal: function() { V.retirementAge = 45; }
+			}
+		],
+	],
+	MenialRetirementPolicies: [
 		[
 			{
 				title: "No Menial Retirement Plan",
-				activatedTitle: "",
 				text: "without defining a retirement age for menial slaves they will remain slaves until death or freed otherwise.",
-				activatedText: "",
 				policy: "policies.retirement.menial2Citizen",
 				hide:{button: 1, ifActivated: 1, ifDeactivated: 0}
 			}
@@ -683,7 +738,7 @@ App.Data.Policies.Selection = {
 								V.customMenialRetirementAge,
 								v => {
 									V.customMenialRetirementAge = v;
-									policy("RetirementPolicies");
+									policy("MenialRetirementPolicies");
 								},
 								true
 							),
@@ -692,7 +747,6 @@ App.Data.Policies.Selection = {
 					);
 					return el;
 				},
-				activatedText: "",
 				policy: "policies.retirement.menial2Citizen",
 				hide:{button: 1, ifActivated: 1, ifDeactivated: 0}
 			}
@@ -707,7 +761,7 @@ App.Data.Policies.Selection = {
 				requirements: function() { if (V.arcologies[0].FSDegradationist === "unset") { return true; } else { return false; } },
 				note: `Will add upkeep to all menial slaves.`,
 				onImplementation: function() { if (V.citizenRetirementTrigger === 0) { V.citizenRetirementTrigger = 1; } },
-				onRepeal: function() { V.retirementAge = 45; }
+				onRepeal: function() { V.customMenialRetirementAge = 45; }
 			}
 		],
 	]
diff --git a/src/interaction/policies/policies.tw b/src/interaction/policies/policies.tw
index afe44fa1906e3f422e89de5d9c2d5e834145424c..c74efedbd62dfc84112361f679d305b80ba67067 100644
--- a/src/interaction/policies/policies.tw
+++ b/src/interaction/policies/policies.tw
@@ -127,37 +127,20 @@
 
 <div id="SRP" class="tabcontent">
 	<div class="content">
+		<<if $policies.retirement.customAgePolicy == 0 && $policies.retirement.physicalAgePolicy == 0>>
+			<br>''Default Retirement Age:'' in the absence of a defined slave retirement age, slaves will not remain sex slaves after reaching age $retirementAge.
+			<br>&nbsp;&nbsp;&nbsp;&nbsp;//This is a current content and mechanical limitation in FC $ver, not a universal Free Cities rule.//
+		<</if>>
+
 		<span id="RetirementPolicies"></span>
 		<script>
 			policy("RetirementPolicies");
 		</script>
-
-	<<if $policies.retirement.customAgePolicy == 1>>
-		<br>''Redefined Mandatory Retirement Age:'' you have set your arcology's standard retirement age for sex slaves at $retirementAge.
-		<span class="yellow">[[Repeal|Policies][$policies.retirement.customAgePolicy = 0, $retirementAge = 45]]</span>
-	<<elseif $policies.retirement.physicalAgePolicy == 1>>
-		<br>''Physical Retirement Age:'' you have set your arcology's standard retirement age for slave bodies at $retirementAge.
-		<span class="yellow">[[Repeal|Policies][$policies.retirement.physicalAgePolicy = 0, $retirementAge = 45]]</span>
-	<<else>>
-		<br>''Default Retirement Age:'' in the absence of a defined slave retirement age, slaves will not remain sex slaves after reaching age $retirementAge.
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;//This is a current content and mechanical limitation in FC $ver, not a universal Free Cities rule.//
-	<</if>>
-
-	<<if $policies.retirement.physicalAgePolicy == 0 && $policies.retirement.customAgePolicy == 0>>
-		<br>''Redefined Mandatory Retirement Age:'' you will set your arcology's standard retirement age for sex slaves at age
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
-		<<if $rep >= 1000>>
-			<span class="green">[[Implement|Policies][$policies.retirement.customAgePolicy = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
-		<</if>>
-	<</if>>
-
-		<<if $policies.retirement.customAgePolicy == 0 && $policies.retirement.physicalAgePolicy == 0>>
-		<br>''Physical Retirement Age:'' you will set your arcology's standard retirement age for sex slaves once their bodies reach age
-		<br>&nbsp;&nbsp;&nbsp;&nbsp;<<textbox "$customRetirementAge" $customRetirementAge "Policies">>
-		<<if $rep >= 1000>>
-			<span class="green">[[Implement|Policies][$policies.retirement.physicalAgePolicy = 1, cashX(-5000, "policies"), repX(-1000, "policies")]]</span>
-		<</if>>
-	<</if>>
+		<h1>Menials</h1>
+		<span id="MenialRetirementPolicies"></span>
+		<script>
+			policy("MenialRetirementPolicies");
+		</script>
 
 	<<if $policies.retirement.fate == "bioreactor">>
 		<br>''Public Fluid Production Retirement:'' once reaching mandatory retirement age, slaves are converted for full-time milk, vaginal secretion<<if $seeDicks == 1>> and semen<</if>> production.