diff --git a/src/endWeek/economics/arcmgmt.js b/src/endWeek/economics/arcmgmt.js
index d56270b595906259766d0d5824b96261778f6375..9132b05c0588d7f78b67972fa1c80b3edec71598 100644
--- a/src/endWeek/economics/arcmgmt.js
+++ b/src/endWeek/economics/arcmgmt.js
@@ -1,4 +1,4 @@
-globalThis.arcmgmt = function() {
+App.EndWeek.arcmgmt = function() {
const el = new DocumentFragment();
let r;
let _enslaved;
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 4b5464c4c211914ec5bd4becbca17500f1b92a2b..5b1bcdbb510c9fcac94c0b59a81c69a43e61bca3 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -1,6 +1,8 @@
:: Economics [nobr]
-<h1> <<print $arcologies[0].name + " Weekly Financial Report — Week " + $week>></h1>
+<h1>
+ <<print $arcologies[0].name + " Weekly Financial Report — Week " + $week>>
+</h1>
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
@@ -16,122 +18,119 @@
<br><br>
<<if $useTabs == 0>>
-<<include "Neighbors Development">>
-
-<br>
-<<includeDOM arcmgmt()>>
-
-<<if $FSAnnounced > 0>>
- <br><br>
- <<include "FS Developments">>
-<</if>>
-
-<<if $corp.Incorporated == 1>>
- <br><br>
- <<include "Corporation Developments">>
-<</if>>
-
-<<if $secExpEnabled > 0>>
+ <<include "Neighbors Development">>
<br>
- <<include "authorityReport">>
- <<include "securityReport">>
-<</if>>
-
-<<includeDOM App.EndWeek.reputation()>>
-<<includeDOM App.EndWeek.personalBusiness()>>
-
-<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
- <<includeDOM App.EndWeek.personalNotes()>>
-<</if>>
-
-<<else>>
-<body>
+ <<includeDOM App.EndWeek.arcmgmt()>>
-<div class="tab-bar">
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Management')">Arcology Management</button>
<<if $FSAnnounced > 0>>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Societies')">Society Development</button>
+ <br><br>
+ <<include "FS Developments">>
<</if>>
+
<<if $corp.Incorporated == 1>>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Corporation')">Corporation Developments</button>
+ <br><br>
+ <<include "Corporation Developments">>
<</if>>
+
<<if $secExpEnabled > 0>>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Authority')">Authority</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'securityReport')">Security</button>
+ <br>
+ <<include "authorityReport">>
+ <<include "securityReport">>
<</if>>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Reputation')">Reputation</button>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Business')">Personal Business</button>
+
+ <<includeDOM App.EndWeek.reputation()>>
+ <<includeDOM App.EndWeek.personalBusiness()>>
+
<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
- <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Personal')">Personal Notes</button>
+ <<includeDOM App.EndWeek.personalNotes()>>
<</if>>
-</div>
-
-<div id="Arcologies" class="tab-content">
- <div class="content">
- <<include "Neighbors Development">>
- </div>
-</div>
-
-<div id="Management" class="tab-content">
- <div class="content">
- <<includeDOM arcmgmt()>>
- </div>
-</div>
-
-<<if $FSAnnounced > 0>>
- <div id="Societies" class="tab-content">
- <div class="content">
- <<include "FS Developments">>
- </div>
- </div>
-<</if>>
-<<if $corp.Incorporated == 1>>
- <div id="Corporation" class="tab-content">
- <div class="content">
- <<include "Corporation Developments">>
+<<else>>
+ <body>
+ <div class="tab-bar">
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Management')">Arcology Management</button>
+ <<if $FSAnnounced > 0>>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Societies')">Society Development</button>
+ <</if>>
+ <<if $corp.Incorporated == 1>>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Corporation')">Corporation Developments</button>
+ <</if>>
+ <<if $secExpEnabled > 0>>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Authority')">Authority</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'securityReport')">Security</button>
+ <</if>>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Reputation')">Reputation</button>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Business')">Personal Business</button>
+ <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
+ <button class="tab-links" onclick="App.UI.tabBar.openTab(event, 'Personal')">Personal Notes</button>
+ <</if>>
</div>
- </div>
-<</if>>
-<<if $secExpEnabled > 0>>
- <div id="Authority" class="tab-content">
- <div class="content">
- <<include "authorityReport">>
+ <div id="Arcologies" class="tab-content">
+ <div class="content">
+ <<include "Neighbors Development">>
+ </div>
</div>
- </div>
- <div id="securityReport" class="tab-content">
- <div class="content">
- <<include "securityReport">>
+ <div id="Management" class="tab-content">
+ <div class="content">
+ <<includeDOM App.EndWeek.arcmgmt()>>
+ </div>
</div>
- </div>
-<</if>>
-<div id="Reputation" class="tab-content">
- <div class="content">
- <<includeDOM App.EndWeek.reputation()>>
- </div>
-</div>
-
-<div id="Business" class="tab-content">
- <div class="content">
- <<includeDOM App.EndWeek.personalBusiness()>>
- </div>
-</div>
-
-<<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
- <div id="Personal" class="tab-content">
- <div class="content">
- <<includeDOM App.EndWeek.personalNotes()>>
+ <<if $FSAnnounced > 0>>
+ <div id="Societies" class="tab-content">
+ <div class="content">
+ <<include "FS Developments">>
+ </div>
+ </div>
+ <</if>>
+
+ <<if $corp.Incorporated == 1>>
+ <div id="Corporation" class="tab-content">
+ <div class="content">
+ <<include "Corporation Developments">>
+ </div>
+ </div>
+ <</if>>
+
+ <<if $secExpEnabled > 0>>
+ <div id="Authority" class="tab-content">
+ <div class="content">
+ <<include "authorityReport">>
+ </div>
+ </div>
+
+ <div id="securityReport" class="tab-content">
+ <div class="content">
+ <<include "securityReport">>
+ </div>
+ </div>
+ <</if>>
+
+ <div id="Reputation" class="tab-content">
+ <div class="content">
+ <<includeDOM App.EndWeek.reputation()>>
+ </div>
</div>
- </div>
-<</if>>
-<script>
- document.getElementById("defaultOpen").click();
-</script>
+ <div id="Business" class="tab-content">
+ <div class="content">
+ <<includeDOM App.EndWeek.personalBusiness()>>
+ </div>
+ </div>
-</body>
+ <<if $PC.boobs >= 1000 || $PC.pregKnown == 1 || $playerAging != 0>>
+ <div id="Personal" class="tab-content">
+ <div class="content">
+ <<includeDOM App.EndWeek.personalNotes()>>
+ </div>
+ </div>
+ <</if>>
+
+ <script>
+ document.getElementById("defaultOpen").click();
+ </script>
+ </body>
<</if>>
\ No newline at end of file