diff --git a/src/app/exhibitsPage/page.tsx b/src/app/exhibitsPage/page.tsx
index 363693e0..47c11c9e 100644
--- a/src/app/exhibitsPage/page.tsx
+++ b/src/app/exhibitsPage/page.tsx
@@ -1,24 +1,22 @@
-
 'use client';
 
 import React, { useEffect, useState } from 'react';
 import Link from 'next/link';
 import NavBar from '../../components/userComponents/navBar/navBar';
-import { ExhibitRow } from '../../types/types';
-import { fetchAllExhibits } from '../../supabase/exhibits/queries';
+import { CategoryRow } from '../../types/types';
+import { fetchAllCategories } from '../../supabase/category/queries';
 import Exhibit from '../../components/userComponents/Exhibit/Exhibit';
 import BackButton from '../../components/userComponents/BackButton/page';
 
-
 /**
  * @returns exhibit page
  */
 function App() {
-  const [exhibits, setExhibits] = useState<ExhibitRow[]>([]);
+  const [exhibits, setExhibits] = useState<CategoryRow[]>([]);
   useEffect(() => {
     // Get exhibits
     const getExhibits = async () => {
-      const fetchedExhibits: ExhibitRow[] = await fetchAllExhibits();
+      const fetchedExhibits: CategoryRow[] = await fetchAllCategories();
       setExhibits(fetchedExhibits);
     };
     getExhibits();
@@ -31,10 +29,12 @@ function App() {
       setTimeout(() => {
         const element = document.querySelector(hash);
         const yOffset = -50;
-        const y =
-          element.getBoundingClientRect().top + window.scrollY + yOffset;
-        // check on this offset later
-        window.scrollTo({ top: y, behavior: 'instant' });
+        if (element) {
+          const y =
+            element.getBoundingClientRect().top + window.scrollY + yOffset;
+          // check on this offset later
+          window.scrollTo({ top: y, behavior: 'instant' });
+        }
       }, 1000);
     }
   }, []);
@@ -64,7 +64,7 @@ function App() {
         <ul>
           {exhibits.map(exhibit => (
             <Exhibit
-              title={exhibit.title}
+              title={exhibit.category || ''}
               description={exhibit.description || ''}
               image={exhibit.image || ''}
               key={exhibit.id}
@@ -77,4 +77,4 @@ function App() {
   );
 }
 
-export default App;
\ No newline at end of file
+export default App;
diff --git a/src/components/userComponents/BackButton/page.tsx b/src/components/userComponents/BackButton/page.tsx
index 1727e9a8..ff521e50 100644
--- a/src/components/userComponents/BackButton/page.tsx
+++ b/src/components/userComponents/BackButton/page.tsx
@@ -18,13 +18,14 @@ export default function BackButton() {
     <button type="button" onClick={goBack}>
       {' '}
       <svg
-          xmlns="http://www.w3.org/2000/svg"
-          width="20"
-          height="20"
-          viewBox="0 0 20 20"
-          fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+        width="20"
+        height="20"
+        viewBox="0 0 20 20"
+        fill="none"
       >
-        <path className="stroke-scary-forest active:stroke-[#223a1d]"
+        <path
+          className="stroke-scary-forest active:stroke-[#223a1d]"
           d="M17.5 10H2.5M2.5 10L6.66667 14.1667M2.5 10L6.66667 5.83337"
           strokeWidth="1.65"
           strokeLinecap="round"
diff --git a/src/components/userComponents/Exhibit/Exhibit.tsx b/src/components/userComponents/Exhibit/Exhibit.tsx
index 19159520..ed226d3d 100644
--- a/src/components/userComponents/Exhibit/Exhibit.tsx
+++ b/src/components/userComponents/Exhibit/Exhibit.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Image from 'next/image';
-  
+
 /**
  *
  * @param root0 passed in
@@ -19,7 +19,7 @@ export default function Exhibit({
   title: string;
   description: string;
   image: string;
-  id: string;
+  id: number;
 }) {
   return (
     <li key={id} id={`a${id}`}>
diff --git a/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx b/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx
index b6e5fb32..318284a5 100644
--- a/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx
+++ b/src/components/userComponents/SiteMap/DisplayPreviewCard.tsx
@@ -3,12 +3,11 @@ import { LatLngExpression } from 'leaflet';
 import { useMapEvents } from 'react-leaflet';
 import Link from 'next/link';
 import Image from 'next/image';
-import { ExhibitRow, TourRow } from '../../../types/types';
+import { ExhibitWithCategoryRow, TourRow } from '../../../types/types';
 import { fetchImagesForTour } from '../../../supabase/media/queries';
-import { fetchExhibitImage } from '../../../supabase/exhibits/queries';
 
 interface DisplayCardProps {
-  tour: TourRow | ExhibitRow;
+  tour: TourRow | ExhibitWithCategoryRow;
   handleClose: () => void;
   handleClick?: () => void;
 }
@@ -60,12 +59,12 @@ function DisplayPreviewCard({
         }
         displayName = tour.name;
       } else {
-        // Handle as an ExhibitRow
-        const imageObj = await fetchExhibitImage(tour.id);
-        if (imageObj) {
-          imageUrl = imageObj.image;
-        }
-        displayName = tour.title;
+        // Handle as an ExhibitWithCategoryRow
+        // const imageObj = await fetchExhibitImage(tour.id);
+        // if (imageObj) {
+        imageUrl = tour.image;
+        // }
+        displayName = tour.category;
       }
 
       // Set state variables
@@ -149,4 +148,4 @@ function DisplayPreviewCard({
   );
 }
 
-export default DisplayPreviewCard;
\ No newline at end of file
+export default DisplayPreviewCard;
diff --git a/src/components/userComponents/SiteMap/SiteMap.tsx b/src/components/userComponents/SiteMap/SiteMap.tsx
index 1ce494a1..b86c711b 100644
--- a/src/components/userComponents/SiteMap/SiteMap.tsx
+++ b/src/components/userComponents/SiteMap/SiteMap.tsx
@@ -4,13 +4,10 @@ import L, { LatLngExpression } from 'leaflet';
 import React, { useEffect, useState } from 'react';
 import { LayersControl, MapContainer, TileLayer, Marker } from 'react-leaflet';
 import { fetchAllSpotlights } from '../../../supabase/tours/queries';
-import { ExhibitRow, TourRow } from '../../../types/types';
+import { ExhibitWithCategoryRow, TourRow } from '../../../types/types';
 import Control from './Control';
 import DisplayPreviewCard from './DisplayPreviewCard';
-import {
-  fetchExhibit,
-  fetchAllExhibits,
-} from '../../../supabase/exhibits/queries';
+import { fetchAllExhibits } from '../../../supabase/exhibits/queries';
 import { getCategoryColor1 } from '../../../supabase/category/queries';
 import RecenterMap from './MapInteractionHandler';
 
@@ -88,12 +85,12 @@ interface SiteMapProps {
  */
 function SiteMap({ mode }: SiteMapProps) {
   const [spotlightTours, setSpotlightTours] = useState<
-    TourRow[] | ExhibitRow[] | null
+    TourRow[] | ExhibitWithCategoryRow[] | null
   >(null);
   const [colorsMap, setColorsMap] = useState<{ [key: string]: string }>({});
-  const [selectedTour, setSelectedTour] = useState<TourRow | ExhibitRow | null>(
-    null,
-  );
+  const [selectedTour, setSelectedTour] = useState<
+    TourRow | ExhibitWithCategoryRow | null
+  >(null);
   const [mapCenter, setMapCenter] = useState<LatLngExpression>(center);
   const [selectedMarker, setSelectedMarker] = useState<number | null>(null);
   const [resetCenter, setResetCenter] = useState(center); // New state to trigger recentering
@@ -148,7 +145,7 @@ function SiteMap({ mode }: SiteMapProps) {
   }, [selectedTour]);
 
   const handleMarkerSelect = (
-    tour: TourRow | ExhibitRow,
+    tour: TourRow | ExhibitWithCategoryRow,
     markerIndex: number,
   ) => {
     setSelectedTour(tour);
diff --git a/src/supabase/category/queries.tsx b/src/supabase/category/queries.tsx
index 16e83ac5..1624ba41 100644
--- a/src/supabase/category/queries.tsx
+++ b/src/supabase/category/queries.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { DisplayRow } from '../../types/types';
+import { CategoryRow } from '../../types/types';
 import supabase from '../client';
 
 // eslint-disable-next-line jsdoc/require-returns
@@ -22,6 +22,8 @@ import supabase from '../client';
 // Assume this function is in `supabase/category/queries.js`
 /**
  *
+ * @param category which category to get color from
+ * @returns color of category
  */
 // eslint-disable-next-line import/prefer-default-export
 export async function getCategoryColor1(category: string) {
@@ -46,3 +48,15 @@ export async function getCategoryColor1(category: string) {
     return null;
   }
 }
+
+/**
+ * Fetches all categories from the database.
+ * @returns A promise that resolves to an array of ExhibitRow objects.
+ */
+export async function fetchAllCategories(): Promise<CategoryRow[]> {
+  const { data, error } = await supabase.from('categories').select('*');
+  if (error) {
+    throw new Error(error.message);
+  }
+  return data;
+}
diff --git a/src/supabase/exhibits/queries.tsx b/src/supabase/exhibits/queries.tsx
index 93bdea29..cb726955 100644
--- a/src/supabase/exhibits/queries.tsx
+++ b/src/supabase/exhibits/queries.tsx
@@ -7,8 +7,8 @@ import { ExhibitRow } from '../../types/types';
  * Fetches all tours from the database.
  * @returns A promise that resolves to an array of ExhibitRow objects.
  */
-export async function fetchAllExhibits(): Promise<ExhibitRow[]> {
-  const { data, error } = await supabase.from('exhibits').select('*');
+export async function fetchAllExhibits() {
+  const { data, error } = await supabase.rpc('get_exhibits');
   if (error) {
     throw new Error(error.message);
   }
@@ -40,7 +40,7 @@ export async function fetchExhibitImage(
   exhibitId: string,
 ): Promise<{ image: string }> {
   const { data, error } = await supabase
-    .from('exhibits')
+    .from('categories')
     .select('image')
     .eq('id', exhibitId)
     .single();
@@ -121,4 +121,4 @@ export async function deleteExhibit(
     throw new Error(error.message);
   }
   return data;
-}
\ No newline at end of file
+}
diff --git a/src/types/supabase.ts b/src/types/supabase.ts
index 611d93d0..dc4795ad 100644
--- a/src/types/supabase.ts
+++ b/src/types/supabase.ts
@@ -14,38 +14,44 @@ export type Database = {
           category: string | null;
           color_hex: string;
           created_at: string;
+          description: string;
           id: number;
+          image: string;
         };
         Insert: {
           category?: string | null;
           color_hex: string;
           created_at?: string;
+          description: string;
           id?: number;
+          image: string;
         };
         Update: {
           category?: string | null;
           color_hex?: string;
           created_at?: string;
+          description?: string;
           id?: number;
+          image?: string;
         };
         Relationships: [];
       };
       display_media: {
         Row: {
-          display_id: string
-          media_id: string
-          media_placement: string | null
-        }
+          display_id: string;
+          media_id: string;
+          media_placement: string | null;
+        };
         Insert: {
-          display_id: string
-          media_id: string
-          media_placement?: string | null
-        }
+          display_id: string;
+          media_id: string;
+          media_placement?: string | null;
+        };
         Update: {
-          display_id?: string
-          media_id?: string
-          media_placement?: string | null
-        }
+          display_id?: string;
+          media_id?: string;
+          media_placement?: string | null;
+        };
         Relationships: [
           {
             foreignKeyName: 'display_media_display_id_fkey';
@@ -76,7 +82,7 @@ export type Database = {
           coordinates?: Json | null;
           created_at?: string;
           description?: string;
-          id: string;
+          id?: string;
           title?: string;
           updated_at?: string | null;
         };
@@ -85,12 +91,55 @@ export type Database = {
           created_at?: string;
           description?: string;
           id?: string;
-          summary?: string | null;
           title?: string;
           updated_at?: string | null;
         };
         Relationships: [];
       };
+      emails: {
+        Row: {
+          emails: string | null;
+          id: number;
+        };
+        Insert: {
+          emails?: string | null;
+          id?: number;
+        };
+        Update: {
+          emails?: string | null;
+          id?: number;
+        };
+        Relationships: [];
+      };
+      exhibits: {
+        Row: {
+          category_id: number;
+          coordinates: Json | null;
+          id: string;
+          title: string;
+        };
+        Insert: {
+          category_id: number;
+          coordinates?: Json | null;
+          id?: string;
+          title: string;
+        };
+        Update: {
+          category_id?: number;
+          coordinates?: Json | null;
+          id?: string;
+          title?: string;
+        };
+        Relationships: [
+          {
+            foreignKeyName: 'public_exhibits_category_id_fkey';
+            columns: ['category_id'];
+            isOneToOne: false;
+            referencedRelation: 'categories';
+            referencedColumns: ['id'];
+          },
+        ];
+      };
       media: {
         Row: {
           created_at: string;
@@ -118,6 +167,30 @@ export type Database = {
         };
         Relationships: [];
       };
+      news: {
+        Row: {
+          content_link: string;
+          created_at: string;
+          id: string;
+          title: string;
+          updated_at: string | null;
+        };
+        Insert: {
+          content_link: string;
+          created_at?: string;
+          id?: string;
+          title: string;
+          updated_at?: string | null;
+        };
+        Update: {
+          content_link?: string;
+          created_at?: string;
+          id?: string;
+          title?: string;
+          updated_at?: string | null;
+        };
+        Relationships: [];
+      };
       spotlight_recommendations: {
         Row: {
           source_display_id: string;
@@ -252,6 +325,22 @@ export type Database = {
       [_ in never]: never;
     };
     Functions: {
+      fetch_recommended_spotlights: {
+        Args: {
+          source_spotlight_id: string;
+        };
+        Returns: {
+          id: string;
+          name: string;
+          description: string;
+          created_at: string;
+          stop_count: number;
+          spotlight: boolean;
+          preview_text: string;
+          coordinates: Json;
+          category: Database['public']['Enums']['tour_category'];
+        }[];
+      };
       fetchimagesfordisplay: {
         Args: {
           displayid: string;
@@ -278,57 +367,38 @@ export type Database = {
           created_at: string;
         }[];
       };
-      get_spotlight_recommendations: {
-        Args: {
-          source_display_id: string
-        }
-        Returns: {
-          id: string
-          url: string
-          type: string
-          title: string
-          text: string
-          created_at: string
-        }[]
-      }
       get_category_color: {
         Args: {
-          category_in: string
-        }
-        Returns: string
-      }
-      get_spotlight_recommendations: {
-        Args: {
-          source_display_id: string;
+          category_in: string;
         };
+        Returns: string;
+      };
+      get_exhibits: {
+        Args: Record<PropertyKey, never>;
         Returns: {
-          id: string
-          name: string
-          description: string
-          created_at: string
-          stop_count: number
-          spotlight: boolean
-          preview_text: string
-          coordinates: Json
-          category: Database["public"]["Enums"]["tour_category"]
-        }[]
-      }
-      get_spotlight_tours: {
-        Args: Record<PropertyKey, never>
+          id: number;
+          coordinates: Json;
+          category: string;
+          description: string;
+          image: string;
+        }[];
+      };
+      get_non_spotlight_tours: {
+        Args: Record<PropertyKey, never>;
         Returns: {
-          id: string
-          name: string
-          description: string
-          created_at: string
-          stop_count: number
-          spotlight: boolean
-          preview_text: string
-          coordinates: Json
-          category: Database["public"]["Enums"]["tour_category"]
-        }[]
-      }
-      join_spotlights_with_media: {
-        Args: Record<PropertyKey, never>
+          id: string;
+          name: string;
+          description: string;
+          created_at: string;
+          stop_count: number;
+          spotlight: boolean;
+          preview_text: string;
+          coordinates: Json;
+          category: Database['public']['Enums']['tour_category'];
+        }[];
+      };
+      join_all_spotlights_with_media: {
+        Args: Record<PropertyKey, never>;
         Returns: {
           id: string;
           name: string;
@@ -342,7 +412,7 @@ export type Database = {
           media_url: string;
         }[];
       };
-      join_tours_with_media: {
+      join_all_tours_with_media: {
         Args: Record<PropertyKey, never>;
         Returns: {
           id: string;
@@ -352,7 +422,9 @@ export type Database = {
           stop_count: number;
           spotlight: boolean;
           preview_text: string;
-          url: string;
+          coordinates: Json;
+          category: Database['public']['Enums']['tour_category'];
+          media_url: string;
         }[];
       };
     };
@@ -409,13 +481,13 @@ export type TablesInsert<
     }
     ? I
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-        Insert: infer I
-      }
-      ? I
-      : never
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+  ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
+      Insert: infer I;
+    }
+    ? I
     : never
+  : never;
 
 export type TablesUpdate<
   PublicTableNameOrOptions extends
@@ -430,13 +502,13 @@ export type TablesUpdate<
     }
     ? U
     : never
-  : PublicTableNameOrOptions extends keyof PublicSchema["Tables"]
-    ? PublicSchema["Tables"][PublicTableNameOrOptions] extends {
-        Update: infer U
-      }
-      ? U
-      : never
+  : PublicTableNameOrOptions extends keyof PublicSchema['Tables']
+  ? PublicSchema['Tables'][PublicTableNameOrOptions] extends {
+      Update: infer U;
+    }
+    ? U
     : never
+  : never;
 
 export type Enums<
   PublicEnumNameOrOptions extends
diff --git a/src/types/types.ts b/src/types/types.ts
index 4be9f38f..59c19b52 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -4,7 +4,7 @@ This file is meant to create clean type definitions that we can export to keep t
 Any updates to supabase.ts should be reflected here (new tables).
 */
 
-import { Database } from './supabase';
+import { Database, Json } from './supabase';
 
 export type DisplayRow = Database['public']['Tables']['displays']['Row'];
 export type MediaRow = Database['public']['Tables']['media']['Row'];
@@ -14,9 +14,17 @@ export type TourMediaRow = Database['public']['Tables']['tour_media']['Row'];
 export type TourRow = Database['public']['Tables']['tours']['Row'];
 export type NewsRow = Database['public']['Tables']['news']['Row'];
 export type ExhibitRow = Database['public']['Tables']['exhibits']['Row'];
+export type CategoryRow = Database['public']['Tables']['categories']['Row'];
 export type SpotlightRow = {
   tour_row: TourRow;
   url: string;
 };
 export type SpotlightWithMediaRow = TourRow & { media_url: string };
 export type ToursWithMediaRow = TourRow & { media_url: string };
+export type ExhibitWithCategoryRow = {
+  id: number;
+  category: string;
+  description: string;
+  image: string;
+  coordinates: Json;
+};