diff --git a/src/routes/stocks/[tickerID]/options/gex/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/+page.svelte
index 25348aea..d854d4cb 100644
--- a/src/routes/stocks/[tickerID]/options/gex/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/+page.svelte
@@ -145,7 +145,7 @@
       grid: {
         left: $screenWidth < 640 ? "5%" : "0%",
         right: $screenWidth < 640 ? "5%" : "0%",
-        bottom: "20%",
+        bottom: "10%",
         containLabel: true,
       },
       xAxis: [
@@ -256,7 +256,7 @@
     { key: "date", label: "Date", align: "left" },
     { key: "call_gamma", label: "Call GEX", align: "right" },
     { key: "put_gamma", label: "Put GEX", align: "right" },
-    { key: "put_gamma", label: "Net GEX", align: "right" },
+    { key: "net_gamma", label: "Net GEX", align: "right" },
     { key: "put_call_ratio", label: "P/C GEX", align: "right" },
   ];
 
diff --git a/src/routes/stocks/[tickerID]/options/gex/expiry/+page.server.ts b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.server.ts
new file mode 100644
index 00000000..9e7bd003
--- /dev/null
+++ b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.server.ts
@@ -0,0 +1,35 @@
+
+
+export const load = async ({ locals, params }) => {
+  const { apiKey, apiURL, user } = locals;
+
+  const getData = async () => {
+    const postData = {
+      params: params.tickerID,
+      category: "expiry"
+    };
+
+    const response = await fetch(apiURL + "/options-gex-dex", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData),
+    });
+  const output = await response.json();
+  
+    return output;
+  }; 
+
+
+
+  
+
+  // Make sure to return a promise
+  return {
+    getData: await getData(),
+  };
+};
+
+
diff --git a/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
index e69de29b..ad8a35a2 100644
--- a/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/expiry/+page.svelte
@@ -0,0 +1,431 @@
+<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,
+  ]);
+
+  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 = {
+      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>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width" />
+  <title>
+    {$numberOfUnreadNotification > 0 ? `(${$numberOfUnreadNotification})` : ""}
+    {$displayCompanyName} ({$stockTicker}) Gamma Exposure by Strike Price ·
+    Stocknear
+  </title>
+  <meta
+    name="description"
+    content={`Explore historic volume & open interest of option chains & save individual contracts for later`}
+  />
+
+  <!-- Other meta tags -->
+  <meta
+    property="og:title"
+    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure by Strike Price · Stocknear`}
+  />
+  <meta
+    property="og:description"
+    content={`Explore historic volume & open interest of option chains & save individual contracts for later`}
+  />
+  <meta property="og:type" content="website" />
+  <!-- Add more Open Graph meta tags as needed -->
+
+  <!-- Twitter specific meta tags -->
+  <meta name="twitter:card" content="summary_large_image" />
+  <meta
+    name="twitter:title"
+    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure by Strike Price · Stocknear`}
+  />
+  <meta
+    name="twitter:description"
+    content={`Explore historic volume & open interest of option chains & save individual contracts for later`}
+  />
+  <!-- Add more Twitter meta tags as needed -->
+</svelte:head>
+
+<section
+  class="w-full bg-default overflow-hidden text-white min-h-screen pb-40"
+>
+  <div class="w-full flex h-full overflow-hidden">
+    <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 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 displayList 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>
+      {: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>
+        </div>
+      {/if}
+    </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.server.ts b/src/routes/stocks/[tickerID]/options/gex/strike/+page.server.ts
index a6db54dc..f33b0e12 100644
--- a/src/routes/stocks/[tickerID]/options/gex/strike/+page.server.ts
+++ b/src/routes/stocks/[tickerID]/options/gex/strike/+page.server.ts
@@ -6,7 +6,7 @@ export const load = async ({ locals, params }) => {
   const getData = async () => {
     const postData = {
       params: params.tickerID,
-      category: "overview"
+      category: "strike"
     };
 
     const response = await fetch(apiURL + "/options-gex-dex", {
@@ -23,27 +23,12 @@ export const load = async ({ locals, params }) => {
   }; 
 
 
-   const getHistoricalPrice = async () => {
-     const postData = { ticker: params.tickerID, timePeriod: "one-year" };
-  const response = await fetch(apiURL + "/historical-price", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "X-API-KEY": apiKey,
-    },
-    body: JSON.stringify(postData),
-  });
-
-    const output = await response.json();
-    return output;
-  }; 
 
   
 
   // Make sure to return a promise
   return {
     getData: await getData(),
-    getHistoricalPrice: await getHistoricalPrice(),
   };
 };
 
diff --git a/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte b/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
index 3747adfc..a1ecbc8a 100644
--- a/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
+++ b/src/routes/stocks/[tickerID]/options/gex/strike/+page.svelte
@@ -39,201 +39,107 @@
 
   rawData = rawData?.map((item) => ({
     ...item,
-    net_gamma: (item?.call_gamma || 0) + (item?.put_gamma || 0),
+    net_gex: (item?.call_gex || 0) + (item?.put_gex || 0),
     put_call_ratio:
-      item?.call_gamma > 0
-        ? Math.abs((item?.put_gamma || 0) / item?.call_gamma)
+      item?.call_gex > 0
+        ? Math.abs((item?.put_gex || 0) / item?.call_gex)
         : 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_gamma);
-    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,
-    );
+    // 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",
-        hideDelay: 100,
-        borderColor: "#969696", // Black border color
-        borderWidth: 1, // Border width of 1px
-        backgroundColor: "#313131", // Optional: Set background color for contrast
+        axisPointer: {
+          type: "shadow",
+        },
+        backgroundColor: "#313131",
         textStyle: {
-          color: "#fff", // Optional: Text color for better visibility
+          color: "#fff",
         },
         formatter: function (params) {
-          // Get the timestamp from the first parameter
-          const timestamp = params[0].axisValue;
+          const strike = params[0].axisValue;
+          const put = params[0].data;
+          const call = params[1].data;
+          const net = params[2].data;
 
-          // 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",
-          },
+          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>`;
         },
       },
-      silent: true,
       grid: {
         left: $screenWidth < 640 ? "5%" : "0%",
         right: $screenWidth < 640 ? "5%" : "0%",
-        bottom: "20%",
+        bottom: "5%",
         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}`;
-            },
-          },
+      xAxis: {
+        type: "value",
+        name: "Gamma",
+        nameTextStyle: { color: "#fff" },
+        splitLine: { show: false },
+        axisLabel: {
+          show: false, // Hide y-axis labels
         },
-      ],
-      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
-          },
-        },
-      ],
+      },
+      yAxis: {
+        type: "category",
+        data: strikes,
+        axisLine: { lineStyle: { color: "#fff" } },
+        axisLabel: { color: "#fff" },
+        splitLine: { show: false },
+      },
       series: [
         {
-          name: "Price",
-          type: "line",
-          data: priceList,
-          yAxisIndex: 1,
-          lineStyle: { width: 2 },
-          itemStyle: {
-            color: "#fff",
-          },
-          smooth: true,
-          showSymbol: false,
+          name: "Put Gamma",
+          type: "bar",
+          data: putGamma,
+          stack: "gamma",
+          itemStyle: { color: "#9B5DC4" },
         },
         {
-          name: "Gamma",
+          name: "Net Gamma",
           type: "bar",
-          data: gammaList,
-          itemStyle: {
-            color: "#9B5DC4",
-          },
+          data: netGamma,
+          stack: "gamma",
+          itemStyle: { color: "#FF2F1F" },
+        },
+        {
+          name: "Call Gamma",
+          type: "bar",
+          data: callGamma,
+          stack: "gamma",
+          itemStyle: { color: "#C4E916" },
         },
       ],
     };
+
     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;
@@ -253,18 +159,18 @@
   });
 
   $: columns = [
-    { key: "date", label: "Date", align: "left" },
-    { key: "call_gamma", label: "Call GEX", align: "right" },
-    { key: "put_gamma", label: "Put GEX", align: "right" },
-    { key: "put_gamma", label: "Net GEX", align: "right" },
+    { 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 = {
-    date: { order: "none", type: "date" },
-    call_gamma: { order: "none", type: "number" },
-    put_gamma: { order: "none", type: "number" },
-    net_gamma: { order: "none", type: "number" },
+    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" },
   };
 
@@ -326,7 +232,7 @@
   };
 
   $: {
-    if (typeof window !== "undefined" && timePeriod) {
+    if (typeof window !== "undefined") {
       options = plotData();
     }
   }
@@ -337,7 +243,8 @@
   <meta name="viewport" content="width=device-width" />
   <title>
     {$numberOfUnreadNotification > 0 ? `(${$numberOfUnreadNotification})` : ""}
-    {$displayCompanyName} ({$stockTicker}) Gamma Exposure · Stocknear
+    {$displayCompanyName} ({$stockTicker}) Gamma Exposure by Strike Price ·
+    Stocknear
   </title>
   <meta
     name="description"
@@ -347,7 +254,7 @@
   <!-- Other meta tags -->
   <meta
     property="og:title"
-    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure · Stocknear`}
+    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure by Strike Price · Stocknear`}
   />
   <meta
     property="og:description"
@@ -360,7 +267,7 @@
   <meta name="twitter:card" content="summary_large_image" />
   <meta
     name="twitter:title"
-    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure · Stocknear`}
+    content={`${$displayCompanyName} (${$stockTicker}) Gamma Exposure by Strike Price · Stocknear`}
   />
   <meta
     name="twitter:description"
@@ -381,27 +288,12 @@
           <h2
             class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit"
           >
-            Daily Gamma Exposure
+            Gamma Exposure By Strike
           </h2>
 
-          <div class="w-full overflow-hidden m-auto mt-5">
+          <div class="w-full overflow-hidden m-auto">
             {#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}
@@ -420,7 +312,7 @@
           </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 mt-4 overflow-x-auto"
+              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} />
@@ -438,13 +330,13 @@
                     <td
                       class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
                     >
-                      {formatDate(item?.date)}
+                      {item?.strike?.toFixed(2)}
                     </td>
                     <td
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >
                       {@html abbreviateNumberWithColor(
-                        item?.call_gamma,
+                        item?.call_gex?.toFixed(2),
                         false,
                         true,
                       )}
@@ -453,7 +345,7 @@
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >
                       {@html abbreviateNumberWithColor(
-                        item?.put_gamma,
+                        item?.put_gex?.toFixed(2),
                         false,
                         true,
                       )}
@@ -463,7 +355,7 @@
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >
                       {@html abbreviateNumberWithColor(
-                        item?.net_gamma,
+                        item?.net_gex?.toFixed(2),
                         false,
                         true,
                       )}
@@ -472,14 +364,16 @@
                     <td
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
                     >
-                      {#if item?.put_call_ratio <= 1}
+                      {#if item?.put_call_ratio <= 1 && item?.put_call_ratio !== null}
                         <span class="text-[#00FC50]"
                           >{item?.put_call_ratio?.toFixed(2)}</span
                         >
-                      {:else}
+                      {: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>
@@ -508,14 +402,14 @@
 
 <style>
   .app {
-    height: 400px;
+    height: 1000px;
     width: 100%;
   }
 
   @media (max-width: 560px) {
     .app {
       width: 100%;
-      height: 300px;
+      height: 500px;
     }
   }