diff --git a/amplify/data/resource.ts b/amplify/data/resource.ts
index a7bb7644..abc90963 100644
--- a/amplify/data/resource.ts
+++ b/amplify/data/resource.ts
@@ -131,6 +131,7 @@ const schema = a
         id: a.id().required(),
         time: a.datetime().required(),
         zoomLink: a.string().required(),
+        duration: a.integer(),
         teamId: a.id().required(),
         roomId: a.id().required(),
         team: a.belongsTo("Team", "teamId"),
diff --git a/amplify/function/BusinessLogic/ScheduleTeamsAndJudges/handler.ts b/amplify/function/BusinessLogic/ScheduleTeamsAndJudges/handler.ts
index 3d8ce54c..b8352b3b 100644
--- a/amplify/function/BusinessLogic/ScheduleTeamsAndJudges/handler.ts
+++ b/amplify/function/BusinessLogic/ScheduleTeamsAndJudges/handler.ts
@@ -118,6 +118,7 @@ export const handler: Schema["ScheduleTeamsAndJudges"]["functionHandler"] =
                 time: currTime.toISOString(),
                 roomId: roomIds[column],
                 zoomLink: "",
+                duration: presentationDuration,
               },
             },
           }),
diff --git a/amplify/graphql/API.ts b/amplify/graphql/API.ts
index 394c22af..dda5abab 100644
--- a/amplify/graphql/API.ts
+++ b/amplify/graphql/API.ts
@@ -122,6 +122,7 @@ export type TeamRoom = {
   time: string;
   updatedAt: string;
   zoomLink: string;
+  duration?: number | null;
 };
 
 export type Room = {
@@ -493,6 +494,7 @@ export type CreateTeamRoomInput = {
   teamId: string;
   time: string;
   zoomLink: string;
+  duration?: number | null;
 };
 
 export type ModelUserConditionInput = {
@@ -623,6 +625,7 @@ export type UpdateTeamRoomInput = {
   teamId?: string | null;
   time?: string | null;
   zoomLink?: string | null;
+  duration?: number | null;
 };
 
 export type UpdateUserInput = {
diff --git a/amplify/graphql/mutations.ts b/amplify/graphql/mutations.ts
index 79099b55..20ddf45d 100644
--- a/amplify/graphql/mutations.ts
+++ b/amplify/graphql/mutations.ts
@@ -342,6 +342,7 @@ export const createTeamRoom = /* GraphQL */ `mutation CreateTeamRoom(
     time
     updatedAt
     zoomLink
+    duration
     __typename
   }
 }
diff --git a/amplify/graphql/queries.ts b/amplify/graphql/queries.ts
index f6f4ce73..3348ac36 100644
--- a/amplify/graphql/queries.ts
+++ b/amplify/graphql/queries.ts
@@ -186,6 +186,7 @@ export const getTeamRoom = /* GraphQL */ `query GetTeamRoom($id: ID!) {
     time
     updatedAt
     zoomLink
+    duration
     __typename
   }
 }
@@ -427,6 +428,7 @@ export const listTeamRooms = /* GraphQL */ `query ListTeamRooms(
       time
       updatedAt
       zoomLink
+      duration
       __typename
     }
     nextToken
diff --git a/src/app/admin/components/UsersTable.tsx b/src/app/admin/components/UsersTable.tsx
index 23d1c2a6..5ad38e0f 100644
--- a/src/app/admin/components/UsersTable.tsx
+++ b/src/app/admin/components/UsersTable.tsx
@@ -19,11 +19,21 @@ export default function UsersTable({ users }: { users: User[] }) {
   const deleteUser = async (id: Schema["User"]["deleteType"]) =>
     client.models.User.delete(id);
   const updateUser = async (updatedData: Schema["User"]["updateType"]) => {
+    if (updatedData.role) {
+      const roleUpdateResult = await client.mutations.AddUserToGroup({
+        userId: updatedData.id,
+        groupName: updatedData.role,
+      });
+
+      if (roleUpdateResult.errors) {
+        throw new Error("Failed to update user role in Cognito");
+      }
+    }
+
     return client.models.User.update({
       id: updatedData.id,
       firstName: updatedData.firstName,
       lastName: updatedData.lastName,
-      role: updatedData.role,
       teamId: updatedData.teamId,
     });
   };
diff --git a/src/app/judging/JudgingTable.tsx b/src/app/judging/JudgingTable.tsx
index 76715f62..4b4cc630 100644
--- a/src/app/judging/JudgingTable.tsx
+++ b/src/app/judging/JudgingTable.tsx
@@ -20,7 +20,6 @@ export default function JudgingTable({
 }) {
   const [selectedTeam, setSelectedTeamId] = useState("");
   const [teamName, setTeamName] = useState("");
-  const [teamsLeft, setTeamsLeft] = useState(0);
 
   const { currentUser } = useUser();
   const { data: roomData, isFetching: roomIsFetching } = useQuery({
@@ -51,30 +50,31 @@ export default function JudgingTable({
         return teams;
       },
     });
-  const isFetching = roomIsFetching && teamsForRoomIsFetching;
+
+  const { data: teamsLeft = 0, isFetching: teamsLeftIsFetching } = useQuery({
+    queryKey: ["TeamsLeftCount", teamsForRoomData, currentUser.username],
+    queryFn: async () => {
+      if (!teamsForRoomData) return 0;
+      const boolArray = await Promise.all(
+        teamsForRoomData.map(async (team) => {
+          const scores = await team?.scores();
+          return (
+            scores?.data.filter(
+              (score) => score.judgeId === currentUser.username,
+            ).length === 0
+          );
+        }),
+      );
+      return teamsForRoomData.filter((_, i) => boolArray[i]).length;
+    },
+    enabled: !!teamsForRoomData && !!currentUser.username,
+  });
+
+  const isFetching =
+    roomIsFetching || teamsForRoomIsFetching || teamsLeftIsFetching;
   if (isFetching || !roomData || !teamsForRoomData) {
     return <KevinLoadingRing />;
   }
-  async function getFilteredTeamsCount() {
-    // https://medium.com/@debbs119/array-filter-and-array-map-with-async-functions-9636e1ae8d6e --> why it needs to map to a boolean array first
-    if (!teamsForRoomData) {
-      return;
-    }
-    const boolArray = await Promise.all(
-      teamsForRoomData?.map(async (team) => {
-        const scores = await team?.scores();
-        return (
-          scores?.data.filter((score) => score.judgeId === currentUser.username)
-            .length === 0
-        );
-      }),
-    );
-    setTeamsLeft(
-      teamsForRoomData?.filter((_, index) => boolArray[index]).length,
-    );
-  }
-
-  getFilteredTeamsCount();
 
   const panelData = [
     {
diff --git a/src/app/judging/assigned-teams/page.tsx b/src/app/judging/assigned-teams/page.tsx
index f3f80d96..d43adf34 100644
--- a/src/app/judging/assigned-teams/page.tsx
+++ b/src/app/judging/assigned-teams/page.tsx
@@ -1,18 +1,81 @@
+"use client";
+
+import React from "react";
+import { client } from "@/app/QueryProvider";
+import { useUser } from "@/components/contexts/UserContext";
+import KevinLoadingRing from "@/components/KevinLoadingRing";
+import { useQuery } from "@tanstack/react-query";
+
 const AssignedTeamsPage = () => {
-  const assignedTeams = [
-    { id: 1, name: "Team Alpha" },
-    { id: 2, name: "Team Beta" },
-    { id: 3, name: "Team Gamma" },
-  ];
+  const { currentUser } = useUser();
+
+  const { data: roomData, isLoading: roomLoading } = useQuery({
+    queryKey: ["RoomForJudge", currentUser?.JUDGE_roomId],
+    queryFn: async () => {
+      if (!currentUser?.JUDGE_roomId)
+        throw new Error("No room assigned to judge");
+      const { data, errors } = await client.models.Room.get({
+        id: currentUser.JUDGE_roomId,
+      });
+      if (errors) throw new Error(errors[0]?.message || "Failed to load room");
+      return data;
+    },
+    enabled: !!currentUser?.JUDGE_roomId,
+  });
+
+  const { data: teamsForRoom, isLoading: teamsLoading } = useQuery({
+    queryKey: ["TeamsForRoom", roomData?.id],
+    queryFn: async () => {
+      if (!roomData) return [];
+      const teamRooms = (await roomData.teamRoom())?.data;
+      if (!teamRooms) return [];
+      const teams = await Promise.all(
+        teamRooms.map(async (tr) => (await tr.team()).data),
+      );
+      return teams;
+    },
+    enabled: !!roomData,
+  });
+
+  if (!currentUser)
+    return <div className="p-6">Please sign in to see assigned teams.</div>;
+  if (roomLoading || teamsLoading)
+    return (
+      <div className="flex items-center justify-center pt-16">
+        <KevinLoadingRing />
+      </div>
+    );
+  if (!roomData)
+    return <div className="p-6">You have no room assigned yet.</div>;
 
   return (
-    <div>
-      <h1> Put assinged teams here Assigned Teams</h1>
-      <ul>
-        {assignedTeams.map((team) => (
-          <li key={team.id}>{team.name}</li>
-        ))}
-      </ul>
+    <div className="p-6">
+      <h1 className="mb-4 text-2xl font-semibold">
+        Your Teams: {roomData?.name ?? ""}
+      </h1>
+      {teamsForRoom && teamsForRoom.length > 0 ? (
+        <div className="grid w-full grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
+          {teamsForRoom.map((team: any) => (
+            <div
+              key={team.id}
+              className="flex flex-col justify-between rounded-lg border bg-white p-4 shadow-sm transition-shadow hover:shadow-lg"
+            >
+              <div>
+                <div className="text-lg font-bold text-gray-900">
+                  <span>{team.name}</span>
+                </div>
+                <div className="mt-1 text-sm text-gray-500">
+                  <span>Team ID: {team.id}</span>
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+      ) : (
+        <div className="text-gray-600">
+          No teams assigned to your room yet. Check back later!
+        </div>
+      )}
     </div>
   );
 };
diff --git a/src/components/LandingPage/HeroSection.tsx b/src/components/LandingPage/HeroSection.tsx
index e9bdb6e8..3ff619eb 100644
--- a/src/components/LandingPage/HeroSection.tsx
+++ b/src/components/LandingPage/HeroSection.tsx
@@ -19,8 +19,8 @@ export default async function HeroSection() {
     return <div>Hackathon hasn't been created yet</div>;
   }
 
-  const eventStartDate = new Date(hackathonData[0].startDate);
-  const eventEndDate = new Date(hackathonData[0].endDate);
+  const eventStartDate = new Date(2025, 10, 8, 9, 0, 0); // Month is 0-indexed → 10 = November
+  const eventEndDate = new Date(2025, 10, 9, 17, 0, 0); // Example: Sunday 5 PM
 
   return (
     <div className="relative flex flex-col items-center justify-center md:px-8 md:py-16 lg:px-32">
diff --git a/src/components/admin/Judging/JudgingSchedule.tsx b/src/components/admin/Judging/JudgingSchedule.tsx
index b97e81e7..8cfe9986 100644
--- a/src/components/admin/Judging/JudgingSchedule.tsx
+++ b/src/components/admin/Judging/JudgingSchedule.tsx
@@ -168,7 +168,10 @@ export default function JudgingSchedule() {
               .join(", ") || "No Team Name",
           room_id: teamRoom.roomId,
           start: new Date(teamRoom.time),
-          end: new Date(new Date(teamRoom.time).getTime() + 15 * 60 * 1000),
+          end: new Date(
+            new Date(teamRoom.time).getTime() +
+              (teamRoom.duration ?? 10) * 60 * 1000,
+          ),
           zoomLink: teamRoom.zoomLink,
         }))
       : [];
diff --git a/src/components/admin/Judging/JudgingTimeline.tsx b/src/components/admin/Judging/JudgingTimeline.tsx
index 7bd8f221..28ea0c12 100644
--- a/src/components/admin/Judging/JudgingTimeline.tsx
+++ b/src/components/admin/Judging/JudgingTimeline.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Scheduler } from "@aldabil/react-scheduler";
+import RedirectIcon from "../../RedirectIcon";
 
 type JudgeRoom = {
   roomName: string;
@@ -48,11 +49,14 @@ export default function JudgingTimeline({
           deletable={false}
           viewerExtraComponent={(fields, event) => {
             return (
-              <p>
+              <a
+                href={event.zoomLink}
+                className="inline-flex flex-row items-center gap-1 text-dark-green hover:underline"
+              >
                 {/* Replace with actual zoom link not the room id */}
-                <span className="font-bold">Zoom Link:</span>{" "}
-                <a href={event.zoomLink}>{event.title}</a>
-              </p>
+                <span className="font-bold">Zoom Link</span>
+                <RedirectIcon />
+              </a>
             );
           }}
         />
diff --git a/src/components/admin/Judging/RoomAssigner.tsx b/src/components/admin/Judging/RoomAssigner.tsx
index d2da6fda..a87dd22a 100644
--- a/src/components/admin/Judging/RoomAssigner.tsx
+++ b/src/components/admin/Judging/RoomAssigner.tsx
@@ -21,6 +21,8 @@ export default function RoomAssigner({
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<string | null>(null);
 
+  const ZOOM_LINK = process.env.NEXT_PUBLIC_ZOOM_LINK;
+
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setInputValue(e.target.value);
   };
@@ -48,13 +50,21 @@ export default function RoomAssigner({
         presentationDuration: Number(duration),
       });
 
-      const meetingData = await createZoomMeeting(
-        formattedDate,
-        Number(duration),
-      );
+      // dynamically create zoom links
+      // const meetingData = await createZoomMeeting(
+      //   formattedDate,
+      //   Number(duration),
+      // );
+
+      // setMeetingLink(meetingData.join_url);
+      // updateTeamRoomsWithZoomLink();
+
+      // temporary hardcoded zoom link
+      if (!ZOOM_LINK) {
+        throw new Error("Zoom link missing in .env.");
+      }
 
-      setMeetingLink(meetingData.join_url);
-      updateTeamRoomsWithZoomLink(meetingData.join_url);
+      updateTeamRoomsWithZoomLink(ZOOM_LINK);
     } catch (err) {
       setError("Failed to create Zoom meeting.");
     } finally {
@@ -72,7 +82,7 @@ export default function RoomAssigner({
           >
             <div className="flex w-full flex-col gap-4 md:flex-row">
               <div className="flex w-full flex-col gap-2 md:w-1/4">
-                <label htmlFor="numberOfRooms">Enter Number of Room:</label>
+                <label htmlFor="numberOfRooms">Enter Number of Rooms:</label>
                 <input
                   className="flex items-center justify-between rounded-lg border-2 border-awesome-purple bg-white p-4 font-bold text-black duration-100 hover:border-awesomer-purple active:border-awesome-purple active:text-black"
                   type="number"
@@ -82,7 +92,7 @@ export default function RoomAssigner({
                 />
               </div>
               <div className="flex w-full flex-col gap-2 md:w-1/4">
-                <label htmlFor="duration">Enter Judging Duration:</label>
+                <label htmlFor="duration">Enter Duration (minutes):</label>
                 <input
                   id="duration"
                   className="flex items-center justify-between rounded-lg border-2 border-awesome-purple bg-white p-4 font-bold text-black duration-100 hover:border-awesomer-purple active:border-awesome-purple active:text-black"
diff --git a/src/components/admin/RankingTable.tsx b/src/components/admin/RankingTable.tsx
index 4341e479..1bd030d4 100644
--- a/src/components/admin/RankingTable.tsx
+++ b/src/components/admin/RankingTable.tsx
@@ -29,11 +29,13 @@ function TableRow({
   components = {},
   index = 0,
   total = 0,
+  scoringMetrics,
 }: {
   teamName?: string;
   components?: ITeamScores[string]["components"];
   index?: number;
   total?: number;
+  scoringMetrics: Schema["Hackathon"]["type"]["scoringComponents"];
 }) {
   const bgColor = index % 2 === 1 ? "bg-white" : "bg-dashboard-grey";
   return (
@@ -41,19 +43,33 @@ function TableRow({
       <td className="truncate whitespace-nowrap px-6 py-4 font-medium text-dark-grey">
         {teamName}
       </td>
-      {Object.keys(components).map((componentId) => {
-        return (
-          <td
-            key={componentId}
-            className="border-l-2 border-l-white px-6 py-4 text-black"
-          >
-            {components[componentId]}
-          </td>
-        );
-      })}
+      {scoringMetrics
+        .filter((metric) => !metric.isSidepot)
+        .map((metric) => {
+          return (
+            <td
+              key={metric.id}
+              className="border-l-2 border-l-white px-6 py-4 text-black"
+            >
+              {components[metric.id] || 0}
+            </td>
+          );
+        })}
       <td className="border-l-2 border-l-white px-6 py-4 text-black">
         {total}
       </td>
+      {scoringMetrics
+        .filter((metric) => metric.isSidepot)
+        .map((metric) => {
+          return (
+            <td
+              key={metric.id}
+              className="border-l-2 border-l-white px-6 py-4 text-black"
+            >
+              {components[metric.id] || 0}
+            </td>
+          );
+        })}
     </tr>
   );
 }
@@ -101,7 +117,11 @@ export default function RankingTable({
             Number(score.score[scoreComponentId])
           : score.score[scoreComponentId];
 
-        return total + Number(score.score[scoreComponentId]);
+        // Only add to total if it's not a sidepot
+        if (!metric.isSidepot) {
+          return total + Number(score.score[scoreComponentId]);
+        }
+        return total;
       }, 0);
 
       acc[score.teamId].total += teamScore;
@@ -145,24 +165,25 @@ export default function RankingTable({
           <th className=" px-6 py-3">
             <div className="flex items-center capitalize">Team</div>
           </th>
-          {scoringMetrics.map((metric) => {
-            return (
-              <th key={metric.id} className=" px-6 py-3">
-                <div className="flex items-center capitalize">
-                  {metric.friendlyName}
-                  {metric.isSidepot ? " (Sidepot)" : null}
-                  <button
-                    onClick={() => {
-                      setSortKey(metric.id);
-                      setSortAscending(!sortAscending);
-                    }}
-                  >
-                    <FilterIcon />
-                  </button>
-                </div>
-              </th>
-            );
-          })}
+          {scoringMetrics
+            .filter((metric) => !metric.isSidepot)
+            .map((metric) => {
+              return (
+                <th key={metric.id} className=" px-6 py-3">
+                  <div className="flex items-center capitalize">
+                    {metric.friendlyName}
+                    <button
+                      onClick={() => {
+                        setSortKey(metric.id);
+                        setSortAscending(!sortAscending);
+                      }}
+                    >
+                      <FilterIcon />
+                    </button>
+                  </div>
+                </th>
+              );
+            })}
           <th className=" px-6 py-3">
             <div className="flex items-center capitalize">
               Total
@@ -176,6 +197,25 @@ export default function RankingTable({
               </button>
             </div>
           </th>
+          {scoringMetrics
+            .filter((metric) => metric.isSidepot)
+            .map((metric) => {
+              return (
+                <th key={metric.id} className=" px-6 py-3">
+                  <div className="flex items-center capitalize">
+                    {metric.friendlyName} (Sidepot)
+                    <button
+                      onClick={() => {
+                        setSortKey(metric.id);
+                        setSortAscending(!sortAscending);
+                      }}
+                    >
+                      <FilterIcon />
+                    </button>
+                  </div>
+                </th>
+              );
+            })}
         </tr>
       </thead>
       <tbody>
@@ -185,6 +225,7 @@ export default function RankingTable({
               teamName={computedScores[teamId].name}
               components={computedScores[teamId].components}
               total={computedScores[teamId].total}
+              scoringMetrics={scoringMetrics}
               key={index}
               index={index}
             />
diff --git a/src/components/judging/Schedule/schedule.tsx b/src/components/judging/Schedule/schedule.tsx
index d7666d9d..396e986f 100644
--- a/src/components/judging/Schedule/schedule.tsx
+++ b/src/components/judging/Schedule/schedule.tsx
@@ -4,6 +4,7 @@ import { generateClient } from "aws-amplify/api";
 import { useState } from "react";
 import { type Schema } from "@/amplify/data/resource";
 import JudgingTimeline from "@/components/admin/Judging/JudgingTimeline";
+import KevinLoadingRing from "@/components/KevinLoadingRing";
 import { useQuery } from "@tanstack/react-query";
 
 const client = generateClient<Schema>();
@@ -94,62 +95,29 @@ export default function JudgingSchedule() {
               .join(", ") || "No Team Name",
           room_id: teamRoom.roomId,
           start: new Date(teamRoom.time),
-          end: new Date(new Date(teamRoom.time).getTime() + 15 * 60 * 1000),
+          end: new Date(
+            new Date(teamRoom.time).getTime() +
+              (teamRoom.duration ?? 10) * 60 * 1000,
+          ),
           zoomLink: teamRoom.zoomLink,
         }))
       : [];
 
-  // State to manage the filter (all teams or assigned teams)
-  const [filter, setFilter] = useState<"all" | "assigned">("all");
-
-  // Filtered events based on the selected filter
-  const filteredEvents =
-    filter === "all"
-      ? judgingEvents
-      : judgingEvents.filter((event) =>
-          judgeData?.some((judge) => judge.JUDGE_roomId === event.room_id),
-        );
-
   return isLoading ? (
-    <div className=" mt-48 flex h-full items-center justify-center text-awesomer-purple">
-      Loading schedule...
+    <div className="flex h-screen items-center justify-center">
+      <KevinLoadingRing />
     </div>
   ) : (
     <div className="mt-8 flex flex-col items-center">
-      {/* Filter Buttons */}
       <div className="mb-6 flex space-x-4">
-        <button
-          onClick={() => setFilter("all")}
-          className={`rounded px-4 py-2 ${
-            filter === "all"
-              ? "bg-awesomer-purple text-white"
-              : "bg-dashboard-grey"
-          }`}
-        >
-          All Teams
-        </button>
-        <button
-          onClick={() => setFilter("assigned")}
-          className={`rounded px-4 py-2 ${
-            filter === "assigned"
-              ? "bg-awesomer-purple text-white"
-              : "bg-dashboard-grey"
-          }`}
-        >
-          Assigned Teams
-        </button>
+        <div className="text-6xl text-awesomer-purple">Judging Schedule</div>
       </div>
 
-      {/* Schedule Display */}
       <div className="w-full max-w-[1000px] rounded-md border border-awesomer-purple bg-light-grey p-4 text-lg text-black">
-        {filteredEvents.length > 0 ? (
-          <JudgingTimeline
-            judgeRooms={judgeRooms}
-            judgingEvents={filteredEvents}
-          />
-        ) : (
-          <div className="flex justify-center">Schedule not made yet</div>
-        )}
+        <JudgingTimeline
+          judgeRooms={judgeRooms}
+          judgingEvents={judgingEvents}
+        />
       </div>
     </div>
   );
diff --git a/src/components/teamRegistration/TeamConfirmation.tsx b/src/components/teamRegistration/TeamConfirmation.tsx
index e44bb4bc..14093447 100644
--- a/src/components/teamRegistration/TeamConfirmation.tsx
+++ b/src/components/teamRegistration/TeamConfirmation.tsx
@@ -23,8 +23,8 @@ export default async function TeamConfirmation({
     return <div>Hackathon hasn't been created yet</div>;
   }
 
-  const eventStartDate = new Date(hackathonData[0].startDate);
-  const eventEndDate = new Date(hackathonData[0].endDate);
+  const eventStartDate = new Date(2025, 10, 8, 9, 0, 0); // Month is 0-indexed → 10 = November
+  const eventEndDate = new Date(2025, 10, 9, 17, 0, 0); // Example: Sunday 5 PM
 
   return (
     <>