diff --git a/src/routes/market-mover/+layout.server.ts b/src/routes/market-mover/active/+layout.server.ts
similarity index 60%
rename from src/routes/market-mover/+layout.server.ts
rename to src/routes/market-mover/active/+layout.server.ts
index 0a4e2fea..9be31975 100644
--- a/src/routes/market-mover/+layout.server.ts
+++ b/src/routes/market-mover/active/+layout.server.ts
@@ -1,22 +1,26 @@
-export const load = async ({ locals }) => {
-  const { apiURL, apiKey } = locals;
-
-  const getMarketMover = async () => {
-    const response = await fetch(apiURL + "/market-movers", {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-        "X-API-KEY": apiKey,
-      },
-    });
-
-    const output = await response.json();
-
-    return output;
-  };
-
-
-  return {
-    getMarketMover: await getMarketMover(),
-  };
-};
+export const load = async ({ locals, setHeaders }) => {
+  const { apiURL, apiKey } = locals;
+
+  const getMarketMover = async () => {
+  const postData = {'params': 'active'};
+
+    const response = await fetch(apiURL + "/market-movers", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData)
+    });
+
+    const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
+
+    return output;
+  };
+
+
+  return {
+    getMarketMover: await getMarketMover(),
+  };
+};
diff --git a/src/routes/market-mover/active/+page.svelte b/src/routes/market-mover/active/+page.svelte
index b7339584..94cacd09 100644
--- a/src/routes/market-mover/active/+page.svelte
+++ b/src/routes/market-mover/active/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["1D"];
+  let rawData = data?.getMarketMover["1D"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/active/3Y/+page.svelte b/src/routes/market-mover/active/3Y/+page.svelte
index 3ae139ff..446d965a 100644
--- a/src/routes/market-mover/active/3Y/+page.svelte
+++ b/src/routes/market-mover/active/3Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["3Y"];
+  let rawData = data?.getMarketMover["3Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/active/5Y/+page.svelte b/src/routes/market-mover/active/5Y/+page.svelte
index 26db1a19..ae05cfbf 100644
--- a/src/routes/market-mover/active/5Y/+page.svelte
+++ b/src/routes/market-mover/active/5Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["5Y"];
+  let rawData = data?.getMarketMover["5Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/active/month/+page.svelte b/src/routes/market-mover/active/month/+page.svelte
index 234144fd..ea4f442a 100644
--- a/src/routes/market-mover/active/month/+page.svelte
+++ b/src/routes/market-mover/active/month/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["1M"];
+  let rawData = data?.getMarketMover["1M"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/active/week/+page.svelte b/src/routes/market-mover/active/week/+page.svelte
index 4b04d464..c150e028 100644
--- a/src/routes/market-mover/active/week/+page.svelte
+++ b/src/routes/market-mover/active/week/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["1W"];
+  let rawData = data?.getMarketMover["1W"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/active/year/+page.svelte b/src/routes/market-mover/active/year/+page.svelte
index 90252fc4..22bd5fed 100644
--- a/src/routes/market-mover/active/year/+page.svelte
+++ b/src/routes/market-mover/active/year/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.active["1Y"];
+  let rawData = data?.getMarketMover["1Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/afterhours/gainers/+layout.server.ts b/src/routes/market-mover/afterhours/gainers/+layout.server.ts
new file mode 100644
index 00000000..c44fdf93
--- /dev/null
+++ b/src/routes/market-mover/afterhours/gainers/+layout.server.ts
@@ -0,0 +1,25 @@
+export const load = async ({ locals, setHeaders }) => {
+  const { apiURL, apiKey } = locals;
+
+
+  const getMarketMover = async () => {
+    const postData = { category: "afterhours", params: 'gainers' };
+    const response = await fetch(apiURL + "/pre-after-market-movers", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData),
+    });
+
+    const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
+
+    return output;
+  };
+
+  return {
+    getMarketMover: await getMarketMover(),
+  };
+};
diff --git a/src/routes/market-mover/afterhours/gainers/+page.svelte b/src/routes/market-mover/afterhours/gainers/+page.svelte
index a009f985..93413b43 100644
--- a/src/routes/market-mover/afterhours/gainers/+page.svelte
+++ b/src/routes/market-mover/afterhours/gainers/+page.svelte
@@ -2,7 +2,7 @@
   import Table from "$lib/components/Table/Table.svelte";
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers;
+  let rawData = data?.getMarketMover;
 
   const excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/premarket/+layout.server.ts b/src/routes/market-mover/afterhours/losers/+layout.server.ts
similarity index 68%
rename from src/routes/market-mover/premarket/+layout.server.ts
rename to src/routes/market-mover/afterhours/losers/+layout.server.ts
index bb85deb1..a571798a 100644
--- a/src/routes/market-mover/premarket/+layout.server.ts
+++ b/src/routes/market-mover/afterhours/losers/+layout.server.ts
@@ -1,9 +1,9 @@
-export const load = async ({ locals }) => {
+export const load = async ({ locals, setHeaders }) => {
   const { apiURL, apiKey } = locals;
 
 
   const getMarketMover = async () => {
-    const postData = { params: "premarket" };
+    const postData = { category: "afterhours", params: 'losers' };
     const response = await fetch(apiURL + "/pre-after-market-movers", {
       method: "POST",
       headers: {
@@ -14,6 +14,7 @@ export const load = async ({ locals }) => {
     });
 
     const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
 
     return output;
   };
diff --git a/src/routes/market-mover/afterhours/losers/+page.svelte b/src/routes/market-mover/afterhours/losers/+page.svelte
index 84147fdf..93413b43 100644
--- a/src/routes/market-mover/afterhours/losers/+page.svelte
+++ b/src/routes/market-mover/afterhours/losers/+page.svelte
@@ -2,7 +2,7 @@
   import Table from "$lib/components/Table/Table.svelte";
   export let data;
 
-  let rawData = data?.getMarketMover?.losers;
+  let rawData = data?.getMarketMover;
 
   const excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/+layout.server.ts b/src/routes/market-mover/gainers/+layout.server.ts
new file mode 100644
index 00000000..300f6191
--- /dev/null
+++ b/src/routes/market-mover/gainers/+layout.server.ts
@@ -0,0 +1,26 @@
+export const load = async ({ locals, setHeaders }) => {
+  const { apiURL, apiKey } = locals;
+
+  const getMarketMover = async () => {
+  const postData = {'params': 'gainers'};
+
+    const response = await fetch(apiURL + "/market-movers", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData)
+    });
+
+    const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
+
+    return output;
+  };
+
+
+  return {
+    getMarketMover: await getMarketMover(),
+  };
+};
diff --git a/src/routes/market-mover/gainers/+page.svelte b/src/routes/market-mover/gainers/+page.svelte
index 053a5829..94cacd09 100644
--- a/src/routes/market-mover/gainers/+page.svelte
+++ b/src/routes/market-mover/gainers/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["1D"];
+  let rawData = data?.getMarketMover["1D"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/3Y/+page.svelte b/src/routes/market-mover/gainers/3Y/+page.svelte
index 70096ea3..446d965a 100644
--- a/src/routes/market-mover/gainers/3Y/+page.svelte
+++ b/src/routes/market-mover/gainers/3Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["3Y"];
+  let rawData = data?.getMarketMover["3Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/5Y/+page.svelte b/src/routes/market-mover/gainers/5Y/+page.svelte
index 11e17dcd..ae05cfbf 100644
--- a/src/routes/market-mover/gainers/5Y/+page.svelte
+++ b/src/routes/market-mover/gainers/5Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["5Y"];
+  let rawData = data?.getMarketMover["5Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/month/+page.svelte b/src/routes/market-mover/gainers/month/+page.svelte
index 19c481b1..ea4f442a 100644
--- a/src/routes/market-mover/gainers/month/+page.svelte
+++ b/src/routes/market-mover/gainers/month/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["1M"];
+  let rawData = data?.getMarketMover["1M"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/week/+page.svelte b/src/routes/market-mover/gainers/week/+page.svelte
index 17be203b..c150e028 100644
--- a/src/routes/market-mover/gainers/week/+page.svelte
+++ b/src/routes/market-mover/gainers/week/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["1W"];
+  let rawData = data?.getMarketMover["1W"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/gainers/year/+page.svelte b/src/routes/market-mover/gainers/year/+page.svelte
index 502d85ea..22bd5fed 100644
--- a/src/routes/market-mover/gainers/year/+page.svelte
+++ b/src/routes/market-mover/gainers/year/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers["1Y"];
+  let rawData = data?.getMarketMover["1Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/+layout.server.ts b/src/routes/market-mover/losers/+layout.server.ts
new file mode 100644
index 00000000..5a6ff335
--- /dev/null
+++ b/src/routes/market-mover/losers/+layout.server.ts
@@ -0,0 +1,26 @@
+export const load = async ({ locals, setHeaders }) => {
+  const { apiURL, apiKey } = locals;
+
+  const getMarketMover = async () => {
+  const postData = {'params': 'losers'};
+
+    const response = await fetch(apiURL + "/market-movers", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData)
+    });
+
+    const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
+
+    return output;
+  };
+
+
+  return {
+    getMarketMover: await getMarketMover(),
+  };
+};
diff --git a/src/routes/market-mover/losers/+page.svelte b/src/routes/market-mover/losers/+page.svelte
index 2a90eca2..94cacd09 100644
--- a/src/routes/market-mover/losers/+page.svelte
+++ b/src/routes/market-mover/losers/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["1D"];
+  let rawData = data?.getMarketMover["1D"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/3Y/+page.svelte b/src/routes/market-mover/losers/3Y/+page.svelte
index 316f326a..446d965a 100644
--- a/src/routes/market-mover/losers/3Y/+page.svelte
+++ b/src/routes/market-mover/losers/3Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["3Y"];
+  let rawData = data?.getMarketMover["3Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/5Y/+page.svelte b/src/routes/market-mover/losers/5Y/+page.svelte
index b3fb4652..ae05cfbf 100644
--- a/src/routes/market-mover/losers/5Y/+page.svelte
+++ b/src/routes/market-mover/losers/5Y/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["5Y"];
+  let rawData = data?.getMarketMover["5Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/month/+page.svelte b/src/routes/market-mover/losers/month/+page.svelte
index 43f4b425..ea4f442a 100644
--- a/src/routes/market-mover/losers/month/+page.svelte
+++ b/src/routes/market-mover/losers/month/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["1M"];
+  let rawData = data?.getMarketMover["1M"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/week/+page.svelte b/src/routes/market-mover/losers/week/+page.svelte
index 384b0d00..c150e028 100644
--- a/src/routes/market-mover/losers/week/+page.svelte
+++ b/src/routes/market-mover/losers/week/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["1W"];
+  let rawData = data?.getMarketMover["1W"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/losers/year/+page.svelte b/src/routes/market-mover/losers/year/+page.svelte
index d211d6e9..22bd5fed 100644
--- a/src/routes/market-mover/losers/year/+page.svelte
+++ b/src/routes/market-mover/losers/year/+page.svelte
@@ -3,7 +3,7 @@
 
   export let data;
 
-  let rawData = data?.getMarketMover?.losers["1Y"];
+  let rawData = data?.getMarketMover["1Y"];
 
   let excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/premarket/gainers/+layout.server.ts b/src/routes/market-mover/premarket/gainers/+layout.server.ts
new file mode 100644
index 00000000..c9c9325e
--- /dev/null
+++ b/src/routes/market-mover/premarket/gainers/+layout.server.ts
@@ -0,0 +1,25 @@
+export const load = async ({ locals, setHeaders }) => {
+  const { apiURL, apiKey } = locals;
+
+
+  const getMarketMover = async () => {
+    const postData = { category: "premarket", params: 'gainers' };
+    const response = await fetch(apiURL + "/pre-after-market-movers", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData),
+    });
+
+    const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
+
+    return output;
+  };
+
+  return {
+    getMarketMover: await getMarketMover(),
+  };
+};
diff --git a/src/routes/market-mover/premarket/gainers/+page.svelte b/src/routes/market-mover/premarket/gainers/+page.svelte
index a009f985..7b34846c 100644
--- a/src/routes/market-mover/premarket/gainers/+page.svelte
+++ b/src/routes/market-mover/premarket/gainers/+page.svelte
@@ -2,7 +2,7 @@
   import Table from "$lib/components/Table/Table.svelte";
   export let data;
 
-  let rawData = data?.getMarketMover?.gainers;
+  let rawData = data?.getMarketMover || [];
 
   const excludedRules = new Set([
     "volume",
diff --git a/src/routes/market-mover/afterhours/+layout.server.ts b/src/routes/market-mover/premarket/losers/+layout.server.ts
similarity index 68%
rename from src/routes/market-mover/afterhours/+layout.server.ts
rename to src/routes/market-mover/premarket/losers/+layout.server.ts
index 2b11be24..33de4ce6 100644
--- a/src/routes/market-mover/afterhours/+layout.server.ts
+++ b/src/routes/market-mover/premarket/losers/+layout.server.ts
@@ -1,9 +1,9 @@
-export const load = async ({ locals }) => {
+export const load = async ({ locals, setHeaders }) => {
   const { apiURL, apiKey } = locals;
 
 
   const getMarketMover = async () => {
-    const postData = { params: "afterhours" };
+    const postData = { category: "premarket", params: 'losers' };
     const response = await fetch(apiURL + "/pre-after-market-movers", {
       method: "POST",
       headers: {
@@ -14,6 +14,7 @@ export const load = async ({ locals }) => {
     });
 
     const output = await response.json();
+    setHeaders({ "cache-control": "public, max-age=60*5" });
 
     return output;
   };
diff --git a/src/routes/market-mover/premarket/losers/+page.svelte b/src/routes/market-mover/premarket/losers/+page.svelte
index 84147fdf..7b34846c 100644
--- a/src/routes/market-mover/premarket/losers/+page.svelte
+++ b/src/routes/market-mover/premarket/losers/+page.svelte
@@ -2,7 +2,7 @@
   import Table from "$lib/components/Table/Table.svelte";
   export let data;
 
-  let rawData = data?.getMarketMover?.losers;
+  let rawData = data?.getMarketMover || [];
 
   const excludedRules = new Set([
     "volume",