diff --git a/src/routes/etf/[tickerID]/options/+layout.svelte b/src/routes/etf/[tickerID]/options/+layout.svelte
index a86a1e93..d20ae0cb 100644
--- a/src/routes/etf/[tickerID]/options/+layout.svelte
+++ b/src/routes/etf/[tickerID]/options/+layout.svelte
@@ -15,10 +15,10 @@
 
     if (state !== "overview" && subSectionMap[state]) {
       displaySubSection = state;
-      //goto(`/etf/${$etfTicker}${subSectionMap[state]}`);
+      //goto(`/stocks/${$etfTicker}${subSectionMap[state]}`);
     } else {
       displaySubSection = state;
-      //goto(`/etf/${$etfTicker}/statistics`);
+      //goto(`/stocks/${$etfTicker}/statistics`);
     }
   }
 
@@ -64,7 +64,7 @@
               </a>
 
               <a
-                href={`/etf/${$etfTicker}/options/hottest-contracts`}
+                href={`/stocks/${$etfTicker}/options/hottest-contracts`}
                 on:click={() => changeSubSection("hottest-contracts")}
                 class="p-2 px-5 cursor-pointer {displaySubSection ===
                 'hottest-contracts'
@@ -135,7 +135,7 @@
                 <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0" />
               </div>
               <span class="text-white p-3 ml-3 mr-3">
-                Build your Stock Screener to find profitable etf.
+                Build your Stock Screener to find profitable stocks.
               </span>
             </a>
           </div>
diff --git a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.server.ts b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.server.ts
index 59e5fb74..2daec6b9 100644
--- a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.server.ts
+++ b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.server.ts
@@ -18,7 +18,8 @@ export const load = async ({ locals, params }) => {
     });
 
     let output = await response.json();
-    output = user?.tier !== "Pro" ? output?.slice(0, 3) : output;
+    output.volume = user?.tier !== "Pro" ? output?.volume?.slice(0, 3) : output?.volume;
+    output.openInterest = user?.tier !== "Pro" ? output?.openInterest?.slice(0, 3) : output?.openInterest;
 
     return output;
   };
diff --git a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
index d3c95f6e..773608c7 100644
--- a/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
+++ b/src/routes/etf/[tickerID]/options/hottest-contracts/+page.svelte
@@ -1,11 +1,85 @@
 <script lang="ts">
-  import { abbreviateNumberWithColor } from "$lib/utils";
+  import {
+    abbreviateNumberWithColor,
+    abbreviateNumber,
+    monthNames,
+  } from "$lib/utils";
+  import { setCache, getCache, stockTicker, screenWidth } from "$lib/store";
   import * as HoverCard from "$lib/components/shadcn/hover-card/index.js";
-  import TableHeader from "$lib/components/Table/TableHeader.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 isLoaded = false;
+  let optionsData = null;
+
+  let optionHistoryList = [];
+  let selectGraphType = "Bid/Ask";
+  let container;
+  let rawDataHistory = [];
+  let strikePrice;
+  let optionType;
+  let dateExpiration;
+
+  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 = day + "/" + year;
+
+    return formattedDate;
+  }
+
+  function getScroll() {
+    const scrollThreshold = container.scrollHeight * 0.8; // 80% of the container height
+
+    // Check if the user has scrolled to the bottom based on the threshold
+    const isBottom =
+      container.scrollTop + container.clientHeight >= scrollThreshold;
+
+    // Only load more data if at the bottom and there is still data to load
+    if (isBottom && optionHistoryList?.length !== rawDataHistory?.length) {
+      const nextIndex = optionHistoryList.length; // Ensure optionHistoryList is defined
+      const filteredNewResults = rawDataHistory.slice(
+        nextIndex,
+        nextIndex + 25,
+      ); // Ensure rawData is defined
+      optionHistoryList = [...optionHistoryList, ...filteredNewResults];
+    }
+  }
 
   const currentTime = new Date(
     new Date().toLocaleString("en-US", { timeZone: "America/New_York" }),
@@ -21,14 +95,18 @@
     return daysLeft + "D";
   }
 
-  let rawData = data?.getData?.map((item) => ({
+  let rawDataVolume = data?.getData?.volume?.map((item) => ({
     ...item,
     dte: daysLeft(item?.date_expiration),
   }));
 
-  let openInterestList = rawData?.sort(
-    (a, b) => b?.open_interest - a?.open_interest,
-  );
+  let rawDataOI = data?.getData?.openInterest?.map((item) => ({
+    ...item,
+    dte: daysLeft(item?.date_expiration),
+  }));
+
+  let volumeList = rawDataVolume;
+  let openInterestList = rawDataOI;
 
   $: columns = [
     { key: "strike_price", label: "Chain", align: "left" },
@@ -64,7 +142,7 @@
 
     // Cycle through 'none', 'asc', 'desc' for the clicked key
     const orderCycle = ["none", "asc", "desc"];
-    let originalData = rawData?.sort(
+    let originalData = rawDataVolume?.sort(
       (a, b) => b?.open_interest - a?.open_interest,
     );
     const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
@@ -74,8 +152,67 @@
 
     // Reset to original data when 'none' and stop further sorting
     if (sortOrder === "none") {
-      originalData = [...rawData]; // Reset originalData to rawData
-      openInterestList = originalData;
+      originalData = [...rawDataVolume]; // Reset originalData to rawDataVolume
+      volumeList = 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
+    volumeList = [...originalData].sort(compareValues);
+  };
+
+  const sortDataOI = (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 = rawDataOI?.sort(
+      (a, b) => b?.open_interest - a?.open_interest,
+    );
+    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 = [...rawDataOI]; // Reset originalData to rawDataOI
+      volumeList = originalData;
       return;
     }
 
@@ -112,6 +249,299 @@
     // Sort using the generic comparison function
     openInterestList = [...originalData].sort(compareValues);
   };
+
+  function plotData() {
+    let data = rawDataHistory?.sort(
+      (a, b) => new Date(a?.date) - new Date(b?.date),
+    );
+
+    let dates = data?.map((item) => item?.date);
+    let avgPrice = data?.map((item) => item?.avg_price);
+    let bidVolume = data?.map((item) => item?.bid_volume);
+    let askVolume = data?.map((item) => item?.ask_volume);
+    let midVolume = data?.map((item) => item?.mid_volume);
+
+    let volumeList = data?.map((item) => item?.volume);
+    let oiList = data?.map((item) => item?.open_interest);
+    let ivList = data?.map((item) =>
+      Math.floor(item?.implied_volatility * 100),
+    );
+    let series = [];
+    if (selectGraphType === "Bid/Ask") {
+      series = [
+        {
+          name: "Ask",
+          type: "bar",
+          stack: "Ratio",
+          emphasis: {
+            focus: "series",
+          },
+          data: askVolume,
+          itemStyle: {
+            color: "#33B890",
+          },
+        },
+        {
+          name: "Mid",
+          type: "bar",
+          stack: "Ratio",
+          emphasis: {
+            focus: "series",
+          },
+          data: midVolume,
+          itemStyle: {
+            color: "#007BFF",
+          },
+        },
+        {
+          name: "Bid",
+          type: "bar",
+          stack: "Ratio",
+          emphasis: {
+            focus: "series",
+          },
+          data: bidVolume,
+          itemStyle: {
+            color: "#EE5365", //'#7A1C16'
+          },
+        },
+        {
+          name: "Avg Fill", // Name for the line chart
+          type: "line", // Type of the chart (line)
+          yAxisIndex: 1, // Use the second y-axis on the right
+          data: avgPrice, // iv60Data (assumed to be passed as priceList)
+          itemStyle: {
+            color: "#fff", // Choose a color for the line (gold in this case)
+          },
+          lineStyle: {
+            width: 2, // Set the width of the line
+          },
+          smooth: true, // Optional: make the line smooth
+          showSymbol: false,
+        },
+      ];
+    } else if (selectGraphType === "Vol/OI") {
+      series = [
+        {
+          name: "Volume",
+          type: "bar",
+          data: volumeList,
+          itemStyle: {
+            color: "#FD7E14",
+          },
+        },
+        {
+          name: "OI",
+          type: "bar",
+          data: oiList,
+          itemStyle: {
+            color: "#33B890",
+          },
+        },
+
+        {
+          name: "Avg Fill", // Name for the line chart
+          type: "line", // Type of the chart (line)
+          yAxisIndex: 1, // Use the second y-axis on the right
+          data: avgPrice, // iv60Data (assumed to be passed as priceList)
+          itemStyle: {
+            color: "#fff", // Choose a color for the line (gold in this case)
+          },
+          lineStyle: {
+            width: 2, // Set the width of the line
+          },
+          smooth: true, // Optional: make the line smooth
+          showSymbol: false,
+        },
+      ];
+    } else {
+      series = [
+        {
+          name: "IV",
+          type: "line",
+          data: volumeList,
+          itemStyle: {
+            color: "#B24BF3",
+          },
+          smooth: true, // Optional: make the line smooth
+          showSymbol: false,
+        },
+        {
+          name: "Avg Fill", // Name for the line chart
+          type: "line", // Type of the chart (line)
+          yAxisIndex: 1, // Use the second y-axis on the right
+          data: avgPrice, // iv60Data (assumed to be passed as priceList)
+          itemStyle: {
+            color: "#fff", // Choose a color for the line (gold in this case)
+          },
+          lineStyle: {
+            width: 2, // Set the width of the line
+          },
+          smooth: true, // Optional: make the line smooth
+          showSymbol: false,
+        },
+      ];
+    }
+    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/>";
+
+          // Sort params to ensure Vol appears last
+          params.sort((a, b) => {
+            if (a.seriesName === "Vol") return 1;
+            if (b.seriesName === "Vol") return -1;
+            return 0;
+          });
+
+          // 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 +
+              ": " +
+              abbreviateNumberWithColor(param.value, false, true) +
+              "<br/>";
+          });
+
+          return result;
+        },
+        axisPointer: {
+          lineStyle: {
+            color: "#fff",
+          },
+        },
+      },
+      silent: true,
+      grid: {
+        left: $screenWidth < 640 ? "5%" : "2%",
+        right: $screenWidth < 640 ? "5%" : "2%",
+        bottom: "20%",
+        containLabel: true,
+      },
+      xAxis: [
+        {
+          type: "category",
+          data: dates,
+          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: series,
+    };
+    return options;
+  }
+
+  const getContractHistory = async (contractId) => {
+    let output;
+    const cachedData = getCache(contractId, "getContractHistory");
+    if (cachedData) {
+      output = cachedData;
+    } else {
+      const postData = {
+        params: contractId,
+      };
+
+      // make the POST request to the endpoint
+      const response = await fetch("/api/options-contract-history", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify(postData),
+      });
+
+      output = await response.json();
+
+      setCache(contractId, output, "getContractHistory");
+    }
+
+    return output;
+  };
+
+  async function handleViewData(item) {
+    isLoaded = false;
+    optionDetailsDesktopModal?.showModal();
+
+    strikePrice = item?.strike_price;
+    optionType = item?.option_type;
+    dateExpiration = item?.date_expiration;
+
+    rawDataHistory = await getContractHistory(item?.option_symbol);
+    if (rawDataHistory?.length > 0) {
+      optionsData = plotData();
+      rawDataHistory = rawDataHistory?.sort(
+        (a, b) => new Date(b?.date) - new Date(a?.date),
+      );
+      optionHistoryList = rawDataHistory?.slice(0, 20);
+    } else {
+      optionsData = null;
+    }
+
+    isLoaded = true;
+  }
+
+  $: {
+    if (typeof window !== "undefined" && selectGraphType) {
+      isLoaded = false;
+      if (rawDataHistory?.length > 0) {
+        optionsData = plotData();
+      } else {
+        optionsData = null;
+      }
+
+      isLoaded = true;
+    }
+  }
 </script>
 
 <section
@@ -121,12 +551,12 @@
     <div
       class="w-full relative flex justify-center items-center overflow-hidden"
     >
-      {#if rawData?.length > 0}
+      {#if rawDataVolume?.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"
           >
-            Hottest Contracts (Highest OI)
+            Hottest Contracts (Highest Volume)
           </h2>
           <div class="w-full overflow-x-scroll text-white">
             <table
@@ -135,6 +565,179 @@
               <thead>
                 <TableHeader {columns} {sortOrders} {sortData} />
               </thead>
+              <tbody>
+                {#each volumeList 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 ===
+                      volumeList?.slice(0, 3)?.length &&
+                    data?.user?.tier !== 'Pro'
+                      ? 'opacity-[0.1]'
+                      : ''}"
+                  >
+                    <td
+                      class=" text-sm sm:text-[1rem] text-start whitespace-nowrap"
+                    >
+                      <span
+                        class={item?.option_type === "C"
+                          ? "text-[#00FC50]"
+                          : "text-[#FF2F1F]"}
+                      >
+                        {item?.option_type === "C" ? "Call" : "Put"}
+                      </span>
+                      <label
+                        on:click={() => handleViewData(item)}
+                        on:mouseover={() =>
+                          getContractHistory(item?.option_symbol)}
+                        class="cursor-pointer text-[#04D9FF] sm:hover:text-white sm:hover:underline sm:hover:underline-offset-4"
+                      >
+                        {item?.strike_price}
+
+                        {" " + item?.date_expiration}
+
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          class="inline-block w-4 h-4"
+                          viewBox="0 0 512 512"
+                          fill="#04D9FF"
+                          ><path
+                            d="M104 496H72a24 24 0 01-24-24V328a24 24 0 0124-24h32a24 24 0 0124 24v144a24 24 0 01-24 24zM328 496h-32a24 24 0 01-24-24V232a24 24 0 0124-24h32a24 24 0 0124 24v240a24 24 0 01-24 24zM440 496h-32a24 24 0 01-24-24V120a24 24 0 0124-24h32a24 24 0 0124 24v352a24 24 0 01-24 24zM216 496h-32a24 24 0 01-24-24V40a24 24 0 0124-24h32a24 24 0 0124 24v432a24 24 0 01-24 24z"
+                          ></path></svg
+                        >
+                      </label>
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.dte}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.last_price}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.low_price}-{item?.high_price}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.volume?.toLocaleString("en-US")}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {item?.open_interest?.toLocaleString("en-US")}
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {#if item?.open_interest_change >= 0}
+                        <span class="text-[#00FC50]"
+                          >+{item?.open_interest_change?.toLocaleString(
+                            "en-US",
+                          )}</span
+                        >
+                      {:else}
+                        <span class="text-[#FF2F1F]"
+                          >{item?.open_interest_change?.toLocaleString(
+                            "en-US",
+                          )}</span
+                        >
+                      {/if}
+                    </td>
+                    <td class="text-sm sm:text-[1rem] text-end">
+                      <HoverCard.Root>
+                        <HoverCard.Trigger
+                          class="rounded-sm underline-offset-4 hover:underline focus-visible:outline-2 focus-visible:outline-offset-8 focus-visible:outline-black"
+                        >
+                          <div class="flex items-center justify-end">
+                            <!-- Bar Container -->
+                            <div
+                              class="flex w-full max-w-28 h-5 bg-gray-200 rounded-md overflow-hidden"
+                            >
+                              <!-- Bearish -->
+                              <div
+                                class="bg-red-500 h-full"
+                                style="width: calc(({item?.bid_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+
+                              <!-- Neutral -->
+                              <div
+                                class="bg-gray-300 h-full"
+                                style="width: calc(({item?.mid_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+
+                              <!-- Bullish -->
+                              <div
+                                class="bg-green-500 h-full"
+                                style="width: calc(({item?.ask_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+                            </div>
+                          </div>
+                        </HoverCard.Trigger>
+                        <HoverCard.Content
+                          class="w-auto bg-secondary border border-gray-600"
+                        >
+                          <div class="flex justify-between space-x-4">
+                            <div
+                              class="space-y-1 flex flex-col items-start text-white"
+                            >
+                              <div>
+                                Bid Vol: {@html abbreviateNumberWithColor(
+                                  item?.bid_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                              <div>
+                                Mid Vol: {@html abbreviateNumberWithColor(
+                                  item?.mid_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                              <div>
+                                Ask Vol: {@html abbreviateNumberWithColor(
+                                  item?.ask_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                            </div>
+                          </div>
+                        </HoverCard.Content>
+                      </HoverCard.Root>
+                    </td>
+                    <td
+                      class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
+                    >
+                      {@html abbreviateNumberWithColor(
+                        item?.total_premium,
+                        false,
+                        true,
+                      )}
+                    </td>
+                  </tr>
+                {/each}
+              </tbody>
+            </table>
+          </div>
+
+          <h2
+            class=" flex flex-row items-center text-white text-xl sm:text-2xl font-bold w-fit mt-10"
+          >
+            Highest OI Contracts
+          </h2>
+          <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"
+            >
+              <thead>
+                <TableHeader {columns} {sortOrders} sortData={sortDataOI} />
+              </thead>
               <tbody>
                 {#each openInterestList as item, index}
                   <tr
@@ -146,9 +749,8 @@
                       : ''}"
                   >
                     <td
-                      class="text-white text-sm sm:text-[1rem] text-start whitespace-nowrap"
+                      class=" text-sm sm:text-[1rem] text-start whitespace-nowrap"
                     >
-                      {item?.strike_price}
                       <span
                         class={item?.option_type === "C"
                           ? "text-[#00FC50]"
@@ -156,7 +758,26 @@
                       >
                         {item?.option_type === "C" ? "Call" : "Put"}
                       </span>
-                      {" " + item?.date_expiration}
+                      <label
+                        on:click={() => handleViewData(item)}
+                        on:mouseover={() =>
+                          getContractHistory(item?.option_symbol)}
+                        class="cursor-pointer text-[#04D9FF] sm:hover:text-white sm:hover:underline sm:hover:underline-offset-4"
+                      >
+                        {item?.strike_price}
+
+                        {" " + item?.date_expiration}
+
+                        <svg
+                          xmlns="http://www.w3.org/2000/svg"
+                          class="inline-block w-4 h-4"
+                          viewBox="0 0 512 512"
+                          fill="#04D9FF"
+                          ><path
+                            d="M104 496H72a24 24 0 01-24-24V328a24 24 0 0124-24h32a24 24 0 0124 24v144a24 24 0 01-24 24zM328 496h-32a24 24 0 01-24-24V232a24 24 0 0124-24h32a24 24 0 0124 24v240a24 24 0 01-24 24zM440 496h-32a24 24 0 01-24-24V120a24 24 0 0124-24h32a24 24 0 0124 24v352a24 24 0 01-24 24zM216 496h-32a24 24 0 01-24-24V40a24 24 0 0124-24h32a24 24 0 0124 24v432a24 24 0 01-24 24z"
+                          ></path></svg
+                        >
+                      </label>
                     </td>
                     <td
                       class="text-white text-sm sm:text-[1rem] text-end whitespace-nowrap"
@@ -295,3 +916,393 @@
     </div>
   </div>
 </section>
+
+<dialog
+  id="optionDetailsDesktopModal"
+  class="modal {$screenWidth < 640
+    ? 'modal-bottom'
+    : ''} bg-[#000] bg-opacity-[0.8] sm:px-5"
+>
+  <div
+    class="modal-box w-full {rawDataHistory?.length > 0
+      ? 'max-w-7xl'
+      : 'w-full'} rounded-md bg-table border-t sm:border border-gray-600 min-h-48 h-auto"
+  >
+    <form
+      method="dialog"
+      class="modal-backdrop backdrop-blur-[4px] flex flex-row items-center w-full justify-between"
+    >
+      <p class="text-white text-[1rem] sm:text-xl font-semibold cursor-text">
+        Contract: <span
+          class={optionType === "C" ? "text-[#00FC50]" : "text-[#FF2F1F]"}
+          >{$stockTicker}
+          {strikePrice}
+          {optionType}
+          {dateExpiration} ({daysLeft(dateExpiration)})
+        </span>
+      </p>
+      <button
+        class="cursor-pointer text-[1.8rem] text-white focus:outline-none"
+      >
+        <svg
+          class="w-8 h-8"
+          xmlns="http://www.w3.org/2000/svg"
+          viewBox="0 0 24 24"
+          ><path
+            fill="white"
+            d="m6.4 18.308l-.708-.708l5.6-5.6l-5.6-5.6l.708-.708l5.6 5.6l5.6-5.6l.708.708l-5.6 5.6l5.6 5.6l-.708.708l-5.6-5.6z"
+          />
+        </svg>
+      </button>
+    </form>
+    {#if rawDataHistory?.length > 0}
+      <div
+        class="border-b border-gray-600 w-full mt-2 mb-2 sm:mb-3 sm:mt-3"
+      ></div>
+
+      <div class="hidden sm:flex flex-wrap text-white pb-2">
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          {formatDate(optionHistoryList?.at(0)?.date)}:
+        </div>
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          <span class="text-[var(--light-text-color)] font-normal">Vol:</span>
+          {optionHistoryList?.at(0)?.volume?.toLocaleString("en-US")}
+        </div>
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          <span class="text-[var(--light-text-color)] font-normal">OI:</span>
+          {optionHistoryList?.at(0)?.open_interest?.toLocaleString("en-US")}
+        </div>
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          <span class="text-[var(--light-text-color)] font-normal">Avg:</span>
+          ${optionHistoryList?.at(0)?.avg_price}
+        </div>
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          <span class="text-[var(--light-text-color)] font-normal">Prem:</span>
+          {abbreviateNumber(optionHistoryList?.at(0)?.total_premium, true)}
+        </div>
+        <div
+          class="mr-3 whitespace-nowrap"
+          data-state="closed"
+          data-sentry-element="unknown"
+          data-sentry-source-file="Tooltip.tsx"
+        >
+          <span class="text-[var(--light-text-color)] font-normal">IV:</span>
+          {(optionHistoryList?.at(0)?.implied_volatility * 100)?.toLocaleString(
+            "en-US",
+          )}%
+        </div>
+      </div>
+
+      {#if $screenWidth > 640}
+        <div
+          class="pb-8 sm:pb-2 rounded-md bg-table border border-gray-600 overflow-hidden"
+        >
+          <div class="flex justify-end ml-auto w-fit mr-2 mt-2">
+            {#each ["Bid/Ask", "Vol/OI", "IV"] as item}
+              <label
+                on:click={() => (selectGraphType = item)}
+                class="px-3 py-1.5 {selectGraphType === item
+                  ? 'bg-white text-black  mr-1'
+                  : '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>
+          <div class="app w-full h-[300px] mt-5">
+            {#if isLoaded}
+              <Chart {init} options={optionsData} class="chart" />
+            {:else}
+              <div class="flex justify-center items-center h-80">
+                <div class="relative">
+                  <label
+                    class="bg-secondary 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 text-white"
+                    ></span>
+                  </label>
+                </div>
+              </div>
+            {/if}
+          </div>
+        </div>
+      {/if}
+
+      <div
+        bind:this={container}
+        on:scroll={getScroll}
+        class="h-full max-h-[500px] overflow-y-scroll overflow-x-auto"
+      >
+        <div class="flex justify-start items-center m-auto cursor-normal">
+          {#if isLoaded}
+            <table
+              class="table table-pin-cols table-sm bg-table border border-gray-800 table-compact rounded-none sm:rounded-md w-full m-auto mt-4 overflow-x-auto"
+            >
+              <thead class="bg-default">
+                <tr class="">
+                  <td class="text-white font-semibold text-sm text-start"
+                    >Date</td
+                  >
+                  <td class="text-white font-semibold text-sm text-end">Vol</td>
+                  <td class="text-white font-semibold text-sm text-end">OI</td>
+                  <td class="text-white font-semibold text-sm text-end"
+                    >OI Change</td
+                  >
+                  <td class="text-white font-semibold text-sm text-end"
+                    >% Change OI</td
+                  >
+                  <td class="text-white font-semibold text-sm text-start"
+                    >Last Price</td
+                  >
+                  <td class="text-white font-semibold text-sm text-start"
+                    >Avg Price</td
+                  >
+                  <td class="text-white font-semibold text-sm text-start"
+                    >Bid/Ask</td
+                  >
+                  <td class="text-white font-semibold text-sm text-end">IV</td>
+                  <td class="text-white font-semibold text-sm text-end"
+                    >Floor</td
+                  >
+                  <td class="text-white font-semibold text-sm text-end"
+                    >Sweep</td
+                  >
+                  <td class="text-white font-semibold text-sm text-start"
+                    >Multileg Vol</td
+                  >
+                  <td class="text-white font-semibold text-sm text-end"
+                    >Total Prem</td
+                  >
+                </tr>
+              </thead>
+              <tbody>
+                {#each optionHistoryList as item}
+                  <!-- row -->
+                  <tr class="odd:bg-odd border-b border-gray-800">
+                    <td class="text-sm sm:text-[1rem] text-start text-white">
+                      {formatDate(item?.date)}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.volume?.toLocaleString("en-US")}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.open_interest !== undefined
+                        ? item?.open_interest?.toLocaleString("en-US")
+                        : "n/a"}
+                    </td>
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {#if item?.open_interest_change >= 0 && item?.open_interest_change !== undefined}
+                        <span class="text-[#00FC50]"
+                          >+{item?.open_interest_change?.toLocaleString(
+                            "en-US",
+                          )}</span
+                        >
+                      {:else if item?.open_interest_change < 0 && item?.open_interest_change !== undefined}
+                        <span class="text-[#FF2F1F]"
+                          >{item?.open_interest_change?.toLocaleString(
+                            "en-US",
+                          )}</span
+                        >
+                      {:else}
+                        n/a
+                      {/if}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {#if item?.open_interest_change_percent > 0 && item?.open_interest_change_percent !== undefined}
+                        <span class="text-[#00FC50]"
+                          >+{item?.open_interest_change_percent + "%"}</span
+                        >
+                      {:else if item?.open_interest_change_percent < 0 && item?.open_interest_change_percent !== undefined}
+                        <span class="text-[#FF2F1F]"
+                          >{item?.open_interest_change_percent + "%"}</span
+                        >
+                      {:else if item?.open_interest_change_percent === 0 && item?.open_interest_change_percent !== undefined}
+                        0%
+                      {:else}
+                        n/a
+                      {/if}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.last_price}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.avg_price}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end">
+                      <HoverCard.Root>
+                        <HoverCard.Trigger
+                          class="rounded-sm underline-offset-4 hover:underline focus-visible:outline-2 focus-visible:outline-offset-8 focus-visible:outline-black"
+                        >
+                          <div class="flex items-center justify-end">
+                            <!-- Bar Container -->
+                            <div
+                              class="flex w-full max-w-28 h-5 bg-gray-200 rounded-md overflow-hidden"
+                            >
+                              <!-- Bearish -->
+                              <div
+                                class="bg-red-500 h-full"
+                                style="width: calc(({item?.bid_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+
+                              <!-- Neutral -->
+                              <div
+                                class="bg-gray-300 h-full"
+                                style="width: calc(({item?.mid_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+
+                              <!-- Bullish -->
+                              <div
+                                class="bg-green-500 h-full"
+                                style="width: calc(({item?.ask_volume} / ({item?.bid_volume} + {item?.mid_volume} + {item?.ask_volume})) * 100%)"
+                              ></div>
+                            </div>
+                          </div>
+                        </HoverCard.Trigger>
+                        <HoverCard.Content
+                          class="w-auto bg-secondary border border-gray-600"
+                        >
+                          <div class="flex justify-between space-x-4">
+                            <div
+                              class="space-y-1 flex flex-col items-start text-white"
+                            >
+                              <div>
+                                Bid Vol: {@html abbreviateNumberWithColor(
+                                  item?.bid_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                              <div>
+                                Mid Vol: {@html abbreviateNumberWithColor(
+                                  item?.mid_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                              <div>
+                                Ask Vol: {@html abbreviateNumberWithColor(
+                                  item?.ask_volume,
+                                  false,
+                                  true,
+                                )}
+                              </div>
+                            </div>
+                          </div>
+                        </HoverCard.Content>
+                      </HoverCard.Root>
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {(item?.implied_volatility * 100)?.toLocaleString(
+                        "en-US",
+                      ) + "%"}
+                    </td>
+
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.volume > 0
+                        ? ((item?.floor_volume / item?.volume) * 100)?.toFixed(
+                            2,
+                          ) + "%"
+                        : "n/a"}
+                    </td>
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.volume > 0
+                        ? ((item?.sweep_volume / item?.volume) * 100)?.toFixed(
+                            2,
+                          ) + "%"
+                        : "n/a"}
+                    </td>
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {item?.volume > 0
+                        ? (
+                            (item?.multi_leg_volume / item?.volume) *
+                            100
+                          )?.toFixed(2) + "%"
+                        : "n/a"}
+                    </td>
+                    <td class="text-sm sm:text-[1rem] text-end text-white">
+                      {@html abbreviateNumberWithColor(
+                        item?.total_premium,
+                        false,
+                        true,
+                      )}
+                    </td>
+                  </tr>
+                {/each}
+              </tbody>
+            </table>
+          {:else}
+            <div class="m-auto flex justify-center items-center h-80">
+              <div class="relative">
+                <label
+                  class="bg-[#272727] rounded-xl 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 text-gray-400"
+                  ></span>
+                </label>
+              </div>
+            </div>
+          {/if}
+        </div>
+      </div>
+    {:else}
+      <div
+        class="mt-10 flex justify-center sm:justify-start items-center w-full text-white"
+      >
+        No historical data available yet for the given contract
+      </div>
+    {/if}
+  </div>
+  <form method="dialog" class="modal-backdrop">
+    <button>close</button>
+  </form>
+</dialog>
+
+<style>
+  .app {
+    height: 400px;
+    width: 100%;
+  }
+
+  @media (max-width: 560px) {
+    .app {
+      width: 100%;
+      height: 300px;
+    }
+  }
+
+  .chart {
+    width: 100%;
+  }
+</style>