diff --git a/src/005-passages/managePassages.js b/src/005-passages/managePassages.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1d1e2f7731581e4b97d0ca64133c3d2704a5af6
--- /dev/null
+++ b/src/005-passages/managePassages.js
@@ -0,0 +1 @@
+new App.DomPassage("Future Society", () => { return App.UI.fsPassage(); }, ["jump-to-safe", "jump-from-safe"]);
diff --git a/src/facilities/fsPassage.js b/src/facilities/fsPassage.js
index 86fda835310939f6dd3581be857dc52f43834da3..831f3c0d8507c19518990f6853c56ea60d8c627c 100644
--- a/src/facilities/fsPassage.js
+++ b/src/facilities/fsPassage.js
@@ -1,29 +1,39 @@
-App.UI.FSPassage = function() {
-	const el = new DocumentFragment();
+App.UI.fsPassage = function() {
 	const arc = V.arcologies[0];
 	V.FSReminder = 0;
 	const _FSCredits = FutureSocieties.availCredits();
 	setup();
 
+	V.nextButton = "Back";
+	V.nextLink = "Main";
+	V.encyclopedia = "Future Societies";
+
+	const f = new DocumentFragment();
+
 	if (V.cheatMode) {
-		App.UI.DOM.appendNewElement("div", el, App.UI.DOM.link(
+		App.UI.DOM.appendNewElement("div", f, App.UI.DOM.link(
 			"Cheat Edit Future Society",
 			() => {
 				V.cheater = 1;
 			},
 			[],
 			"MOD_Edit FS Cheat"
-		));
+		), "cheat-menu");
 	}
 
-	el.append(overview());
-	el.append(FSPerception());
-	el.append(unlocks());
-	el.append(spending());
-	el.append(rename());
-	el.append(selectFS());
+	App.UI.DOM.appendNewElement("h1", f, "Future Societies");
+
+	f.append(overview());
+	f.append(FSPerception());
+	f.append(unlocks());
+	f.append(spending());
+	f.append(rename());
+	f.append(selectFS());
+
+	App.UI.DOM.appendNewElement("h2", f, "Facility Redecoration");
 
-	return el;
+	f.append(App.UI.facilityRedecoration());
+	return f;
 
 	/**
 	 * FIRST FS STORING FOR RIVALRY
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
deleted file mode 100644
index 155195353f25ab653ca6340b56ebfb34d360680a..0000000000000000000000000000000000000000
--- a/src/uncategorized/futureSociety.tw
+++ /dev/null
@@ -1,13 +0,0 @@
-:: Future Society [nobr jump-to-safe jump-from-safe]
-
-<<setAssistantPronouns>>
-<<set $nextButton = "Back", $nextLink = "Main", $encyclopedia = "Future Societies">>
-
-<<includeDOM App.UI.FSPassage()>>
-
-<h3>Future Societies</h3>
-
-
-<h3>Facility Redecoration</h3>
-
-<<includeDOM App.UI.facilityRedecoration()>>