diff --git a/src/arcologyBuilding/cell.tw b/src/arcologyBuilding/cell.tw
index aa51dc8caa38271c94c3047b48bde840b61307fe..39a1fe3868bc22455b64ab4d92c529e892777838 100644
--- a/src/arcologyBuilding/cell.tw
+++ b/src/arcologyBuilding/cell.tw
@@ -1,4 +1,4 @@
-:: Cell [nobr]
+:: Cell [nobr jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Main">>
 
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 7e6fbe17fc4f678d8a5604b4156465951e20d337..23d9976bcb5804d214a0aad7466191e93f331d64 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1,4 +1,4 @@
-:: Encyclopedia [nobr]
+:: Encyclopedia [nobr jump-from-safe]
 
 <<if $encyclopedia !== "Table of Contents">>
 	<<= App.Encyclopedia.Dialog.linkSC("Table of Contents", "Table of Contents")>>
diff --git a/src/interaction/prostheticLab.tw b/src/interaction/prostheticLab.tw
index 1d8d739b8409bbf18d9f4a323e30f546e62ff8b4..d79406219171cdbe75c9cb7732cc43e0a8073730 100644
--- a/src/interaction/prostheticLab.tw
+++ b/src/interaction/prostheticLab.tw
@@ -1,4 +1,4 @@
-:: Prosthetic Lab [nobr]
+:: Prosthetic Lab [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse">>
 
diff --git a/src/npc/findSlave.tw b/src/npc/findSlave.tw
index 31ccfef53bbc1ff889aad854173001a86a2921ed..204f8a2b4b9f614b74a95a9c5bd366c9f03189e3 100644
--- a/src/npc/findSlave.tw
+++ b/src/npc/findSlave.tw
@@ -1,4 +1,4 @@
-:: Find Slave [nobr]
+:: Find Slave [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main">>
 
diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw
index 6ff269ae709bfd3acc73bf2d784b4041975c3907..9ca80165ac9d9a7ca13c434bf0d6b86203161d93 100644
--- a/src/pregmod/geneLab.tw
+++ b/src/pregmod/geneLab.tw
@@ -1,4 +1,4 @@
-:: Gene Lab [nobr]
+:: Gene Lab [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw
index a490c0459ddc38e0ebbc5cc25cb40d15eda09899..546fac7272b6f3c2ab2c78b4e300e5b6794f5676 100644
--- a/src/pregmod/implantManufactory.tw
+++ b/src/pregmod/implantManufactory.tw
@@ -1,4 +1,4 @@
-:: Implant Manufactory [nobr]
+:: Implant Manufactory [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index e09fb5101aef57d1d88f0e5b605c5860ac91ce36..5caf33806cf54a2b60825b9182cdfcf71b339b6e 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -1,4 +1,4 @@
-:: Organ Farm [nobr]
+:: Organ Farm [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
diff --git a/src/uncategorized/bgSelect.tw b/src/uncategorized/bgSelect.tw
index 8d83007228ad15a6ef30e33c726a94cdde4645c3..b888caa6e8fcf56c4fb3b593e5205cfcc857366b 100644
--- a/src/uncategorized/bgSelect.tw
+++ b/src/uncategorized/bgSelect.tw
@@ -1,4 +1,4 @@
-:: BG Select [nobr]
+:: BG Select [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $encyclopedia = "Bodyguard">>
 
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 63244a6a5436675b5037631dbab80cc8d76eccd1..55201fd3c888e84363f6f9cdd54f8bb2b343f1ca 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -1,4 +1,4 @@
-:: Buy Slaves [nobr]
+:: Buy Slaves [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back">>
 <<set $nextLink = "Main">>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 32028b0d60807f8edab2119d2f74f5e7a0d25efb..b6945d008a6ba7c0e53b14a255f639faa181f312 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -1,4 +1,4 @@
-:: Cellblock [nobr]
+:: Cellblock [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $encyclopedia = "Cellblock", _CL = App.Entity.facilities.cellblock.employeesIDs().size>>
 
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 510361844776ddd97111b0e70ca790b5f1111796..4dad8233e513302660c1a51ca0ff1680c2895d2c 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -1,4 +1,4 @@
-:: Clinic [nobr]
+:: Clinic [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Clinic", $encyclopedia = "Clinic", _CL = App.Entity.facilities.clinic.employeesIDs().size>>
 
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 2f019b3ac1c4f4ed7ca4ce9bda2640ef77e66aa9..8af2335e3e9bf82a23307de7ebd2671c596c2e0c 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -1,4 +1,4 @@
-:: Costs Budget [nobr]
+:: Costs Budget [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", _arcologyCosts = 0>>
 
diff --git a/src/uncategorized/descriptionOptions.tw b/src/uncategorized/descriptionOptions.tw
index 19a45f677ea6c8c8a17fb6598eba5c45b02fe581..b4b0c1a7075d5b046b65e1b92fdaf8ac4a4ede47 100644
--- a/src/uncategorized/descriptionOptions.tw
+++ b/src/uncategorized/descriptionOptions.tw
@@ -1,4 +1,4 @@
-:: Description Options [nobr]
+:: Description Options [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back">>
 <<if $storedLink !== "Slave Interact">>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 551bf6d86f17b3c2aba1350e8bd29f3526c2cdfb..e4b441d7688532d14d6a85058fb1dc9056db99b8 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -1,4 +1,4 @@
-:: Dispensary [nobr]
+:: Dispensary [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse", $encyclopedia = "The Pharmaceutical Fab.", _PCSkillCheck = Math.min($upgradeMultiplierMedicine, $HackingSkillMultiplier)>>
 
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 9c514dfcea59d2f25a87e2b70ace36a003ed802e..af33f0331020b0323f7509c9dcb70063ec36771d 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -1,4 +1,4 @@
-:: Head Girl Suite [nobr]
+:: Head Girl Suite [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $encyclopedia = "Head Girl Suite", _SL = $slaves.length>>
 
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 4fb0fb79409d95c0f7bf74097b9e347349df6baf..ffe42ab296eafb910f8ce955782ab8cbdb261513 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -1,4 +1,4 @@
-:: Master Suite [nobr]
+:: Master Suite [nobr jump-to-safe jump-from-safe]
 
 <<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.masterSuite)>>
 <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $encyclopedia = "Master Suite", _SL = $slaves.length, _MsL = _slaves.length>>
diff --git a/src/uncategorized/recruiterSelect.tw b/src/uncategorized/recruiterSelect.tw
index b1155515ae8b9931dd3a8481eac8d2f9ff05ae24..49ad10e6d6d3c9f3b5720de175404330b1533935 100644
--- a/src/uncategorized/recruiterSelect.tw
+++ b/src/uncategorized/recruiterSelect.tw
@@ -1,4 +1,4 @@
-:: Recruiter Select [nobr]
+:: Recruiter Select [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", $encyclopedia = "Recruiter">>
 <<if ($Recruiter != 0)>>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 6bfaba0cf7f9a7a77c8706061c282bb134a8b22e..b07dae6ff9c1eeb55bdd1e8c126c5b702c6607ad 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -1,4 +1,4 @@
-:: Rep Budget [nobr]
+:: Rep Budget [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back to Main", $nextLink = "Main", _arcologyCosts = 0>>
 
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 1eb4a9890e539dd550c5a18170e50378b894af95..662b7abb69484c8d982fcd4bf31a37733e7507a6 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -1,3 +1,3 @@
-:: Rules Assistant [nobr]
+:: Rules Assistant [nobr jump-to-safe jump-from-safe]
 
 <<run html5passage(rulesAssistantOptions)>>
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index 3805a51143cfa881f1b22a21ebe05c54628f17a1..e55b592a89ce9d967c42d5f6cee9595a3f0e21ae 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -1,4 +1,4 @@
-:: Schoolroom [nobr]
+:: Schoolroom [nobr jump-to-safe jump-from-safe]
 
 <<set _DL = App.Entity.facilities.schoolroom.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $encyclopedia = "Schoolroom">>
 
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index c952fb38433624afb2717372e682f271ceb37c6b..1d14602cf0d2ced5fafa2e500094d930097ea02d 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -1,4 +1,4 @@
-:: Servants' Quarters [nobr]
+:: Servants' Quarters [nobr jump-to-safe jump-from-safe]
 
 <<set _DL = App.Entity.facilities.servantsQuarters.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Servants' Quarters", $encyclopedia = "Servants' Quarters">>
 
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index e71ea8b1438a58002068fffe2f49d3debf1fb4a7..696db7c3bcdffeb274137dff9adb72d4a84a601c 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -1,4 +1,4 @@
-:: Spa [nobr]
+:: Spa [nobr jump-to-safe jump-from-safe]
 
 <<set _DL = App.Entity.facilities.spa.employeesIDs().size, $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $encyclopedia = "Spa">>
 
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index 74411f44be29f280123bfec197c36ffec5970c28..62115362074fc348c5da29870ef50aff65f10fa7 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -1,4 +1,4 @@
-:: Summary Options [nobr]
+:: Summary Options [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back">>
 <<if $storedLink !== "Slave Interact" && $storedLink !== "Main">>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index d3b689b92c749377bbace8f4c0add129325d1af7..696769d1fd89af563834f5af2f51cb52ac3c8858 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -1,4 +1,4 @@
-:: Universal Rules [nobr]
+:: Universal Rules [nobr jump-to-safe jump-from-safe]
 
 <<set $nextButton = "Back", $nextLink = "Manage Penthouse">>