diff --git a/src/app/deals/[id]/loading.tsx b/src/app/deals/[id]/loading.tsx
new file mode 100644
index 0000000..c7eafcd
--- /dev/null
+++ b/src/app/deals/[id]/loading.tsx
@@ -0,0 +1,6 @@
+import LoadingPreview from '@/components/deals/loading/LoadingPreview'
+import React from 'react'
+
+export default function Loading() {
+  return <LoadingPreview />
+}
diff --git a/src/app/deals/[id]/page.tsx b/src/app/deals/[id]/page.tsx
index 00e967f..408fcc1 100644
--- a/src/app/deals/[id]/page.tsx
+++ b/src/app/deals/[id]/page.tsx
@@ -1,23 +1,25 @@
 import { notFound } from 'next/navigation'
-import { getDealById } from '@/lib/queries'
-import DealPreview from '@/components/DealPreview'
-import { Metadata, ResolvingMetadata } from 'next'
+import { getApprovedDeals, getDealById } from '@/lib/queries'
+import { Metadata } from 'next'
+import DealPreview from '@/components/deals/DealPreview'
 
 export const revalidate = 120
 
 type Props = {
   params: { id: string }
-  searchParams: { [key: string]: string | string[] | undefined }
 }
 
-export async function generateMetadata(
-  { params, searchParams }: Props,
-  parent: ResolvingMetadata
-): Promise<Metadata> {
-  // read route params
-  const id = params.id
+export const dynamicParams = true
 
-  // fetch data
+export async function generateStaticParams() {
+  const deals = await getApprovedDeals()
+
+  return deals.map((deal) => ({
+    id: deal.xata_id,
+  }))
+}
+
+export async function generateMetadata({ params }: Props): Promise<Metadata> {
   const deal = await getDealById(params.id)
 
   if (!deal) {
@@ -35,10 +37,15 @@ export async function generateMetadata(
   }
 }
 
+//sleep function
+function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
 export default async function DealPage({ params }: { params: { id: string } }) {
   if (!params.id) {
-    //not found
+    notFound()
   }
+
   const deal = await getDealById(params.id)
   if (!deal) {
     notFound()
diff --git a/src/app/deals/category/[category]/page.tsx b/src/app/deals/category/[category]/page.tsx
index 531b590..bc042e9 100644
--- a/src/app/deals/category/[category]/page.tsx
+++ b/src/app/deals/category/[category]/page.tsx
@@ -4,6 +4,9 @@ import { Category } from '@/types/Types'
 import { getApprovedDealsByCategory } from '@/lib/queries'
 import PageHeader from '@/components/PageHeader'
 import DealsList from '@/components/deals/DealsList'
+import ApprovedDealsByCategory from '@/components/deals/ApprovedDealsByCategory'
+import { Suspense } from 'react'
+import LoadingDealsList from '@/components/deals/loading/LoadingDealsList'
 
 export const revalidate = 120
 
@@ -23,7 +26,6 @@ export default async function CategoryPage({
   }
   //TODO move logic for converting deals to capitalized and singular to a helper function
   const category = categoryString as Category
-  const deals = await getApprovedDealsByCategory(category)
   let capitalizedCategory = category
     .split(' ')
     .map((word) => word.charAt(0).toUpperCase() + word.toLowerCase().slice(1))
@@ -39,12 +41,9 @@ export default async function CategoryPage({
       <div className="pb-10">
         <CategoryOptions />
       </div>
-      {deals.length === 0 && (
-        <div className="text-center text-xl text-gray-300">
-          No deals found for this category
-        </div>
-      )}
-      <DealsList deals={deals} />
+      <Suspense fallback={<LoadingDealsList count={3} />}>
+        <ApprovedDealsByCategory category={category} />
+      </Suspense>
     </main>
   )
 }
diff --git a/src/app/deals/page.tsx b/src/app/deals/page.tsx
index f4def76..ec04f75 100644
--- a/src/app/deals/page.tsx
+++ b/src/app/deals/page.tsx
@@ -1,13 +1,13 @@
 import CategoryOptions from '@/components/CategoryOptions'
-import { getApprovedDeals } from '@/lib/queries'
 import NeverMissADeal from '@/components/NeverMissADeal'
 import PageHeader from '@/components/PageHeader'
-import DealsList from '@/components/deals/DealsList'
+import ApprovedDeals from '@/components/deals/ApprovedDeals'
+import LoadingDealsList from '@/components/deals/loading/LoadingDealsList'
+import { Suspense } from 'react'
 
 export const revalidate = 120
 
 export default async function DealsPage() {
-  const deals = await getApprovedDeals(20)
   //TODO: handle error
   return (
     <main>
@@ -17,12 +17,9 @@ export default async function DealsPage() {
       <div className="pb-10">
         <CategoryOptions />
       </div>
-      {deals.length === 0 && (
-        <div className="text-center text-xl text-gray-300">
-          No deals found for this category
-        </div>
-      )}
-      <DealsList deals={deals} />
+      <Suspense fallback={<LoadingDealsList count={3} />}>
+        <ApprovedDeals />
+      </Suspense>
       <NeverMissADeal />
     </main>
   )
diff --git a/src/app/page.tsx b/src/app/page.tsx
index d57d723..247db36 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,19 +1,16 @@
+import FeaturedDealsSection from '@/components/deals/FeaturedDealsSection'
 import DevGiveaways from '@/components/DevGiveaways'
-import FeaturedDeals from '@/components/FeaturedDeals'
 import Hero from '@/components/Hero'
 import NeverMissADeal from '@/components/NeverMissADeal'
 import Separator from '@/components/Separator'
-import { getApprovedFeaturedDeals } from '@/lib/queries'
 
 export const revalidate = 120
 
 export default async function Home() {
-  const deals = await getApprovedFeaturedDeals()
   return (
     <main>
       <Hero />
-
-      <FeaturedDeals deals={deals} />
+      <FeaturedDealsSection />
       <Separator className="mb-20" />
       <div className="mb-20">
         <NeverMissADeal />
diff --git a/src/components/IconButton.tsx b/src/components/IconButton.tsx
new file mode 100644
index 0000000..46e3428
--- /dev/null
+++ b/src/components/IconButton.tsx
@@ -0,0 +1,19 @@
+import React from 'react'
+
+export default function IconButton({
+  handleClick,
+  children,
+}: {
+  handleClick: () => void
+  children: React.ReactNode
+}) {
+  return (
+    <button
+      type="button"
+      className="text-brand bg-surface-1  hover:bg-surface-2 flex h-10 w-10 items-center justify-center rounded-full text-xs transition-transform hover:-translate-y-0.5"
+      onClick={handleClick}
+    >
+      {children}
+    </button>
+  )
+}
diff --git a/src/components/Overlay.tsx b/src/components/Overlay.tsx
index 62fdb34..d3abc87 100644
--- a/src/components/Overlay.tsx
+++ b/src/components/Overlay.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { ReactNode } from 'react'
+import { ReactNode, useEffect, useRef } from 'react'
 import { FaTimes } from 'react-icons/fa'
 
 const Overlay = ({
@@ -12,22 +12,29 @@ const Overlay = ({
   onClose: () => void
   children: ReactNode
 }) => {
+  const dialogRef = useRef<HTMLDialogElement>(null)
+
+  useEffect(() => {
+    if (isOpen) {
+      dialogRef.current?.showModal()
+    } else {
+      dialogRef.current?.close()
+    }
+  })
   return (
-    <div
-      className={`fixed inset-0  flex items-center justify-center p-10 ${
-        isOpen ? 'block' : 'hidden'
-      } z-50 bg-gray-950/[.80] `}
+    <dialog
+      ref={dialogRef}
+      className="hide-scrollbar fixed inset-0 h-[90vh]  w-full max-w-4xl rounded-xl  bg-gray-900 px-4 pt-16 shadow-lg backdrop:bg-gray-950/[.80] md:px-8 md:pt-16"
     >
-      <div className="hide-scrollbar relative h-[90vh]  w-full max-w-4xl overflow-y-scroll rounded-xl  bg-gray-900 px-4 pt-16 shadow-lg md:px-8 md:pt-16">
-        <button
-          onClick={onClose}
-          className="fixed right-3 top-3 text-gray-400 transition-colors hover:text-white focus:outline-none"
-        >
-          <FaTimes className="h-10" />
-        </button>
-        {children}
-      </div>
-    </div>
+      <button
+        onClick={onClose}
+        className="fixed right-3 top-3 text-gray-400 transition-colors hover:text-white"
+        aria-label="Close"
+      >
+        <FaTimes className="h-10" />
+      </button>
+      {children}
+    </dialog>
   )
 }
 
diff --git a/src/components/deals/ApprovedDeals.tsx b/src/components/deals/ApprovedDeals.tsx
new file mode 100644
index 0000000..b22d3a6
--- /dev/null
+++ b/src/components/deals/ApprovedDeals.tsx
@@ -0,0 +1,9 @@
+import { getApprovedDeals } from '@/lib/queries'
+import React from 'react'
+import DealsList from './DealsList'
+
+export default async function ApprovedDeals() {
+  const deals = await getApprovedDeals(20)
+
+  return <DealsList deals={deals} />
+}
diff --git a/src/components/deals/ApprovedDealsByCategory.tsx b/src/components/deals/ApprovedDealsByCategory.tsx
new file mode 100644
index 0000000..cd9cbcd
--- /dev/null
+++ b/src/components/deals/ApprovedDealsByCategory.tsx
@@ -0,0 +1,14 @@
+import { getApprovedDealsByCategory } from '@/lib/queries'
+import React from 'react'
+import DealsList from './DealsList'
+import { Category } from '@/types/Types'
+
+export default async function ApprovedDealsByCategory({
+  category,
+}: {
+  category: Category
+}) {
+  const deals = await getApprovedDealsByCategory(category)
+
+  return <DealsList deals={deals} />
+}
diff --git a/src/components/deals/DealCard.tsx b/src/components/deals/DealCard.tsx
index d2490c0..7d38b95 100644
--- a/src/components/deals/DealCard.tsx
+++ b/src/components/deals/DealCard.tsx
@@ -1,17 +1,8 @@
 import Link from 'next/link'
-import { FaBeer, FaVideo, FaBook, FaCog, FaCalendar } from 'react-icons/fa'
 import { Category } from '@/types/Types'
 import { Deal } from '@prisma/client'
 import DealImage from './DealImage'
 
-const categoryToIcon: { [key: string]: JSX.Element } = {
-  Misc: <FaBeer />,
-  Ebook: <FaBook />,
-  Video: <FaVideo />,
-  Tool: <FaCog />,
-  Conference: <FaCalendar />,
-}
-
 export default function DealCard({ deal }: { deal: Deal }) {
   return (
     <Link
@@ -24,7 +15,7 @@ export default function DealCard({ deal }: { deal: Deal }) {
         coverImageURL={deal.coverImageURL}
         category={deal.category as Category}
       />
-      <h2 className="text-lg font-semibold tracking-tight">{deal.name}</h2>
+      <h2 className="mt-1 text-lg font-semibold tracking-tight">{deal.name}</h2>
       {deal.coupon && deal.couponPercent && (
         <p className="-gap-y-1 absolute right-3 top-3 flex h-14 w-14 -rotate-12 flex-col items-center justify-center rounded-full bg-pale-gold  text-black shadow-md">
           <span className="text-md -mb-1 font-bold">{deal.couponPercent}%</span>
diff --git a/src/components/DealGradientPlaceholder.tsx b/src/components/deals/DealGradientPlaceholder.tsx
similarity index 95%
rename from src/components/DealGradientPlaceholder.tsx
rename to src/components/deals/DealGradientPlaceholder.tsx
index 9e6a71a..67a9db2 100644
--- a/src/components/DealGradientPlaceholder.tsx
+++ b/src/components/deals/DealGradientPlaceholder.tsx
@@ -1,19 +1,13 @@
 import { Category } from '@/types/Types'
 import React from 'react'
 import {
-  FaBeer,
   FaBook,
-  FaCalendar,
   FaChair,
   FaCog,
-  FaCompactDisc,
-  FaDeskpro,
   FaDesktop,
   FaMicrophone,
   FaSchool,
-  FaTable,
   FaTag,
-  FaVideo,
 } from 'react-icons/fa'
 import { twMerge } from 'tailwind-merge'
 
diff --git a/src/components/deals/DealImage.tsx b/src/components/deals/DealImage.tsx
index 150bfbd..d2e01f0 100644
--- a/src/components/deals/DealImage.tsx
+++ b/src/components/deals/DealImage.tsx
@@ -1,7 +1,7 @@
 import { Category } from '@/types/Types'
 import { Deal } from '@prisma/client'
 import React from 'react'
-import DealGradientPlaceholder from '../DealGradientPlaceholder'
+import DealGradientPlaceholder from './DealGradientPlaceholder'
 import Image from 'next/image'
 
 interface IDealImageProps {
diff --git a/src/components/DealPreview.tsx b/src/components/deals/DealPreview.tsx
similarity index 87%
rename from src/components/DealPreview.tsx
rename to src/components/deals/DealPreview.tsx
index 3f9cd5f..1720f06 100644
--- a/src/components/DealPreview.tsx
+++ b/src/components/deals/DealPreview.tsx
@@ -1,10 +1,7 @@
 import { format } from 'date-fns'
-import React from 'react'
-import DealGradientPlaceholder from './DealGradientPlaceholder'
 import { Category } from '@/types/Types'
-import Image from 'next/image'
-import ClickableCoupon from './ClickableCouponCode'
-import DealImage from './deals/DealImage'
+import DealImage from './DealImage'
+import ClickableCoupon from '../ClickableCouponCode'
 
 export default function DealPreview({
   link,
@@ -35,8 +32,8 @@ export default function DealPreview({
           category={category as Category}
         />
       </div>
-      <div className="flex  flex-col gap-y-1">
-        <span className="text-xl md:text-3xl">{name}</span>
+      <div className="flex flex-col gap-y-1">
+        <h1 className="text-xl md:text-3xl">{name}</h1>
         <div className="mt-2 flex flex-wrap gap-2 text-sm md:mt-4 md:text-lg">
           <span className="font-light text-white/70">Website:</span>
           <a
diff --git a/src/components/deals/DealsList.tsx b/src/components/deals/DealsList.tsx
index d6ef962..1eb84d2 100644
--- a/src/components/deals/DealsList.tsx
+++ b/src/components/deals/DealsList.tsx
@@ -10,6 +10,9 @@ export default function DealsList({
 }) {
   return (
     <div className="mx-auto py-10">
+      {deals.length === 0 && (
+        <div className="text-center text-xl text-gray-300">No deals found</div>
+      )}
       {deals.length > 0 && (
         <div className="mx-auto grid grid-cols-1 justify-items-center gap-x-4 gap-y-12 sm:grid-cols-2  lg:gap-x-12 xl:grid-cols-3">
           <>
diff --git a/src/components/deals/FeaturedDeals.tsx b/src/components/deals/FeaturedDeals.tsx
new file mode 100644
index 0000000..112c89c
--- /dev/null
+++ b/src/components/deals/FeaturedDeals.tsx
@@ -0,0 +1,7 @@
+import DealsList from './DealsList'
+import { getApprovedFeaturedDeals } from '@/lib/queries'
+
+export default async function FeaturedDeals() {
+  const deals = await getApprovedFeaturedDeals()
+  return <DealsList deals={deals} />
+}
diff --git a/src/components/FeaturedDeals.tsx b/src/components/deals/FeaturedDealsSection.tsx
similarity index 61%
rename from src/components/FeaturedDeals.tsx
rename to src/components/deals/FeaturedDealsSection.tsx
index 427b0a9..a8c6f4a 100644
--- a/src/components/FeaturedDeals.tsx
+++ b/src/components/deals/FeaturedDealsSection.tsx
@@ -1,9 +1,9 @@
-import React from 'react'
-import DealsList from './deals/DealsList'
 import Link from 'next/link'
-import { Deal } from '@prisma/client'
+import FeaturedDeals from './FeaturedDeals'
+import { Suspense } from 'react'
+import LoadingDealsList from './loading/LoadingDealsList'
 
-export default function FeaturedDeals({ deals }: { deals: Deal[] }) {
+export default function FeaturedDealsSection() {
   return (
     <section className="py-20">
       <div className="flex flex-col items-center gap-x-8 gap-y-4 pb-10 md:flex-row">
@@ -18,7 +18,9 @@ export default function FeaturedDeals({ deals }: { deals: Deal[] }) {
           View all deals
         </Link>
       </div>
-      <DealsList deals={deals} />
+      <Suspense fallback={<LoadingDealsList count={3} />}>
+        <FeaturedDeals />
+      </Suspense>
     </section>
   )
 }
diff --git a/src/components/deals/loading/LoadingDealImage.tsx b/src/components/deals/loading/LoadingDealImage.tsx
new file mode 100644
index 0000000..aa0e7e8
--- /dev/null
+++ b/src/components/deals/loading/LoadingDealImage.tsx
@@ -0,0 +1,5 @@
+export default function LoadingDealImage() {
+  return (
+    <div className=" flex aspect-video w-full animate-pulse items-center justify-center rounded-xl border-4 border-slate-500 bg-gray-100"></div>
+  )
+}
diff --git a/src/components/deals/loading/LoadingDealsList.tsx b/src/components/deals/loading/LoadingDealsList.tsx
new file mode 100644
index 0000000..cc901a6
--- /dev/null
+++ b/src/components/deals/loading/LoadingDealsList.tsx
@@ -0,0 +1,20 @@
+import LoadingDealImage from './LoadingDealImage'
+
+export default function LoadingDealsList({ count }: { count: number }) {
+  const arr = Array.from(Array(count).keys())
+
+  return (
+    <div className="mx-auto py-10">
+      <div className="mx-auto grid grid-cols-1 justify-items-center gap-x-4 gap-y-12 sm:grid-cols-2  lg:gap-x-12 xl:grid-cols-3">
+        <>
+          {arr.map((num) => (
+            <div key={num} className="w-full">
+              <LoadingDealImage />
+              <div className="mt-1 h-[1.75rem]"></div>
+            </div>
+          ))}
+        </>
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/deals/loading/LoadingPreview.tsx b/src/components/deals/loading/LoadingPreview.tsx
new file mode 100644
index 0000000..2e5ba6e
--- /dev/null
+++ b/src/components/deals/loading/LoadingPreview.tsx
@@ -0,0 +1,11 @@
+import LoadingDealImage from './LoadingDealImage'
+
+export default function LoadingPreview() {
+  return (
+    <div className="flex flex-col items-start gap-10 text-white xl:flex-row xl:items-center">
+      <div className="align-center relative aspect-video w-full max-w-[600px] self-center">
+        <LoadingDealImage />
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/forms/add-a-deal/ReviewDeal.tsx b/src/components/forms/add-a-deal/ReviewDeal.tsx
index cc0fbfc..5071d73 100644
--- a/src/components/forms/add-a-deal/ReviewDeal.tsx
+++ b/src/components/forms/add-a-deal/ReviewDeal.tsx
@@ -2,10 +2,10 @@
 import { useRouter } from 'next/navigation'
 import { useAddDealContext } from '@/context/AddDealContext'
 import toast from 'react-hot-toast'
-import DealPreview from '@/components/DealPreview'
 import Loading from '@/components/Loading'
 import { submitDealAction } from '@/app/deals/add/actions'
 import { NewDealType } from '@/app/deals/add/schemas'
+import DealPreview from '@/components/deals/DealPreview'
 
 export default function ReviewDeal() {
   const { newDealData, dataLoaded } = useAddDealContext()
diff --git a/src/components/search/GlobalSearch.tsx b/src/components/search/GlobalSearch.tsx
index 3ffeaa4..5325640 100644
--- a/src/components/search/GlobalSearch.tsx
+++ b/src/components/search/GlobalSearch.tsx
@@ -88,6 +88,7 @@ export default function GlobalSearch() {
             <button
               className="absolute right-4 top-6"
               onClick={handleClearSearch}
+              aria-label="Clear search query"
             >
               <FaTimes className="text-gray-400 hover:text-gray-100" />
             </button>
diff --git a/src/components/search/SearchResults.tsx b/src/components/search/SearchResults.tsx
index ac313e2..d80e6c0 100644
--- a/src/components/search/SearchResults.tsx
+++ b/src/components/search/SearchResults.tsx
@@ -31,7 +31,7 @@ export default function SearchResults({
       )}
 
       {!loading && deals && deals.length === 0 && (
-        <div className="text-center text-gray-100">
+        <div className="text-center text-gray-100" role="alert">
           <p className="mt-8 pb-1 text-center text-xl font-bold ">
             No results for search{' '}
             <span className="font-normal">{'"' + searchQuery + '"'}</span>
diff --git a/src/components/search/SearchedDeal.tsx b/src/components/search/SearchedDeal.tsx
index de9502a..5219c00 100644
--- a/src/components/search/SearchedDeal.tsx
+++ b/src/components/search/SearchedDeal.tsx
@@ -1,6 +1,6 @@
 import { Category } from '@/types/Types'
 import { Deal } from '@prisma/client'
-import DealGradientPlaceholder from '../DealGradientPlaceholder'
+import DealGradientPlaceholder from '../deals/DealGradientPlaceholder'
 import Image from 'next/image'
 import Link from 'next/link'
 import React from 'react'