diff --git a/Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResourceService.java b/Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResourceService.java
index acb52510f..97b394b69 100644
--- a/Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResourceService.java
+++ b/Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResourceService.java
@@ -73,19 +73,19 @@ public interface ResourceService {
         /**
          * Loaded before page contents.
          */
-        HEAD,
+        PRE_CONTENT,
         /**
-         * Loaded after page contents.
+         * Loaded after library scripts.
          * <p>
          * Recommended for modifying the structure of the page or loading libraries.
          */
-        BODY,
+        PRE_MAIN_SCRIPT,
         /**
          * Loaded after script execution.
          * <p>
          * Recommended for loading data to custom structure on the page.
          */
-        BODY_END
+        AFTER_MAIN_SCRIPT
     }
 
     class Holder {
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java
index 533951e9f..182f59d82 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java
@@ -84,23 +84,23 @@ public class ResourceSvc implements ResourceService {
             return "Error: Given resource did not support WebResource#asString method properly and returned 'null'";
         }
 
-        StringBuilder toHead = byPosition.get(Position.HEAD);
+        StringBuilder toHead = byPosition.get(Position.PRE_CONTENT);
         if (toHead != null) {
             html = StringUtils.replaceOnce(html, "</head>", toHead.append("</head>").toString());
         }
 
-        StringBuilder toBody = byPosition.get(Position.BODY);
+        StringBuilder toBody = byPosition.get(Position.PRE_MAIN_SCRIPT);
         if (toBody != null) {
-            if (StringUtils.contains(html, "<!-- End of Page Wrapper -->")) {
-                html = StringUtils.replaceOnce(html, "<!-- End of Page Wrapper -->", toBody.toString());
+            if (StringUtils.contains(html, "<script id=\"mainScript\"")) {
+                html = StringUtils.replaceOnce(html, "<script id=\"mainScript\"", toBody.append("<script id=\"mainScript\"").toString());
             } else {
-                html = StringUtils.replaceOnce(html, "<body>", toBody.append("<body>").toString());
+                html = StringUtils.replaceOnce(html, "</body>", toBody.append("</body>").toString());
             }
         }
 
-        StringBuilder toBodyEnd = byPosition.get(Position.BODY_END);
+        StringBuilder toBodyEnd = byPosition.get(Position.AFTER_MAIN_SCRIPT);
         if (toBodyEnd != null) {
-            html = StringUtils.replaceOnce(html, "<\body>", toBodyEnd.append("<\body>").toString());
+            html = StringUtils.replaceOnce(html, "</body>", toBodyEnd.append("</body>").toString());
         }
 
         return html;
diff --git a/Plan/common/src/main/resources/assets/plan/web/error.html b/Plan/common/src/main/resources/assets/plan/web/error.html
index eece5956c..bbd269311 100644
--- a/Plan/common/src/main/resources/assets/plan/web/error.html
+++ b/Plan/common/src/main/resources/assets/plan/web/error.html
@@ -245,6 +245,8 @@
 <script src="js/sb-admin-2.js"></script>
 <script src="js/color-selector.js"></script>
 
+<script id="mainScript"></script>
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/Plan/common/src/main/resources/assets/plan/web/network.html b/Plan/common/src/main/resources/assets/plan/web/network.html
index 433df0905..6181d2979 100644
--- a/Plan/common/src/main/resources/assets/plan/web/network.html
+++ b/Plan/common/src/main/resources/assets/plan/web/network.html
@@ -804,7 +804,7 @@
 <script src="./js/graphs.js"></script>
 <script src="./js/network-values.js"></script>
 
-<script>
+<script id="mainScript">
     try {
         setLoadingText('Calculating values..');
         jsonRequest("./v1/network/overview", loadNetworkOverviewValues);
diff --git a/Plan/common/src/main/resources/assets/plan/web/player.html b/Plan/common/src/main/resources/assets/plan/web/player.html
index 82166387e..e12c56c24 100644
--- a/Plan/common/src/main/resources/assets/plan/web/player.html
+++ b/Plan/common/src/main/resources/assets/plan/web/player.html
@@ -726,7 +726,7 @@
 <script src="../js/graphs.js"></script>
 <script src="../js/player-values.js"></script>
 
-<script>
+<script id="mainScript">
     try {
         Highcharts.setOptions({
             lang: {noData: "No Data to Display"}, time: {timezoneOffset: ${timeZone} * 60}
diff --git a/Plan/common/src/main/resources/assets/plan/web/players.html b/Plan/common/src/main/resources/assets/plan/web/players.html
index d66bc7539..04308db25 100644
--- a/Plan/common/src/main/resources/assets/plan/web/players.html
+++ b/Plan/common/src/main/resources/assets/plan/web/players.html
@@ -260,7 +260,7 @@
 <script src="js/xmlhttprequests.js"></script>
 <script src="js/color-selector.js"></script>
 
-<script>
+<script id="mainScript">
     try {
         jsonRequest("./v1/players", function (playersTableJson, error) {
             if (playersTableJson) {
diff --git a/Plan/common/src/main/resources/assets/plan/web/server.html b/Plan/common/src/main/resources/assets/plan/web/server.html
index 26fcfece7..4fa51bce9 100644
--- a/Plan/common/src/main/resources/assets/plan/web/server.html
+++ b/Plan/common/src/main/resources/assets/plan/web/server.html
@@ -1282,7 +1282,7 @@
 <script src="../js/graphs.js"></script>
 <script src="../js/server-values.js"></script>
 
-<script>
+<script id="mainScript">
     try {
         setLoadingText('Calculating values..');
         jsonRequest("../v1/serverOverview?server=${serverUUID}", loadserverOverviewValues);
