diff --git a/src/lib/components/Options/GreekByExpiry.svelte b/src/lib/components/Options/GreekByExpiry.svelte
new file mode 100644
index 00000000..226d868c
--- /dev/null
+++ b/src/lib/components/Options/GreekByExpiry.svelte
@@ -0,0 +1,362 @@
+<script lang="ts">
+  import { abbreviateNumberWithColor } from "$lib/utils";
+  import { screenWidth } from "$lib/store";
+  import { onMount } from "svelte";
+  import TableHeader from "$lib/components/Table/TableHeader.svelte";
+  import UpgradeToPro from "$lib/components/UpgradeToPro.svelte";
+  import { Chart } from "svelte-echarts";
+
+  import { init, use } from "echarts/core";
+  import { LineChart, BarChart } from "echarts/charts";
+  import {
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+  } from "echarts/components";
+  import { CanvasRenderer } from "echarts/renderers";
+
+  use([
+    LineChart,
+    BarChart,
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+    CanvasRenderer,
+  ]);
+
+  export let data;
+  export let title;
+
+  let rawData = data?.getData || [];
+
+  rawData = rawData?.map((item) => ({
+    ...item,
+    net_gex: (item?.call_gex || 0) + (item?.put_gex || 0),
+    put_call_ratio:
+      item?.call_gex > 0
+        ? Math.abs((item?.put_gex || 0) / item?.call_gex)
+        : null,
+  }));
+
+  let displayList = rawData?.slice(0, 150);
+  let options = null;
+
+  function formatDate(dateString) {
+    if (!dateString) return null; // Handle null or undefined input
+    const date = new Date(dateString);
+    const formatter = new Intl.DateTimeFormat("en-US", {
+      month: "short",
+      day: "numeric",
+      year: "2-digit",
+    });
+    return formatter.format(date);
+  }
+
+  function plotData() {
+    // Process and sort data by strike in descending order
+    const processedData = rawData
+      ?.map((d) => ({
+        expiry: formatDate(d?.expiry),
+        callGamma: d?.call_gex,
+        putGamma: d?.put_gex,
+        netGamma: d?.net_gex,
+      }))
+      .sort((a, b) => a.strike - b.strike);
+
+    const expiries = processedData.map((d) => d.expiry);
+    const callGamma = processedData.map((d) => d.callGamma?.toFixed(2));
+    const putGamma = processedData.map((d) => d.putGamma?.toFixed(2));
+    const netGamma = processedData.map((d) => d.netGamma?.toFixed(2));
+
+    const options = {
+      animation: false,
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          type: "shadow",
+        },
+        backgroundColor: "#313131",
+        textStyle: {
+          color: "#fff",
+        },
+        formatter: function (params) {
+          const expiry = params[0].axisValue;
+          const put = params[0].data;
+          const call = params[1].data;
+          const net = params[2].data;
+
+          return `
+          <div style="text-align:left;">
+            <b>Expiry:</b> ${expiry}<br/>
+            <span style="color:#9B5DC4;">● Put Gamma:</span> ${abbreviateNumberWithColor(put, false, true)}<br/>
+            <span style="color:#C4E916;">● Call Gamma:</span> ${abbreviateNumberWithColor(call, false, true)}<br/>
+            <span style="color:#FF2F1F;">● Net Gamma:</span> ${abbreviateNumberWithColor(net, false, true)}<br/>
+          </div>`;
+        },
+      },
+      grid: {
+        left: $screenWidth < 640 ? "5%" : "1%",
+        right: $screenWidth < 640 ? "5%" : "0%",
+        bottom: "10%",
+        containLabel: true,
+      },
+      xAxis: {
+        type: "value",
+        name: "Gamma",
+        nameTextStyle: { color: "#fff" },
+        splitLine: { show: false },
+        axisLabel: {
+          show: false, // Hide y-axis labels
+        },
+      },
+      yAxis: {
+        type: "category",
+        data: expiries,
+        axisLine: { lineStyle: { color: "#fff" } },
+        axisLabel: { color: "#fff" },
+        splitLine: { show: false },
+      },
+      series: [
+        {
+          name: "Put Gamma",
+          type: "bar",
+          data: putGamma,
+          stack: "gamma",
+          itemStyle: { color: "#9B5DC4" },
+          barWidth: "40%",
+        },
+        {
+          name: "Net Gamma",
+          type: "bar",
+          data: netGamma,
+          stack: "gamma",
+          itemStyle: { color: "#FF2F1F" },
+        },
+        {
+          name: "Call Gamma",
+          type: "bar",
+          data: callGamma,
+          stack: "gamma",
+          itemStyle: { color: "#C4E916" },
+        },
+      ],
+    };
+
+    return options;
+  }
+
+  async function handleScroll() {
+    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
+    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
+
+    if (isBottom && displayList?.length !== rawData?.length) {
+      const nextIndex = displayList?.length;
+      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
+      displayList = [...displayList, ...filteredNewResults];
+    }
+  }
+
+  onMount(() => {
+    window.addEventListener("scroll", handleScroll);
+    return () => {
+      window.removeEventListener("scroll", handleScroll);
+    };
+  });
+
+  $: columns = [
+    { key: "expiry", label: "Expiry Date", align: "left" },
+    { key: "call_gex", label: "Call GEX", align: "right" },
+    { key: "put_gex", label: "Put GEX", align: "right" },
+    { key: "net_gex", label: "Net GEX", align: "right" },
+    { key: "put_call_ratio", label: "P/C GEX", align: "right" },
+  ];
+
+  $: sortOrders = {
+    expiry: { order: "none", type: "date" },
+    call_gex: { order: "none", type: "number" },
+    put_gex: { order: "none", type: "number" },
+    net_gex: { order: "none", type: "number" },
+    put_call_ratio: { order: "none", type: "number" },
+  };
+
+  const sortData = (key) => {
+    // Reset all other keys to 'none' except the current key
+    for (const k in sortOrders) {
+      if (k !== key) {
+        sortOrders[k].order = "none";
+      }
+    }
+
+    // Cycle through 'none', 'asc', 'desc' for the clicked key
+    const orderCycle = ["none", "asc", "desc"];
+    let originalData = rawData;
+    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
+    sortOrders[key].order =
+      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
+    const sortOrder = sortOrders[key].order;
+
+    // Reset to original data when 'none' and stop further sorting
+    if (sortOrder === "none") {
+      originalData = [...rawData]; // Reset originalData to rawDataVolume
+      displayList = originalData;
+      return;
+    }
+
+    // Define a generic comparison function
+    const compareValues = (a, b) => {
+      const { type } = sortOrders[key];
+      let valueA, valueB;
+
+      switch (type) {
+        case "date":
+          valueA = new Date(a[key]);
+          valueB = new Date(b[key]);
+          break;
+        case "string":
+          valueA = a[key].toUpperCase();
+          valueB = b[key].toUpperCase();
+          return sortOrder === "asc"
+            ? valueA.localeCompare(valueB)
+            : valueB.localeCompare(valueA);
+        case "number":
+        default:
+          valueA = parseFloat(a[key]);
+          valueB = parseFloat(b[key]);
+          break;
+      }
+
+      if (sortOrder === "asc") {
+        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
+      } else {
+        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
+      }
+    };
+
+    // Sort using the generic comparison function
+    displayList = [...originalData].sort(compareValues);
+  };
+
+  $: {
+    if (typeof window !== "undefined") {
+      options = plotData();
+    }
+  }
+</script>
+
+<div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
+  <h2
+    class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
+  >
+    Gamma Exposure By Expiry
+  </h2>
+
+  <div class="w-full overflow-hidden m-auto">
+    {#if options !== null}
+      <div class="app w-full relative">
+        <Chart {init} {options} class="chart" />
+      </div>
+    {:else}
+      <div class="flex justify-center items-center h-80">
+        <div class="relative">
+          <label
+            class="bg-primary rounded-md h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
+          >
+            <span
+              class="loading loading-spinner loading-md sm:loading-[1rem] text-gray-400"
+            ></span>
+          </label>
+        </div>
+      </div>
+    {/if}
+  </div>
+  <div class="w-full overflow-x-scroll text-white">
+    <table
+      class="w-full table table-sm table-compact bg-table border border-gray-800 rounded-none sm:rounded-md m-auto overflow-x-auto"
+    >
+      <thead>
+        <TableHeader {columns} {sortOrders} {sortData} />
+      </thead>
+      <tbody>
+        {#each data?.user?.tier === "Pro" ? displayList : displayList?.slice(0, 3) as item, index}
+          <tr
+            class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-odd border-b border-gray-800 {index +
+              1 ===
+              displayList?.slice(0, 3)?.length && data?.user?.tier !== 'Pro'
+              ? 'opacity-[0.1]'
+              : ''}"
+          >
+            <td
+              class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
+            >
+              {formatDate(item?.expiry)}
+            </td>
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.call_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.put_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.net_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {#if item?.put_call_ratio <= 1 && item?.put_call_ratio !== null}
+                <span class="text-[#00FC50]"
+                  >{item?.put_call_ratio?.toFixed(2)}</span
+                >
+              {:else if item?.put_call_ratio > 1 && item?.put_call_ratio !== null}
+                <span class="text-[#FF2F1F]"
+                  >{item?.put_call_ratio?.toFixed(2)}</span
+                >
+              {:else}
+                n/a
+              {/if}
+            </td>
+          </tr>
+        {/each}
+      </tbody>
+    </table>
+  </div>
+
+  <UpgradeToPro {data} />
+</div>
+
+<style>
+  .app {
+    height: 600px;
+    width: 100%;
+  }
+
+  @media (max-width: 560px) {
+    .app {
+      width: 100%;
+      height: 500px;
+    }
+  }
+
+  .chart {
+    width: 100%;
+  }
+</style>
diff --git a/src/lib/components/Options/GreekByStrike.svelte b/src/lib/components/Options/GreekByStrike.svelte
new file mode 100644
index 00000000..1e922b8d
--- /dev/null
+++ b/src/lib/components/Options/GreekByStrike.svelte
@@ -0,0 +1,350 @@
+<script lang="ts">
+  import { abbreviateNumberWithColor } from "$lib/utils";
+  import { screenWidth } from "$lib/store";
+  import { onMount } from "svelte";
+  import TableHeader from "$lib/components/Table/TableHeader.svelte";
+  import UpgradeToPro from "$lib/components/UpgradeToPro.svelte";
+  import { Chart } from "svelte-echarts";
+
+  import { init, use } from "echarts/core";
+  import { LineChart, BarChart } from "echarts/charts";
+  import {
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+  } from "echarts/components";
+  import { CanvasRenderer } from "echarts/renderers";
+
+  use([
+    LineChart,
+    BarChart,
+    GridComponent,
+    TooltipComponent,
+    LegendComponent,
+    CanvasRenderer,
+  ]);
+
+  export let data;
+  export let title;
+
+  let rawData = data?.getData || [];
+
+  rawData = rawData?.map((item) => ({
+    ...item,
+    net_gex: (item?.call_gex || 0) + (item?.put_gex || 0),
+    put_call_ratio:
+      item?.call_gex > 0
+        ? Math.abs((item?.put_gex || 0) / item?.call_gex)
+        : null,
+  }));
+
+  let displayList = rawData?.slice(0, 150);
+  let options = null;
+
+  function plotData() {
+    // Process and sort data by strike in descending order
+    const processedData = rawData
+      ?.map((d) => ({
+        strike: d?.strike,
+        callGamma: d?.call_gex,
+        putGamma: d?.put_gex,
+        netGamma: d?.net_gex,
+      }))
+      .sort((a, b) => a.strike - b.strike);
+
+    const strikes = processedData.map((d) => d.strike);
+    const callGamma = processedData.map((d) => d.callGamma?.toFixed(2));
+    const putGamma = processedData.map((d) => d.putGamma?.toFixed(2));
+    const netGamma = processedData.map((d) => d.netGamma?.toFixed(2));
+
+    const options = {
+      animation: false,
+      tooltip: {
+        trigger: "axis",
+        axisPointer: {
+          type: "shadow",
+        },
+        backgroundColor: "#313131",
+        textStyle: {
+          color: "#fff",
+        },
+        formatter: function (params) {
+          const strike = params[0].axisValue;
+          const put = params[0].data;
+          const call = params[1].data;
+          const net = params[2].data;
+
+          return `
+          <div style="text-align:left;">
+            <b>Strike:</b> ${strike}<br/>
+            <span style="color:#9B5DC4;">● Put Gamma:</span> ${abbreviateNumberWithColor(put, false, true)}<br/>
+            <span style="color:#C4E916;">● Call Gamma:</span> ${abbreviateNumberWithColor(call, false, true)}<br/>
+            <span style="color:#FF2F1F;">● Net Gamma:</span> ${abbreviateNumberWithColor(net, false, true)}<br/>
+          </div>`;
+        },
+      },
+      grid: {
+        left: $screenWidth < 640 ? "5%" : "0%",
+        right: $screenWidth < 640 ? "5%" : "0%",
+        bottom: "5%",
+        containLabel: true,
+      },
+      xAxis: {
+        type: "value",
+        name: "Gamma",
+        nameTextStyle: { color: "#fff" },
+        splitLine: { show: false },
+        axisLabel: {
+          show: false, // Hide y-axis labels
+        },
+      },
+      yAxis: {
+        type: "category",
+        data: strikes,
+        axisLine: { lineStyle: { color: "#fff" } },
+        axisLabel: { color: "#fff" },
+        splitLine: { show: false },
+      },
+      series: [
+        {
+          name: "Put Gamma",
+          type: "bar",
+          data: putGamma,
+          stack: "gamma",
+          itemStyle: { color: "#9B5DC4" },
+        },
+        {
+          name: "Net Gamma",
+          type: "bar",
+          data: netGamma,
+          stack: "gamma",
+          itemStyle: { color: "#FF2F1F" },
+        },
+        {
+          name: "Call Gamma",
+          type: "bar",
+          data: callGamma,
+          stack: "gamma",
+          itemStyle: { color: "#C4E916" },
+        },
+      ],
+    };
+
+    return options;
+  }
+
+  async function handleScroll() {
+    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
+    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
+
+    if (isBottom && displayList?.length !== rawData?.length) {
+      const nextIndex = displayList?.length;
+      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
+      displayList = [...displayList, ...filteredNewResults];
+    }
+  }
+
+  onMount(() => {
+    window.addEventListener("scroll", handleScroll);
+    return () => {
+      window.removeEventListener("scroll", handleScroll);
+    };
+  });
+
+  $: columns = [
+    { key: "strike", label: "Strike Price", align: "left" },
+    { key: "call_gex", label: "Call GEX", align: "right" },
+    { key: "put_gex", label: "Put GEX", align: "right" },
+    { key: "net_gex", label: "Net GEX", align: "right" },
+    { key: "put_call_ratio", label: "P/C GEX", align: "right" },
+  ];
+
+  $: sortOrders = {
+    strike: { order: "none", type: "number" },
+    call_gex: { order: "none", type: "number" },
+    put_gex: { order: "none", type: "number" },
+    net_gex: { order: "none", type: "number" },
+    put_call_ratio: { order: "none", type: "number" },
+  };
+
+  const sortData = (key) => {
+    // Reset all other keys to 'none' except the current key
+    for (const k in sortOrders) {
+      if (k !== key) {
+        sortOrders[k].order = "none";
+      }
+    }
+
+    // Cycle through 'none', 'asc', 'desc' for the clicked key
+    const orderCycle = ["none", "asc", "desc"];
+    let originalData = rawData;
+    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
+    sortOrders[key].order =
+      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
+    const sortOrder = sortOrders[key].order;
+
+    // Reset to original data when 'none' and stop further sorting
+    if (sortOrder === "none") {
+      originalData = [...rawData]; // Reset originalData to rawDataVolume
+      displayList = originalData;
+      return;
+    }
+
+    // Define a generic comparison function
+    const compareValues = (a, b) => {
+      const { type } = sortOrders[key];
+      let valueA, valueB;
+
+      switch (type) {
+        case "date":
+          valueA = new Date(a[key]);
+          valueB = new Date(b[key]);
+          break;
+        case "string":
+          valueA = a[key].toUpperCase();
+          valueB = b[key].toUpperCase();
+          return sortOrder === "asc"
+            ? valueA.localeCompare(valueB)
+            : valueB.localeCompare(valueA);
+        case "number":
+        default:
+          valueA = parseFloat(a[key]);
+          valueB = parseFloat(b[key]);
+          break;
+      }
+
+      if (sortOrder === "asc") {
+        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
+      } else {
+        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
+      }
+    };
+
+    // Sort using the generic comparison function
+    displayList = [...originalData].sort(compareValues);
+  };
+
+  $: {
+    if (typeof window !== "undefined") {
+      options = plotData();
+    }
+  }
+</script>
+
+<div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
+  <h2
+    class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
+  >
+    {title} Exposure By Strike
+  </h2>
+
+  <div class="w-full overflow-hidden m-auto">
+    {#if options !== null}
+      <div class="app w-full relative">
+        <Chart {init} {options} class="chart" />
+      </div>
+    {:else}
+      <div class="flex justify-center items-center h-80">
+        <div class="relative">
+          <label
+            class="bg-primary rounded-md h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
+          >
+            <span
+              class="loading loading-spinner loading-md sm:loading-[1rem] text-gray-400"
+            ></span>
+          </label>
+        </div>
+      </div>
+    {/if}
+  </div>
+  <div class="w-full overflow-x-scroll text-white">
+    <table
+      class="w-full table table-sm table-compact bg-table border border-gray-800 rounded-none sm:rounded-md m-auto overflow-x-auto"
+    >
+      <thead>
+        <TableHeader {columns} {sortOrders} {sortData} />
+      </thead>
+      <tbody>
+        {#each data?.user?.tier === "Pro" ? displayList : displayList?.slice(0, 3) as item, index}
+          <tr
+            class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-odd border-b border-gray-800 {index +
+              1 ===
+              displayList?.slice(0, 3)?.length && data?.user?.tier !== 'Pro'
+              ? 'opacity-[0.1]'
+              : ''}"
+          >
+            <td
+              class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
+            >
+              {item?.strike?.toFixed(2)}
+            </td>
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.call_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.put_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {@html abbreviateNumberWithColor(
+                item?.net_gex?.toFixed(2),
+                false,
+                true,
+              )}
+            </td>
+
+            <td
+              class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+            >
+              {#if item?.put_call_ratio <= 1 && item?.put_call_ratio !== null}
+                <span class="text-[#00FC50]"
+                  >{item?.put_call_ratio?.toFixed(2)}</span
+                >
+              {:else if item?.put_call_ratio > 1 && item?.put_call_ratio !== null}
+                <span class="text-[#FF2F1F]"
+                  >{item?.put_call_ratio?.toFixed(2)}</span
+                >
+              {:else}
+                n/a
+              {/if}
+            </td>
+          </tr>
+        {/each}
+      </tbody>
+    </table>
+  </div>
+
+  <UpgradeToPro {data} />
+</div>
+
+<style>
+  .app {
+    height: 1000px;
+    width: 100%;
+  }
+
+  @media (max-width: 560px) {
+    .app {
+      width: 100%;
+      height: 500px;
+    }
+  }
+
+  .chart {
+    width: 100%;
+  }
+</style>
diff --git a/src/lib/components/Options/GreekExposure.svelte b/src/lib/components/Options/GreekExposure.svelte
index 160b2a16..7512c355 100644
--- a/src/lib/components/Options/GreekExposure.svelte
+++ b/src/lib/components/Options/GreekExposure.svelte
@@ -33,14 +33,27 @@
 
   let rawData = data?.getData || [];
 
-  rawData = rawData?.map((item) => ({
-    ...item,
-    net_gamma: (item?.call_gamma || 0) + (item?.put_gamma || 0),
-    put_call_ratio:
-      item?.call_gamma > 0
-        ? Math.abs((item?.put_gamma || 0) / item?.call_gamma)
-        : null,
-  }));
+  rawData = rawData?.map((item) => {
+    if (title === "Gamma") {
+      return {
+        ...item,
+        net_gamma: (item?.call_gamma || 0) + (item?.put_gamma || 0),
+        put_call_ratio:
+          item?.call_gamma > 0
+            ? Math.abs((item?.put_gamma || 0) / item?.call_gamma)
+            : null,
+      };
+    } else {
+      return {
+        ...item,
+        net_delta: (item?.call_delta || 0) + (item?.put_delta || 0),
+        put_call_ratio:
+          item?.call_delta > 0
+            ? Math.abs((item?.put_delta || 0) / item?.call_delta)
+            : null,
+      };
+    }
+  });
 
   let displayList = rawData?.slice(0, 150);
   let timePeriod = "3M";
@@ -84,15 +97,17 @@
 
     // Extract the dates and gamma values from the filtered data
     const dateList = filteredData?.map((item) => item.date);
-    const gammaList = filteredData?.map((item) => item.net_gamma);
+    const dataList = filteredData?.map((item) =>
+      title === "Gamma" ? item.net_gamma : item.net_delta,
+    );
     const priceList = filteredData?.map((item) => item.price);
 
-    return { dateList, gammaList, priceList };
+    return { dateList, dataList, priceList };
   }
 
   function plotData() {
     const data = rawData?.sort((a, b) => new Date(a?.date) - new Date(b?.date));
-    const { dateList, gammaList, priceList } = filterDataByPeriod(
+    const { dateList, dataList, priceList } = filterDataByPeriod(
       data,
       timePeriod,
     );
@@ -197,9 +212,9 @@
           showSymbol: false,
         },
         {
-          name: "Gamma",
+          name: title,
           type: "bar",
-          data: gammaList,
+          data: dataList,
           itemStyle: {
             color: "#9B5DC4",
           },
@@ -248,21 +263,39 @@
     };
   });
 
-  $: columns = [
-    { key: "date", label: "Date", align: "left" },
-    { key: "call_gamma", label: "Call GEX", align: "right" },
-    { key: "put_gamma", label: "Put GEX", align: "right" },
-    { key: "net_gamma", label: "Net GEX", align: "right" },
-    { key: "put_call_ratio", label: "P/C GEX", align: "right" },
-  ];
+  $: columns =
+    title === "Gamma"
+      ? [
+          { key: "date", label: "Date", align: "left" },
+          { key: "call_gamma", label: "Call GEX", align: "right" },
+          { key: "put_gamma", label: "Put GEX", align: "right" },
+          { key: "net_gamma", label: "Net GEX", align: "right" },
+          { key: "put_call_ratio", label: "P/C GEX", align: "right" },
+        ]
+      : [
+          { key: "date", label: "Date", align: "left" },
+          { key: "call_delta", label: "Call Delta", align: "right" },
+          { key: "put_delta", label: "Put Delta", align: "right" },
+          { key: "net_delta", label: "Net Delta", align: "right" },
+          { key: "put_call_ratio", label: "P/C Delta", align: "right" },
+        ];
 
-  $: sortOrders = {
-    date: { order: "none", type: "date" },
-    call_gamma: { order: "none", type: "number" },
-    put_gamma: { order: "none", type: "number" },
-    net_gamma: { order: "none", type: "number" },
-    put_call_ratio: { order: "none", type: "number" },
-  };
+  $: sortOrders =
+    title === "Gamma"
+      ? {
+          date: { order: "none", type: "date" },
+          call_gamma: { order: "none", type: "number" },
+          put_gamma: { order: "none", type: "number" },
+          net_gamma: { order: "none", type: "number" },
+          put_call_ratio: { order: "none", type: "number" },
+        }
+      : {
+          date: { order: "none", type: "date" },
+          call_delta: { order: "none", type: "number" },
+          put_delta: { order: "none", type: "number" },
+          net_delta: { order: "none", type: "number" },
+          put_call_ratio: { order: "none", type: "number" },
+        };
 
   const sortData = (key) => {
     // Reset all other keys to 'none' except the current key
@@ -332,7 +365,7 @@
   <h2
     class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
   >
-    Daily Gamma Exposure
+    Daily {title} Exposure
   </h2>
 
   <div class="w-full overflow-hidden m-auto mt-5">
@@ -391,18 +424,30 @@
             <td
               class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
             >
-              {@html abbreviateNumberWithColor(item?.call_gamma, false, true)}
+              {@html abbreviateNumberWithColor(
+                title === "Gamma" ? item?.call_gamma : item?.call_delta,
+                false,
+                true,
+              )}
             </td>
             <td
               class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
             >
-              {@html abbreviateNumberWithColor(item?.put_gamma, false, true)}
+              {@html abbreviateNumberWithColor(
+                title === "Gamma" ? item?.put_gamma : item?.put_delta,
+                false,
+                true,
+              )}
             </td>
 
             <td
               class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
             >
-              {@html abbreviateNumberWithColor(item?.net_gamma, false, true)}
+              {@html abbreviateNumberWithColor(
+                title === "Gamma" ? item?.net_gamma : item?.net_delta,
+                false,
+                true,
+              )}
             </td>
 
             <td
diff --git a/src/routes/stocks/[tickerID]/options/dex/+page.svelte b/src/routes/stocks/[tickerID]/options/dex/+page.svelte
index 29fc52d3..eea325fd 100644
--- a/src/routes/stocks/[tickerID]/options/dex/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/dex/+page.svelte
@@ -1,335 +1,13 @@
 <script lang="ts">
-  import {
-    abbreviateNumberWithColor,
-    abbreviateNumber,
-    monthNames,
-  } from "$lib/utils";
   import {
     stockTicker,
-    screenWidth,
     numberOfUnreadNotification,
     displayCompanyName,
   } from "$lib/store";
-  import { onMount } from "svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import UpgradeToPro from "$lib/components/UpgradeToPro.svelte";
   import Infobox from "$lib/components/Infobox.svelte";
-  import { Chart } from "svelte-echarts";
-
-  import { init, use } from "echarts/core";
-  import { LineChart, BarChart } from "echarts/charts";
-  import {
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-  } from "echarts/components";
-  import { CanvasRenderer } from "echarts/renderers";
-
-  use([
-    LineChart,
-    BarChart,
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-    CanvasRenderer,
-  ]);
+  import GreekExposure from "$lib/components/Options/GreekExposure.svelte";
 
   export let data;
-  let rawData = data?.getData || [];
-
-  rawData = rawData?.map((item) => ({
-    ...item,
-    net_delta: (item?.call_delta || 0) + (item?.put_delta || 0),
-    put_call_ratio:
-      item?.call_delta > 0
-        ? Math.abs((item?.put_delta || 0) / item?.call_delta)
-        : null,
-  }));
-
-  let displayList = rawData?.slice(0, 150);
-  let timePeriod = "3M";
-
-  let options = null;
-
-  function filterDataByPeriod(historicalData, period = "3M") {
-    const currentDate = new Date();
-    let startDate = new Date();
-
-    // Calculate the start date based on the period input
-    switch (period) {
-      case "3M":
-        startDate.setMonth(currentDate.getMonth() - 3);
-        break;
-      case "6M":
-        startDate.setMonth(currentDate.getMonth() - 6);
-        break;
-      case "1Y":
-        startDate.setFullYear(currentDate.getFullYear() - 1);
-        break;
-      default:
-        throw new Error(`Unsupported period: ${period}`);
-    }
-
-    // Filter the data based on the calculated start date
-    let filteredData = historicalData?.filter((item) => {
-      if (!item?.date) return false;
-      const itemDate = new Date(item.date);
-      return itemDate >= startDate && itemDate <= currentDate;
-    });
-
-    filteredData?.forEach((entry) => {
-      const matchingData = data?.getHistoricalPrice?.find(
-        (d) => d?.time === entry?.date,
-      );
-      if (matchingData) {
-        entry.price = matchingData?.close;
-      }
-    });
-
-    // Extract the dates and gamma values from the filtered data
-    const dateList = filteredData?.map((item) => item.date);
-    const gammaList = filteredData?.map((item) => item.net_delta);
-    const priceList = filteredData?.map((item) => item.price);
-
-    return { dateList, gammaList, priceList };
-  }
-
-  function plotData() {
-    const data = rawData?.sort((a, b) => new Date(a?.date) - new Date(b?.date));
-    const { dateList, gammaList, priceList } = filterDataByPeriod(
-      data,
-      timePeriod,
-    );
-    const options = {
-      animation: false,
-      tooltip: {
-        trigger: "axis",
-        hideDelay: 100,
-        borderColor: "#969696", // Black border color
-        borderWidth: 1, // Border width of 1px
-        backgroundColor: "#313131", // Optional: Set background color for contrast
-        textStyle: {
-          color: "#fff", // Optional: Text color for better visibility
-        },
-        formatter: function (params) {
-          // Get the timestamp from the first parameter
-          const timestamp = params[0].axisValue;
-
-          // Initialize result with timestamp
-          let result = timestamp + "<br/>";
-
-          // Add each series data
-          params?.forEach((param) => {
-            const marker =
-              '<span style="display:inline-block;margin-right:4px;' +
-              "border-radius:10px;width:10px;height:10px;background-color:" +
-              param.color +
-              '"></span>';
-            result +=
-              marker +
-              param.seriesName +
-              ": " +
-              abbreviateNumber(param.value) +
-              "<br/>";
-          });
-
-          return result;
-        },
-        axisPointer: {
-          lineStyle: {
-            color: "#fff",
-          },
-        },
-      },
-      silent: true,
-      grid: {
-        left: $screenWidth < 640 ? "5%" : "0%",
-        right: $screenWidth < 640 ? "5%" : "0%",
-        bottom: "10%",
-        containLabel: true,
-      },
-      xAxis: [
-        {
-          type: "category",
-          data: dateList,
-          axisLabel: {
-            color: "#fff",
-
-            formatter: function (value) {
-              // Assuming dates are in the format 'yyyy-mm-dd'
-              const dateParts = value.split("-");
-              const monthIndex = parseInt(dateParts[1]) - 1; // Months are zero-indexed in JavaScript Date objects
-              const year = parseInt(dateParts[0]);
-              const day = parseInt(dateParts[2]);
-              return `${day} ${monthNames[monthIndex]} ${year}`;
-            },
-          },
-        },
-      ],
-      yAxis: [
-        {
-          type: "value",
-          splitLine: {
-            show: false, // Disable x-axis grid lines
-          },
-          axisLabel: {
-            show: false, // Hide y-axis labels
-          },
-        },
-        {
-          type: "value",
-          splitLine: {
-            show: false, // Disable x-axis grid lines
-          },
-          position: "right",
-          axisLabel: {
-            show: false, // Hide y-axis labels
-          },
-        },
-      ],
-      series: [
-        {
-          name: "Price",
-          type: "line",
-          data: priceList,
-          yAxisIndex: 1,
-          lineStyle: { width: 2 },
-          itemStyle: {
-            color: "#fff",
-          },
-          smooth: true,
-          showSymbol: false,
-        },
-        {
-          name: "Gamma",
-          type: "bar",
-          data: gammaList,
-          itemStyle: {
-            color: "#9B5DC4",
-          },
-        },
-      ],
-    };
-    return options;
-  }
-
-  function formatDate(dateStr) {
-    // Parse the input date string (YYYY-mm-dd)
-    var date = new Date(dateStr);
-
-    // Get month, day, and year
-    var month = date.getMonth() + 1; // Month starts from 0
-    var day = date.getDate();
-    var year = date.getFullYear();
-
-    // Extract the last two digits of the year
-    var shortYear = year.toString().slice(-2);
-
-    // Add leading zeros if necessary
-    month = (month < 10 ? "0" : "") + month;
-    day = (day < 10 ? "0" : "") + day;
-
-    var formattedDate = month + "/" + day + "/" + year;
-
-    return formattedDate;
-  }
-
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-
-    if (isBottom && displayList?.length !== rawData?.length) {
-      const nextIndex = displayList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      displayList = [...displayList, ...filteredNewResults];
-    }
-  }
-
-  onMount(() => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  $: columns = [
-    { key: "date", label: "Date", align: "left" },
-    { key: "call_delta", label: "Call Delta", align: "right" },
-    { key: "put_delta", label: "Put Delta", align: "right" },
-    { key: "net_delta", label: "Net Delta", align: "right" },
-    { key: "put_call_ratio", label: "P/C Delta", align: "right" },
-  ];
-
-  $: sortOrders = {
-    date: { order: "none", type: "date" },
-    call_delta: { order: "none", type: "number" },
-    put_delta: { order: "none", type: "number" },
-    net_delta: { order: "none", type: "number" },
-    put_call_ratio: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-    let originalData = rawData;
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      originalData = [...rawData]; // Reset originalData to rawDataVolume
-      displayList = originalData;
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    displayList = [...originalData].sort(compareValues);
-  };
-
-  $: {
-    if (typeof window !== "undefined" && timePeriod) {
-      options = plotData();
-    }
-  }
 </script>
 
 <svelte:head>
@@ -376,127 +54,10 @@
     <div
       class="w-full relative flex justify-center items-center overflow-hidden"
     >
-      {#if rawData?.length > 0}
-        <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
-          <h2
-            class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
-          >
-            Daily Delta Exposure
-          </h2>
-
-          <div class="w-full overflow-hidden m-auto mt-5">
-            {#if options !== null}
-              <div class="app w-full relative">
-                <div
-                  class="flex justify-start space-x-2 absolute right-0 top-0 z-10"
-                >
-                  {#each ["3M", "6M", "1Y"] as item}
-                    <label
-                      on:click={() => (timePeriod = item)}
-                      class="px-3 py-1 text-sm {timePeriod === item
-                        ? 'bg-white text-black '
-                        : 'text-white bg-table text-opacity-[0.6]'} transition ease-out duration-100 sm:hover:bg-white sm:hover:text-black rounded-md cursor-pointer"
-                    >
-                      {item}
-                    </label>
-                  {/each}
-                </div>
-
-                <Chart {init} {options} class="chart" />
-              </div>
-            {:else}
-              <div class="flex justify-center items-center h-80">
-                <div class="relative">
-                  <label
-                    class="bg-primary rounded-md h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
-                  >
-                    <span
-                      class="loading loading-spinner loading-md sm:loading-[1rem] text-gray-400"
-                    ></span>
-                  </label>
-                </div>
-              </div>
-            {/if}
-          </div>
-          <div class="w-full overflow-x-scroll text-white">
-            <table
-              class="w-full table table-sm table-compact bg-table border border-gray-800 rounded-none sm:rounded-md m-auto overflow-x-auto"
-            >
-              <thead>
-                <TableHeader {columns} {sortOrders} {sortData} />
-              </thead>
-              <tbody>
-                {#each data?.user?.tier === "Pro" ? displayList : displayList?.slice(0, 3) as item, index}
-                  <tr
-                    class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-odd border-b border-gray-800 {index +
-                      1 ===
-                      displayList?.slice(0, 3)?.length &&
-                    data?.user?.tier !== 'Pro'
-                      ? 'opacity-[0.1]'
-                      : ''}"
-                  >
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
-                    >
-                      {formatDate(item?.date)}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.call_delta,
-                        false,
-                        true,
-                      )}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.put_delta,
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.net_delta,
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {#if item?.put_call_ratio <= 1}
-                        <span class="text-[#00FC50]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {:else}
-                        <span class="text-[#FF2F1F]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {/if}
-                    </td>
-                  </tr>
-                {/each}
-              </tbody>
-            </table>
-          </div>
-
-          <UpgradeToPro {data} />
-        </div>
+      {#if data?.getData?.length > 0}
+        <GreekExposure {data} title="Delta" params="" />
       {:else}
         <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
-          <h2
-            class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
-          >
-            Hottest Contracts
-          </h2>
           <div class="mt-2">
             <Infobox text="No data is available" />
           </div>
@@ -505,21 +66,3 @@
     </div>
   </div>
 </section>
-
-<style>
-  .app {
-    height: 400px;
-    width: 100%;
-  }
-
-  @media (max-width: 560px) {
-    .app {
-      width: 100%;
-      height: 300px;
-    }
-  }
-
-  .chart {
-    width: 100%;
-  }
-</style>
diff --git a/src/routes/stocks/[tickerID]/options/gex/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/+page.svelte
index d4d6d53c..70d2a777 100644
--- a/src/routes/stocks/[tickerID]/options/gex/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/+page.svelte
@@ -55,7 +55,7 @@
       class="w-full relative flex justify-center items-center overflow-hidden"
     >
       {#if data?.getData?.length > 0}
-        <GreekExposure {data} title="Gamma" />
+        <GreekExposure {data} title="Gamma" params="" />
       {:else}
         <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
           <div class="mt-2">
diff --git a/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
index 2167c4c9..9c9d1e23 100644
--- a/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
@@ -1,254 +1,15 @@
 <script lang="ts">
-  import {
-    abbreviateNumberWithColor,
-    abbreviateNumber,
-    monthNames,
-  } from "$lib/utils";
   import {
     stockTicker,
-    screenWidth,
     numberOfUnreadNotification,
     displayCompanyName,
   } from "$lib/store";
-  import { onMount } from "svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import UpgradeToPro from "$lib/components/UpgradeToPro.svelte";
+
   import Infobox from "$lib/components/Infobox.svelte";
-  import { Chart } from "svelte-echarts";
-
-  import { init, use } from "echarts/core";
-  import { LineChart, BarChart } from "echarts/charts";
-  import {
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-  } from "echarts/components";
-  import { CanvasRenderer } from "echarts/renderers";
-
-  use([
-    LineChart,
-    BarChart,
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-    CanvasRenderer,
-  ]);
+  import GreekByExpiry from "$lib/components/Options/GreekByExpiry.svelte";
 
   export let data;
   let rawData = data?.getData || [];
-
-  rawData = rawData?.map((item) => ({
-    ...item,
-    net_gex: (item?.call_gex || 0) + (item?.put_gex || 0),
-    put_call_ratio:
-      item?.call_gex > 0
-        ? Math.abs((item?.put_gex || 0) / item?.call_gex)
-        : null,
-  }));
-
-  let displayList = rawData?.slice(0, 150);
-  let options = null;
-
-  function formatDate(dateString) {
-    if (!dateString) return null; // Handle null or undefined input
-    const date = new Date(dateString);
-    const formatter = new Intl.DateTimeFormat("en-US", {
-      month: "short",
-      day: "numeric",
-      year: "2-digit",
-    });
-    return formatter.format(date);
-  }
-
-  function plotData() {
-    // Process and sort data by strike in descending order
-    const processedData = rawData
-      ?.map((d) => ({
-        expiry: formatDate(d?.expiry),
-        callGamma: d?.call_gex,
-        putGamma: d?.put_gex,
-        netGamma: d?.net_gex,
-      }))
-      .sort((a, b) => a.strike - b.strike);
-
-    const expiries = processedData.map((d) => d.expiry);
-    const callGamma = processedData.map((d) => d.callGamma?.toFixed(2));
-    const putGamma = processedData.map((d) => d.putGamma?.toFixed(2));
-    const netGamma = processedData.map((d) => d.netGamma?.toFixed(2));
-
-    const options = {
-      animation: false,
-      tooltip: {
-        trigger: "axis",
-        axisPointer: {
-          type: "shadow",
-        },
-        backgroundColor: "#313131",
-        textStyle: {
-          color: "#fff",
-        },
-        formatter: function (params) {
-          const expiry = params[0].axisValue;
-          const put = params[0].data;
-          const call = params[1].data;
-          const net = params[2].data;
-
-          return `
-          <div style="text-align:left;">
-            <b>Expiry:</b> ${expiry}<br/>
-            <span style="color:#9B5DC4;">● Put Gamma:</span> ${abbreviateNumberWithColor(put, false, true)}<br/>
-            <span style="color:#C4E916;">● Call Gamma:</span> ${abbreviateNumberWithColor(call, false, true)}<br/>
-            <span style="color:#FF2F1F;">● Net Gamma:</span> ${abbreviateNumberWithColor(net, false, true)}<br/>
-          </div>`;
-        },
-      },
-      grid: {
-        left: $screenWidth < 640 ? "5%" : "1%",
-        right: $screenWidth < 640 ? "5%" : "0%",
-        bottom: "10%",
-        containLabel: true,
-      },
-      xAxis: {
-        type: "value",
-        name: "Gamma",
-        nameTextStyle: { color: "#fff" },
-        splitLine: { show: false },
-        axisLabel: {
-          show: false, // Hide y-axis labels
-        },
-      },
-      yAxis: {
-        type: "category",
-        data: expiries,
-        axisLine: { lineStyle: { color: "#fff" } },
-        axisLabel: { color: "#fff" },
-        splitLine: { show: false },
-      },
-      series: [
-        {
-          name: "Put Gamma",
-          type: "bar",
-          data: putGamma,
-          stack: "gamma",
-          itemStyle: { color: "#9B5DC4" },
-          barWidth: "40%",
-        },
-        {
-          name: "Net Gamma",
-          type: "bar",
-          data: netGamma,
-          stack: "gamma",
-          itemStyle: { color: "#FF2F1F" },
-        },
-        {
-          name: "Call Gamma",
-          type: "bar",
-          data: callGamma,
-          stack: "gamma",
-          itemStyle: { color: "#C4E916" },
-        },
-      ],
-    };
-
-    return options;
-  }
-
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-
-    if (isBottom && displayList?.length !== rawData?.length) {
-      const nextIndex = displayList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      displayList = [...displayList, ...filteredNewResults];
-    }
-  }
-
-  onMount(() => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  $: columns = [
-    { key: "expiry", label: "Expiry Date", align: "left" },
-    { key: "call_gex", label: "Call GEX", align: "right" },
-    { key: "put_gex", label: "Put GEX", align: "right" },
-    { key: "net_gex", label: "Net GEX", align: "right" },
-    { key: "put_call_ratio", label: "P/C GEX", align: "right" },
-  ];
-
-  $: sortOrders = {
-    expiry: { order: "none", type: "date" },
-    call_gex: { order: "none", type: "number" },
-    put_gex: { order: "none", type: "number" },
-    net_gex: { order: "none", type: "number" },
-    put_call_ratio: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-    let originalData = rawData;
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      originalData = [...rawData]; // Reset originalData to rawDataVolume
-      displayList = originalData;
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    displayList = [...originalData].sort(compareValues);
-  };
-
-  $: {
-    if (typeof window !== "undefined") {
-      options = plotData();
-    }
-  }
 </script>
 
 <svelte:head>
@@ -296,106 +57,7 @@
       class="w-full relative flex justify-center items-center overflow-hidden"
     >
       {#if rawData?.length > 0}
-        <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
-          <h2
-            class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
-          >
-            Gamma Exposure By Expiry
-          </h2>
-
-          <div class="w-full overflow-hidden m-auto">
-            {#if options !== null}
-              <div class="app w-full relative">
-                <Chart {init} {options} class="chart" />
-              </div>
-            {:else}
-              <div class="flex justify-center items-center h-80">
-                <div class="relative">
-                  <label
-                    class="bg-primary rounded-md h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
-                  >
-                    <span
-                      class="loading loading-spinner loading-md sm:loading-[1rem] text-gray-400"
-                    ></span>
-                  </label>
-                </div>
-              </div>
-            {/if}
-          </div>
-          <div class="w-full overflow-x-scroll text-white">
-            <table
-              class="w-full table table-sm table-compact bg-table border border-gray-800 rounded-none sm:rounded-md m-auto overflow-x-auto"
-            >
-              <thead>
-                <TableHeader {columns} {sortOrders} {sortData} />
-              </thead>
-              <tbody>
-                {#each data?.user?.tier === "Pro" ? displayList : displayList?.slice(0, 3) as item, index}
-                  <tr
-                    class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-odd border-b border-gray-800 {index +
-                      1 ===
-                      displayList?.slice(0, 3)?.length &&
-                    data?.user?.tier !== 'Pro'
-                      ? 'opacity-[0.1]'
-                      : ''}"
-                  >
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
-                    >
-                      {formatDate(item?.expiry)}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.call_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.put_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.net_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {#if item?.put_call_ratio <= 1 && item?.put_call_ratio !== null}
-                        <span class="text-[#00FC50]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {:else if item?.put_call_ratio > 1 && item?.put_call_ratio !== null}
-                        <span class="text-[#FF2F1F]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {:else}
-                        n/a
-                      {/if}
-                    </td>
-                  </tr>
-                {/each}
-              </tbody>
-            </table>
-          </div>
-
-          <UpgradeToPro {data} />
-        </div>
+        <GreekByExpiry {data} title="Gamma" />
       {:else}
         <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
           <h2
@@ -411,21 +73,3 @@
     </div>
   </div>
 </section>
-
-<style>
-  .app {
-    height: 600px;
-    width: 100%;
-  }
-
-  @media (max-width: 560px) {
-    .app {
-      width: 100%;
-      height: 500px;
-    }
-  }
-
-  .chart {
-    width: 100%;
-  }
-</style>
diff --git a/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
index acf67f84..a77df318 100644
--- a/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
@@ -1,242 +1,15 @@
 <script lang="ts">
-  import {
-    abbreviateNumberWithColor,
-    abbreviateNumber,
-    monthNames,
-  } from "$lib/utils";
   import {
     stockTicker,
-    screenWidth,
     numberOfUnreadNotification,
     displayCompanyName,
   } from "$lib/store";
-  import { onMount } from "svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import UpgradeToPro from "$lib/components/UpgradeToPro.svelte";
+
   import Infobox from "$lib/components/Infobox.svelte";
-  import { Chart } from "svelte-echarts";
 
-  import { init, use } from "echarts/core";
-  import { LineChart, BarChart } from "echarts/charts";
-  import {
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-  } from "echarts/components";
-  import { CanvasRenderer } from "echarts/renderers";
-
-  use([
-    LineChart,
-    BarChart,
-    GridComponent,
-    TooltipComponent,
-    LegendComponent,
-    CanvasRenderer,
-  ]);
+  import GreekByStrike from "$lib/components/Options/GreekByStrike.svelte";
 
   export let data;
-  let rawData = data?.getData || [];
-
-  rawData = rawData?.map((item) => ({
-    ...item,
-    net_gex: (item?.call_gex || 0) + (item?.put_gex || 0),
-    put_call_ratio:
-      item?.call_gex > 0
-        ? Math.abs((item?.put_gex || 0) / item?.call_gex)
-        : null,
-  }));
-
-  let displayList = rawData?.slice(0, 150);
-  let options = null;
-
-  function plotData() {
-    // Process and sort data by strike in descending order
-    const processedData = rawData
-      ?.map((d) => ({
-        strike: d?.strike,
-        callGamma: d?.call_gex,
-        putGamma: d?.put_gex,
-        netGamma: d?.net_gex,
-      }))
-      .sort((a, b) => a.strike - b.strike);
-
-    const strikes = processedData.map((d) => d.strike);
-    const callGamma = processedData.map((d) => d.callGamma?.toFixed(2));
-    const putGamma = processedData.map((d) => d.putGamma?.toFixed(2));
-    const netGamma = processedData.map((d) => d.netGamma?.toFixed(2));
-
-    const options = {
-      animation: false,
-      tooltip: {
-        trigger: "axis",
-        axisPointer: {
-          type: "shadow",
-        },
-        backgroundColor: "#313131",
-        textStyle: {
-          color: "#fff",
-        },
-        formatter: function (params) {
-          const strike = params[0].axisValue;
-          const put = params[0].data;
-          const call = params[1].data;
-          const net = params[2].data;
-
-          return `
-          <div style="text-align:left;">
-            <b>Strike:</b> ${strike}<br/>
-            <span style="color:#9B5DC4;">● Put Gamma:</span> ${abbreviateNumberWithColor(put, false, true)}<br/>
-            <span style="color:#C4E916;">● Call Gamma:</span> ${abbreviateNumberWithColor(call, false, true)}<br/>
-            <span style="color:#FF2F1F;">● Net Gamma:</span> ${abbreviateNumberWithColor(net, false, true)}<br/>
-          </div>`;
-        },
-      },
-      grid: {
-        left: $screenWidth < 640 ? "5%" : "0%",
-        right: $screenWidth < 640 ? "5%" : "0%",
-        bottom: "5%",
-        containLabel: true,
-      },
-      xAxis: {
-        type: "value",
-        name: "Gamma",
-        nameTextStyle: { color: "#fff" },
-        splitLine: { show: false },
-        axisLabel: {
-          show: false, // Hide y-axis labels
-        },
-      },
-      yAxis: {
-        type: "category",
-        data: strikes,
-        axisLine: { lineStyle: { color: "#fff" } },
-        axisLabel: { color: "#fff" },
-        splitLine: { show: false },
-      },
-      series: [
-        {
-          name: "Put Gamma",
-          type: "bar",
-          data: putGamma,
-          stack: "gamma",
-          itemStyle: { color: "#9B5DC4" },
-        },
-        {
-          name: "Net Gamma",
-          type: "bar",
-          data: netGamma,
-          stack: "gamma",
-          itemStyle: { color: "#FF2F1F" },
-        },
-        {
-          name: "Call Gamma",
-          type: "bar",
-          data: callGamma,
-          stack: "gamma",
-          itemStyle: { color: "#C4E916" },
-        },
-      ],
-    };
-
-    return options;
-  }
-
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-
-    if (isBottom && displayList?.length !== rawData?.length) {
-      const nextIndex = displayList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      displayList = [...displayList, ...filteredNewResults];
-    }
-  }
-
-  onMount(() => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  $: columns = [
-    { key: "strike", label: "Strike Price", align: "left" },
-    { key: "call_gex", label: "Call GEX", align: "right" },
-    { key: "put_gex", label: "Put GEX", align: "right" },
-    { key: "net_gex", label: "Net GEX", align: "right" },
-    { key: "put_call_ratio", label: "P/C GEX", align: "right" },
-  ];
-
-  $: sortOrders = {
-    strike: { order: "none", type: "number" },
-    call_gex: { order: "none", type: "number" },
-    put_gex: { order: "none", type: "number" },
-    net_gex: { order: "none", type: "number" },
-    put_call_ratio: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-    let originalData = rawData;
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      originalData = [...rawData]; // Reset originalData to rawDataVolume
-      displayList = originalData;
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    displayList = [...originalData].sort(compareValues);
-  };
-
-  $: {
-    if (typeof window !== "undefined") {
-      options = plotData();
-    }
-  }
 </script>
 
 <svelte:head>
@@ -284,107 +57,8 @@
     <div
       class="w-full relative flex justify-center items-center overflow-hidden"
     >
-      {#if rawData?.length > 0}
-        <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
-          <h2
-            class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
-          >
-            Gamma Exposure By Strike
-          </h2>
-
-          <div class="w-full overflow-hidden m-auto">
-            {#if options !== null}
-              <div class="app w-full relative">
-                <Chart {init} {options} class="chart" />
-              </div>
-            {:else}
-              <div class="flex justify-center items-center h-80">
-                <div class="relative">
-                  <label
-                    class="bg-primary rounded-md h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
-                  >
-                    <span
-                      class="loading loading-spinner loading-md sm:loading-[1rem] text-gray-400"
-                    ></span>
-                  </label>
-                </div>
-              </div>
-            {/if}
-          </div>
-          <div class="w-full overflow-x-scroll text-white">
-            <table
-              class="w-full table table-sm table-compact bg-table border border-gray-800 rounded-none sm:rounded-md m-auto overflow-x-auto"
-            >
-              <thead>
-                <TableHeader {columns} {sortOrders} {sortData} />
-              </thead>
-              <tbody>
-                {#each data?.user?.tier === "Pro" ? displayList : displayList?.slice(0, 3) as item, index}
-                  <tr
-                    class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-odd border-b border-gray-800 {index +
-                      1 ===
-                      displayList?.slice(0, 3)?.length &&
-                    data?.user?.tier !== 'Pro'
-                      ? 'opacity-[0.1]'
-                      : ''}"
-                  >
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
-                    >
-                      {item?.strike?.toFixed(2)}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.call_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.put_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {@html abbreviateNumberWithColor(
-                        item?.net_gex?.toFixed(2),
-                        false,
-                        true,
-                      )}
-                    </td>
-
-                    <td
-                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
-                    >
-                      {#if item?.put_call_ratio <= 1 && item?.put_call_ratio !== null}
-                        <span class="text-[#00FC50]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {:else if item?.put_call_ratio > 1 && item?.put_call_ratio !== null}
-                        <span class="text-[#FF2F1F]"
-                          >{item?.put_call_ratio?.toFixed(2)}</span
-                        >
-                      {:else}
-                        n/a
-                      {/if}
-                    </td>
-                  </tr>
-                {/each}
-              </tbody>
-            </table>
-          </div>
-
-          <UpgradeToPro {data} />
-        </div>
+      {#if data?.getData?.length > 0}
+        <GreekByStrike {data} title="Gamma" />
       {:else}
         <div class="sm:p-7 w-full m-auto mt-2 sm:mt-0">
           <h2
@@ -400,21 +74,3 @@
     </div>
   </div>
 </section>
-
-<style>
-  .app {
-    height: 1000px;
-    width: 100%;
-  }
-
-  @media (max-width: 560px) {
-    .app {
-      width: 100%;
-      height: 500px;
-    }
-  }
-
-  .chart {
-    width: 100%;
-  }
-</style>