diff --git a/app/actions/addRaceLocation.ts b/app/actions/addRaceLocation.ts
new file mode 100644
index 0000000..ef235fd
--- /dev/null
+++ b/app/actions/addRaceLocation.ts
@@ -0,0 +1,27 @@
+"use server";
+import { db } from "@/lib/db";
+import { getSessionUser } from "@/utils/getSessionUser";
+import { Routes } from "@/utils/router/Routes.constants";
+import { revalidatePath } from "next/cache";
+
+async function addRaceLocation(formData: FormData): Promise<void> {
+  const sessionUser = await getSessionUser();
+
+  if (!sessionUser || !sessionUser.userId) {
+    throw new Error("User ID is required");
+  }
+
+  const { userId } = sessionUser;
+
+  await db.raceLocation.create({
+    data: {
+      city: formData.get("city") as string,
+      state: formData.get("state") as string,
+      userId,
+    },
+  });
+
+  revalidatePath(Routes.ManageRaceLocations, "layout");
+}
+
+export default addRaceLocation;
diff --git a/app/actions/addRaceResult.ts b/app/actions/addRaceResult.ts
index ed75bed..a34487e 100644
--- a/app/actions/addRaceResult.ts
+++ b/app/actions/addRaceResult.ts
@@ -24,13 +24,19 @@ async function addRaceResult(formData: FormData): Promise<void> {
     time,
   };
 
+  const locationId = formData.get("location") as string;
+  const location = await db.raceLocation.findFirst({
+    where: { id: locationId },
+  });
+
   await db.raceResult.create({
     data: {
-      city: (formData.get("city") as string) || "",
+      city: location?.city || "",
       date: new Date(raceResultData.date).toISOString(),
       race: raceResultData.race,
       raceDistance: formData.get("distance") as string,
-      state: (formData.get("state") as string) || "",
+      raceLocationId: locationId,
+      state: location?.state || "",
       time: raceResultData.time,
       userId,
     },
diff --git a/app/actions/deleteRaceLocation.ts b/app/actions/deleteRaceLocation.ts
new file mode 100644
index 0000000..1b90821
--- /dev/null
+++ b/app/actions/deleteRaceLocation.ts
@@ -0,0 +1,31 @@
+"use server";
+import { db } from "@/lib/db";
+import { getSessionUser } from "../../utils/getSessionUser";
+import { revalidatePath } from "next/cache";
+import { Routes } from "@/utils/router/Routes.constants";
+
+async function deleteRaceLocation(raceLocationId: string): Promise<void> {
+  const sessionUser = await getSessionUser();
+
+  if (!sessionUser || !sessionUser.userId) {
+    throw new Error("User ID is required");
+  }
+
+  const { userId } = sessionUser;
+
+  const raceLocation = await db.raceLocation.findFirst({
+    where: { id: raceLocationId },
+  });
+
+  if (!raceLocation) throw new Error("Race Location Not Found");
+
+  if (raceLocation.userId.toString() !== userId) {
+    throw new Error("Unauthorized");
+  }
+
+  await db.raceLocation.delete({ where: { id: raceLocationId } });
+
+  revalidatePath(Routes.ManageRaceLocations, "layout");
+}
+
+export default deleteRaceLocation;
diff --git a/app/actions/editRaceResult.ts b/app/actions/editRaceResult.ts
index 2299070..5810f62 100644
--- a/app/actions/editRaceResult.ts
+++ b/app/actions/editRaceResult.ts
@@ -30,14 +30,20 @@ async function editRaceResult(
   const time = `${hours}:${minutes}:${seconds}`;
   const date = formData.get("date") as string;
 
+  const locationId = formData.get("location") as string;
+  const location = await db.raceLocation.findFirst({
+    where: { id: locationId },
+  });
+
   await db.raceResult.update({
     where: { id: raceResultId },
     data: {
-      city: (formData.get("city") as string) || "",
+      city: location?.city || "",
       date: new Date(date).toISOString(),
       race: formData.get("race") as string,
       raceDistance: formData.get("distance") as string,
-      state: (formData.get("state") as string) || "",
+      raceLocationId: locationId,
+      state: location?.state || "",
       time,
     },
   });
diff --git a/app/settings/manage-locations/page.tsx b/app/settings/manage-locations/page.tsx
new file mode 100644
index 0000000..bfb8c79
--- /dev/null
+++ b/app/settings/manage-locations/page.tsx
@@ -0,0 +1,35 @@
+import Link from "next/link";
+import { ArrowLeft } from "lucide-react";
+import { Routes } from "@/utils/router/Routes.constants";
+import { TabCard } from "@/components/tab-card/TabCard";
+import { Tab } from "@/components/tabs/Tabs.constants";
+import { db } from "@/lib/db";
+import { getSessionUser } from "@/utils/getSessionUser";
+import { LayoutContainer } from "@/components/layout-container/LayoutContainer";
+import { LocationsList } from "@/components/locations-list/LocationsList";
+
+export default async function ManageLocationsPage() {
+  const session = await getSessionUser();
+  const locations = await db.raceLocation.findMany({
+    where: { userId: session?.userId },
+  });
+
+  return (
+    <LayoutContainer>
+      <Link
+        href={Routes.Results}
+        className="inline-flex items-center text-blue-600 hover:text-blue-800 mb-4"
+      >
+        <ArrowLeft className="mr-2 h-4 w-4" />
+        Back to Dashboard
+      </Link>
+      <TabCard tab={Tab.ManageLocations}>
+        <div className="space-y-4 mt-4">
+          <div className="space-y-2">
+            <LocationsList locations={locations} />
+          </div>
+        </div>
+      </TabCard>
+    </LayoutContainer>
+  );
+}
diff --git a/components/charts/distance-comparison-chart/DistanceComparisonChart.tsx b/components/charts/distance-comparison-chart/DistanceComparisonChart.tsx
index 327103a..fbb0e7f 100644
--- a/components/charts/distance-comparison-chart/DistanceComparisonChart.tsx
+++ b/components/charts/distance-comparison-chart/DistanceComparisonChart.tsx
@@ -1,13 +1,6 @@
 "use client";
 
-import {
-  Bar,
-  BarChart,
-  CartesianGrid,
-  LabelList,
-  XAxis,
-  YAxis,
-} from "recharts";
+import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
 
 import {
   Card,
@@ -67,15 +60,7 @@ export const DistanceComparisonChart = (props: IProps) => {
               formatter={(value) => minutesToTime(Number(value))}
             />
             <ChartLegend content={<ChartLegendContent />} />
-            <Bar dataKey="averageTime" fill="#10B981" radius={8}>
-              <LabelList
-                position="top"
-                offset={12}
-                className="fill-foreground"
-                fontSize={12}
-                formatter={(value: string) => minutesToTime(Number(value))}
-              />
-            </Bar>
+            <Bar dataKey="averageTime" fill="#10B981" radius={8} />
           </BarChart>
         </ChartContainer>
       </CardContent>
diff --git a/components/footer/Footer.tsx b/components/footer/Footer.tsx
index cb0e964..eb8e8c6 100644
--- a/components/footer/Footer.tsx
+++ b/components/footer/Footer.tsx
@@ -38,6 +38,12 @@ export const Footer = () => {
                       label="Upcoming Races"
                     />
                   </li>
+                  <li>
+                    <FooterQuickLink
+                      href={Routes.ManageRaceLocations}
+                      label="Manage Race Locations"
+                    />
+                  </li>
                 </ul>
                 <ul className="space-y-2">
                   <li>
diff --git a/components/header/Header.tsx b/components/header/Header.tsx
index 3e743f5..dc2121b 100644
--- a/components/header/Header.tsx
+++ b/components/header/Header.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Button } from "@/components/ui/button";
-import { LogOut, Route, Settings } from "lucide-react";
+import { LogOut, MapPinHouse, Route, Settings } from "lucide-react";
 import { signOut, useSession } from "next-auth/react";
 import { useGlobalContext } from "@/context/global-context/GlobalContext";
 import { Tab } from "@/components/tabs/Tabs.constants";
@@ -36,7 +36,7 @@ export const Header = () => {
   };
 
   return (
-    <div className="flex justify-between items-center mb-6 pt-4">
+    <div className="flex justify-around sm:justify-between items-center mb-6 pt-4">
       <PageHeading activeTab={activeTab} />
       <div className="flex items-center space-x-4">
         <Sheet>
@@ -91,6 +91,14 @@ export const Header = () => {
                 <Route className="mr-2 h-4 w-4" />
                 Manage Race Distances
               </Button>
+              <Button
+                onClick={() => router.push(Routes.ManageRaceLocations)}
+                variant="outline"
+                className="w-full mb-2"
+              >
+                <MapPinHouse className="mr-2 h-4 w-4" />
+                Manage Race Locations
+              </Button>
               <Button
                 onClick={handleLogout}
                 className="w-full bg-pink-500 hover:bg-pink-600 text-white font-bold py-3 px-4 rounded-lg transition duration-300 ease-in-out transform hover:scale-105 flex items-center justify-center"
diff --git a/components/locations-list/LocationsList.tsx b/components/locations-list/LocationsList.tsx
new file mode 100644
index 0000000..c0e82bf
--- /dev/null
+++ b/components/locations-list/LocationsList.tsx
@@ -0,0 +1,120 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import { Plus, Trash2 } from "lucide-react";
+import { Input } from "@/components/ui/input";
+import { useRef, useState } from "react";
+import { useToast } from "@/hooks/use-toast";
+import { ConfirmationDialog } from "@/components/confirmation-dialog/ConfirmationDialog";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "../ui/select";
+import { states } from "../personal-results/PersonalResults.constants";
+import addRaceLocation from "@/app/actions/addRaceLocation";
+import { IRaceLocation } from "./LocationsList.types";
+import deleteRaceLocation from "@/app/actions/deleteRaceLocation";
+
+interface IProps {
+  locations: IRaceLocation[];
+}
+
+export const LocationsList = (props: IProps) => {
+  const formRef = useRef<HTMLFormElement | null>(null);
+  const selectRef = useRef<HTMLSelectElement | null>(null);
+  const { toast } = useToast();
+  const [isConfirmationDialogOpen, setIsConfirmationDialogOpen] =
+    useState<boolean>(false);
+
+  const handleRemoveLocation = async (locationId: string) => {
+    await deleteRaceLocation(locationId);
+    toast({
+      title: "Successfully deleted race location",
+    });
+    setIsConfirmationDialogOpen(false);
+  };
+
+  const handleAddLocation = async (formData: FormData) => {
+    await addRaceLocation(formData);
+    toast({
+      title: "Successfully added race location",
+    });
+
+    formRef.current?.reset();
+    if (selectRef.current) {
+      selectRef.current.value = "";
+    }
+  };
+
+  return (
+    <>
+      <form action={handleAddLocation} className="flex space-x-2" ref={formRef}>
+        <Input
+          name="city"
+          placeholder="Enter city"
+          className="flex-grow"
+          required={true}
+        />
+        <Select name="state" required={true} defaultValue="">
+          <SelectTrigger className="border-blue-300 focus:border-blue-500">
+            <SelectValue
+              placeholder="Select State"
+              defaultValue=""
+              ref={selectRef}
+            />
+          </SelectTrigger>
+          <SelectContent className="bg-white">
+            {states.map((state) => (
+              <SelectItem key={state.value} value={state.value}>
+                {state.label}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+        <Button
+          className="bg-blue-500 hover:bg-blue-600 text-white"
+          type="submit"
+        >
+          <Plus className="h-4 w-4 mr-2" />
+          Add
+        </Button>
+      </form>
+      <div className="space-y-2">
+        {props.locations.map((location, index) => (
+          <div
+            key={index}
+            className="flex justify-between items-center bg-gray-100 p-2 rounded"
+          >
+            <span>
+              {location.city}, {location.state}
+            </span>
+            <div>
+              {/* <EditRaceDistanceDialog
+                distance={distance.distance}
+                id={distance.id}
+              /> */}
+              <Button
+                variant="ghost"
+                size="sm"
+                onClick={() => setIsConfirmationDialogOpen(true)}
+                className="text-red-500 hover:text-red-700"
+              >
+                <Trash2 className="h-4 w-4" />
+              </Button>
+              <ConfirmationDialog
+                description={`This will permanently delete ${location.city}, ${location.state}.`}
+                isOpen={isConfirmationDialogOpen}
+                title="Are you sure you want to delete?"
+                onClose={() => setIsConfirmationDialogOpen(false)}
+                onConfirm={() => handleRemoveLocation(location.id)}
+              />
+            </div>
+          </div>
+        ))}
+      </div>
+    </>
+  );
+};
diff --git a/components/locations-list/LocationsList.types.ts b/components/locations-list/LocationsList.types.ts
new file mode 100644
index 0000000..f32899a
--- /dev/null
+++ b/components/locations-list/LocationsList.types.ts
@@ -0,0 +1,7 @@
+export interface IRaceLocation {
+  createdAt: Date;
+  city: string;
+  id: string;
+  state: string;
+  userId: string;
+}
diff --git a/components/personal-results/PersonalResults.tsx b/components/personal-results/PersonalResults.tsx
index ce9fc7a..65848f0 100644
--- a/components/personal-results/PersonalResults.tsx
+++ b/components/personal-results/PersonalResults.tsx
@@ -19,12 +19,19 @@ export const PersonalResults = async () => {
   const distances = await db.raceDistance.findMany({
     where: { userId: sessionUser?.userId },
   });
+  const locations = await db.raceLocation.findMany({
+    where: { userId: sessionUser?.userId },
+  });
   const hasResults = results.length > 0;
 
   return (
     <div className="space-y-4">
       {hasResults && (
-        <PersonalResultsList distances={distances} results={results} />
+        <PersonalResultsList
+          distances={distances}
+          locations={locations}
+          results={results}
+        />
       )}
       {!hasResults && (
         <NoResults
@@ -35,7 +42,7 @@ export const PersonalResults = async () => {
         />
       )}
       <div className="flex flex-col md:flex-row md:items-center gap-4">
-        <AddResultDialog distances={distances} />
+        <AddResultDialog distances={distances} locations={locations} />
         <Link href={Routes.ManageRaceDistances}>
           <Button
             variant="outline"
diff --git a/components/personal-results/PersonalResults.types.ts b/components/personal-results/PersonalResults.types.ts
index a342aba..a01bb1c 100644
--- a/components/personal-results/PersonalResults.types.ts
+++ b/components/personal-results/PersonalResults.types.ts
@@ -4,6 +4,7 @@ export interface IPersonalResult {
   id: string;
   race: string;
   raceDistance: string;
+  raceLocationId: string | null;
   state?: string;
   time: string;
 }
diff --git a/components/personal-results/add-result-dialog/AddResultDialog.stories.tsx b/components/personal-results/add-result-dialog/AddResultDialog.stories.tsx
index 3ee841a..9a0ae00 100644
--- a/components/personal-results/add-result-dialog/AddResultDialog.stories.tsx
+++ b/components/personal-results/add-result-dialog/AddResultDialog.stories.tsx
@@ -27,6 +27,7 @@ export const IsEditingResult: Story = {
       id: "3",
       race: "Twin Cities Marathon",
       raceDistance: "Marathon",
+      raceLocationId: "1",
       time: "03:30:15",
     },
   },
diff --git a/components/personal-results/add-result-dialog/AddResultDialog.tsx b/components/personal-results/add-result-dialog/AddResultDialog.tsx
index 4b9381e..91f02fa 100644
--- a/components/personal-results/add-result-dialog/AddResultDialog.tsx
+++ b/components/personal-results/add-result-dialog/AddResultDialog.tsx
@@ -19,7 +19,6 @@ import { IPersonalResult } from "@/components/personal-results/PersonalResults.t
 import {
   PersonalResultTime,
   personalResultTimePlaceholders,
-  states,
 } from "@/components/personal-results/PersonalResults.constants";
 import { SubmitButton } from "@/components/buttons/submit-button/SubmitButton";
 import { Tab } from "@/components/tabs/Tabs.constants";
@@ -31,6 +30,7 @@ import { IRaceDistance } from "@/components/race-distances/RaceDistances.types";
 import Link from "next/link";
 import { Routes } from "@/utils/router/Routes.constants";
 import { useToast } from "@/hooks/use-toast";
+import { IRaceLocation } from "@/components/locations-list/LocationsList.types";
 
 interface IProps {
   /**
@@ -42,10 +42,14 @@ interface IProps {
    * List of distances to populate distance dropdown in add result dialog form.
    */
   distances?: IRaceDistance[];
+  /**
+   * List of locations to populate location dropdown in add result dialog form.
+   */
+  locations?: IRaceLocation[];
 }
 
 export const AddResultDialog = (props: IProps) => {
-  const { distances = [] } = props;
+  const { distances = [], locations = [] } = props;
   const [open, setOpen] = useState<boolean>(false);
   const { toast } = useToast();
   const isEditingResult = props.result;
@@ -141,30 +145,28 @@ export const AddResultDialog = (props: IProps) => {
             Add Race Distance
           </Button>
         </Link>
-        <div className="flex flex-col md:flex-row gap-4">
-          <Input
-            defaultValue={props.result?.city}
-            name="city"
-            placeholder="City"
-            required={true}
-            className="border-blue-300 focus:border-blue-500"
-          />
+        <div>
           <Select
-            defaultValue={props.result?.state}
-            name="state"
+            defaultValue={props.result?.raceLocationId || ""}
+            name="location"
             required={true}
           >
             <SelectTrigger className="border-blue-300 focus:border-blue-500">
-              <SelectValue placeholder="Select State" />
+              <SelectValue placeholder="Select Location" />
             </SelectTrigger>
             <SelectContent className="bg-white">
-              {states.map((state) => (
-                <SelectItem key={state.value} value={state.value}>
-                  {state.label}
+              {locations.map((location) => (
+                <SelectItem key={location.id} value={location.id}>
+                  {location.city}, {location.state}
                 </SelectItem>
               ))}
             </SelectContent>
           </Select>
+          <Link href={Routes.ManageRaceLocations}>
+            <Button variant="link" className="hover:text-blue-500">
+              Add Race Location
+            </Button>
+          </Link>
         </div>
         <p className="font-bold pt-3">Finish Time</p>
         <div className="grid md:grid-cols-2 gap-2">
diff --git a/components/personal-results/personal-results-list/PersonalResultsList.stories.tsx b/components/personal-results/personal-results-list/PersonalResultsList.stories.tsx
index edb2e84..9f7d075 100644
--- a/components/personal-results/personal-results-list/PersonalResultsList.stories.tsx
+++ b/components/personal-results/personal-results-list/PersonalResultsList.stories.tsx
@@ -24,6 +24,7 @@ const resultsMock: IPersonalResult[] = [
     id: "1",
     race: "Heart of the City",
     time: "01:05:38",
+    raceLocationId: "1",
   },
   {
     date: new Date("09/14/2024"),
@@ -31,6 +32,7 @@ const resultsMock: IPersonalResult[] = [
     id: "2",
     race: "Circle the Lake",
     time: "00:42:15",
+    raceLocationId: "2",
   },
   {
     date: new Date("10/01/2022"),
@@ -38,12 +40,14 @@ const resultsMock: IPersonalResult[] = [
     id: "3",
     race: "Twin Cities Marathon",
     time: "03:30:15",
+    raceLocationId: "3",
   },
 ];
 
 export const Basic: Story = {
   args: {
     distances: [],
+    locations: [],
     results: resultsMock,
   },
 };
@@ -51,6 +55,7 @@ export const Basic: Story = {
 export const EmptyList: Story = {
   args: {
     distances: [],
+    locations: [],
     results: [],
   },
 };
diff --git a/components/personal-results/personal-results-list/PersonalResultsList.tsx b/components/personal-results/personal-results-list/PersonalResultsList.tsx
index a8aaee5..20a90fc 100644
--- a/components/personal-results/personal-results-list/PersonalResultsList.tsx
+++ b/components/personal-results/personal-results-list/PersonalResultsList.tsx
@@ -8,6 +8,7 @@ import {
   columns,
 } from "@/components/personal-results/personal-results-table/Columns";
 import { DataTable } from "@/components/data-table/DataTable";
+import { IRaceLocation } from "@/components/locations-list/LocationsList.types";
 
 interface IProps {
   /**
@@ -18,6 +19,10 @@ interface IProps {
    * List of distances to populate distance dropdown in add result dialog form.
    */
   distances: IRaceDistance[];
+  /**
+   * List of locations to populate location dropdown in add result dialog form.
+   */
+  locations: IRaceLocation[];
 }
 
 export const PersonalResultsList = (props: IProps) => {
@@ -30,6 +35,7 @@ export const PersonalResultsList = (props: IProps) => {
     time: result.time,
     result,
     distances: props.distances,
+    locations: props.locations,
   }));
 
   return <DataTable columns={columns} data={data} />;
diff --git a/components/personal-results/personal-results-table/Columns.tsx b/components/personal-results/personal-results-table/Columns.tsx
index febc7cd..984540f 100644
--- a/components/personal-results/personal-results-table/Columns.tsx
+++ b/components/personal-results/personal-results-table/Columns.tsx
@@ -6,6 +6,7 @@ import { ArrowUpDown } from "lucide-react";
 import { IPersonalResult } from "@/components/personal-results/PersonalResults.types";
 import { IRaceDistance } from "@/components/race-distances/RaceDistances.types";
 import { PersonalResultsTableActions } from "./personal-results-table-actions/PersonalResultsTableActions";
+import { IRaceLocation } from "@/components/locations-list/LocationsList.types";
 
 export type PersonalResultTableData = {
   id: string;
@@ -16,6 +17,7 @@ export type PersonalResultTableData = {
   time: string;
   result: IPersonalResult;
   distances: IRaceDistance[];
+  locations: IRaceLocation[];
 };
 
 export const columns: ColumnDef<PersonalResultTableData>[] = [
diff --git a/components/personal-results/personal-results-table/personal-results-table-actions/PersonalResultsTableActions.tsx b/components/personal-results/personal-results-table/personal-results-table-actions/PersonalResultsTableActions.tsx
index f668573..bb9e685 100644
--- a/components/personal-results/personal-results-table/personal-results-table-actions/PersonalResultsTableActions.tsx
+++ b/components/personal-results/personal-results-table/personal-results-table-actions/PersonalResultsTableActions.tsx
@@ -43,6 +43,7 @@ export const PersonalResultsTableActions = (props: IProps) => {
       />
       <AddResultDialog
         distances={props.row.original.distances}
+        locations={props.row.original.locations}
         result={props.row.original.result}
       />
     </div>
diff --git a/components/tabs/Tabs.constants.ts b/components/tabs/Tabs.constants.ts
index b9b4660..e971ecf 100644
--- a/components/tabs/Tabs.constants.ts
+++ b/components/tabs/Tabs.constants.ts
@@ -5,6 +5,7 @@ export enum Tab {
   Settings = "settings",
   Stats = "/dashboard/stats",
   RaceDistances = "race-distances",
+  ManageLocations = "/settings/manage-locations",
 }
 
 export const tabLabels: Record<Tab, string> = {
@@ -14,6 +15,7 @@ export const tabLabels: Record<Tab, string> = {
   [Tab.Settings]: "Manage Photos",
   [Tab.Stats]: "Stats",
   [Tab.RaceDistances]: "Manage Race Distances",
+  [Tab.ManageLocations]: "Manage Locations",
 };
 
 export const tabDescriptions: Record<Tab, string> = {
@@ -23,6 +25,7 @@ export const tabDescriptions: Record<Tab, string> = {
   [Tab.Settings]: "Edit and delete your photos",
   [Tab.Stats]: "Analyze your running performance",
   [Tab.RaceDistances]: "Add or remove race distances for your results",
+  [Tab.ManageLocations]: "Add or remove race locations for your results",
 };
 
 export const tabTextColors: Record<Tab, string> = {
@@ -32,6 +35,7 @@ export const tabTextColors: Record<Tab, string> = {
   [Tab.Settings]: "text-blue-600",
   [Tab.Stats]: "text-purple-600",
   [Tab.RaceDistances]: "text-blue-600",
+  [Tab.ManageLocations]: "text-orange-600",
 };
 
 export const tabDescriptionColors: Record<Tab, string> = {
@@ -41,6 +45,7 @@ export const tabDescriptionColors: Record<Tab, string> = {
   [Tab.Settings]: "text-blue-100",
   [Tab.Stats]: "text-purple-100",
   [Tab.RaceDistances]: "text-blue-100",
+  [Tab.ManageLocations]: "text-orange-100",
 };
 
 export const tabBorderColors: Record<Tab, string> = {
@@ -50,6 +55,7 @@ export const tabBorderColors: Record<Tab, string> = {
   [Tab.Settings]: "border-blue-200",
   [Tab.Stats]: "border-purple-200",
   [Tab.RaceDistances]: "border-blue-200",
+  [Tab.ManageLocations]: "border-orange-200",
 };
 
 export const tabBackgroundColors: Record<Tab, string> = {
@@ -59,6 +65,7 @@ export const tabBackgroundColors: Record<Tab, string> = {
   [Tab.Settings]: "bg-blue-500",
   [Tab.Stats]: "bg-purple-500",
   [Tab.RaceDistances]: "bg-blue-500",
+  [Tab.ManageLocations]: "bg-orange-500",
 };
 
 export const tabHoverBackgroundColors: Record<Tab, string> = {
@@ -68,4 +75,5 @@ export const tabHoverBackgroundColors: Record<Tab, string> = {
   [Tab.Settings]: "hover:bg-blue-600",
   [Tab.Stats]: "hover:bg-purple-600",
   [Tab.RaceDistances]: "hover:bg-blue-600",
+  [Tab.ManageLocations]: "hover:bg-orange-600",
 };
diff --git a/components/tabs/Tabs.tsx b/components/tabs/Tabs.tsx
index fe7a88f..34b5145 100644
--- a/components/tabs/Tabs.tsx
+++ b/components/tabs/Tabs.tsx
@@ -15,7 +15,7 @@ export const Tabs = (props: PropsWithChildren) => {
       onValueChange={(value: string) => updateActiveTab(value as Tab)}
     >
       {!shouldHideTabs && (
-        <TabsList className=" bg-opacity-50 p-1 rounded-lg flex items-center justify-start flex-wrap h-auto space-y-1">
+        <TabsList className=" bg-opacity-50 p-1 rounded-lg flex items-center sm:justify-center md:justify-start flex-wrap h-auto space-y-1">
           <TabsTrigger
             className="data-[state=active]:bg-blue-500 data-[state=active]:text-white"
             value={Tab.Results}
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index a5d5866..ba9fd91 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -21,21 +21,24 @@ model User {
   results   RaceResult[]
   photos    RacePhoto[]
   distances RaceDistance[]
+  locations RaceLocation[]
 }
 
 model RaceResult {
-  id           String        @id @default(auto()) @map("_id") @db.ObjectId
-  date         DateTime      @default(now())
-  race         String
-  city         String        @default("")
-  state        String        @default("")
-  time         String
-  userId       String        @db.ObjectId
-  user         User          @relation(fields: [userId], references: [id], onDelete: Cascade)
-  createdAt    DateTime      @default(now())
-  raceDistance String
-  RaceDistance RaceDistance? @relation(fields: [distanceId], references: [id])
-  distanceId   String?       @db.ObjectId
+  id             String        @id @default(auto()) @map("_id") @db.ObjectId
+  date           DateTime      @default(now())
+  race           String
+  city           String        @default("")
+  state          String        @default("")
+  time           String
+  userId         String        @db.ObjectId
+  user           User          @relation(fields: [userId], references: [id], onDelete: Cascade)
+  createdAt      DateTime      @default(now())
+  raceDistance   String
+  RaceDistance   RaceDistance? @relation(fields: [distanceId], references: [id])
+  distanceId     String?       @db.ObjectId
+  RaceLocation   RaceLocation? @relation(fields: [raceLocationId], references: [id])
+  raceLocationId String?       @db.ObjectId
 
   @@index([userId])
 }
@@ -61,3 +64,15 @@ model RaceDistance {
 
   @@index([userId])
 }
+
+model RaceLocation {
+  id         String       @id @default(auto()) @map("_id") @db.ObjectId
+  city       String
+  state      String
+  userId     String       @db.ObjectId
+  user       User         @relation(fields: [userId], references: [id], onDelete: Cascade)
+  createdAt  DateTime     @default(now())
+  RaceResult RaceResult[]
+
+  @@index([userId])
+}
diff --git a/utils/router/Routes.constants.ts b/utils/router/Routes.constants.ts
index 57e46d8..4ecc6d4 100644
--- a/utils/router/Routes.constants.ts
+++ b/utils/router/Routes.constants.ts
@@ -8,6 +8,7 @@ export enum Routes {
   Stats = "/dashboard/stats",
   ManagePhotos = "/settings/manage-photos",
   ManageRaceDistances = "/settings/race-distances",
+  ManageRaceLocations = "/settings/manage-locations",
 }
 
 export enum RoutesDynamicKey {