diff --git a/src/app/conf/2024/schedule/[id]/page.tsx b/src/app/conf/2024/schedule/[id]/page.tsx
index 0e419d7b01..afe6ecc2fc 100644
--- a/src/app/conf/2024/schedule/[id]/page.tsx
+++ b/src/app/conf/2024/schedule/[id]/page.tsx
@@ -78,6 +78,7 @@ export default function SessionPage({ params }: SessionProps) {
   if (!event) {
     notFound()
   }
+
   // @ts-expect-error -- fixme
   event.speakers = (event.speakers || []).map(speaker =>
     speakers.find(s => s.username === speaker.username),
@@ -118,10 +119,10 @@ export default function SessionPage({ params }: SessionProps) {
                     - {format(parseISO(event.event_end), "hh:mmaaaa 'PDT'")}
                   </span>
                 </div>
-                <div className="flex lg:flex-row flex-col sm:gap-5">
+                <div className="flex flex-wrap lg:flex-row flex-col gap-5 mt-8">
                   {event.speakers!.map(speaker => (
                     <div
-                      className="flex items-center gap-3"
+                      className={`flex items-center gap-3 w-full ${event?.speakers?.length || 0 > 1 ? "max-w-[320px]" : ""}`}
                       key={speaker.username}
                     >
                       <Avatar
diff --git a/src/app/conf/_components/schedule/schedule-list.tsx b/src/app/conf/_components/schedule/schedule-list.tsx
index 515ff219b4..10d4573ac3 100644
--- a/src/app/conf/_components/schedule/schedule-list.tsx
+++ b/src/app/conf/_components/schedule/schedule-list.tsx
@@ -63,7 +63,9 @@ function getSessionsByDay(
     }
     sessionsByDay[day] = {
       ...sessionsByDay[day],
-      [date]: sessions.sort((a, b) => a.venue.localeCompare(b.venue)),
+      [date]: sessions.sort((a, b) =>
+        (a?.venue ?? "").localeCompare(b?.venue ?? ""),
+      ),
     }
   })
 
diff --git a/src/app/conf/_components/schedule/session-list.tsx b/src/app/conf/_components/schedule/session-list.tsx
index 3ea0715b39..b723236e94 100644
--- a/src/app/conf/_components/schedule/session-list.tsx
+++ b/src/app/conf/_components/schedule/session-list.tsx
@@ -16,7 +16,7 @@ export interface ScheduleSession {
   event_subtype: string
   event_type: string
   name: string
-  venue: string
+  venue?: string
   speakers?: SchedSpeaker[] | string
   files?: { name: string; path: string }[]
 }
@@ -78,7 +78,9 @@ function getSessionsByDay(
     }
     sessionsByDay[day] = {
       ...sessionsByDay[day],
-      [date]: sessions.sort((a, b) => a.venue.localeCompare(b.venue)),
+      [date]: sessions.sort((a, b) =>
+        (a?.venue ?? "").localeCompare(b?.venue ?? ""),
+      ),
     }
   })
 
diff --git a/src/app/conf/_components/speakers/avatar.tsx b/src/app/conf/_components/speakers/avatar.tsx
index 6a3a92173b..1759f9d7d8 100644
--- a/src/app/conf/_components/speakers/avatar.tsx
+++ b/src/app/conf/_components/speakers/avatar.tsx
@@ -19,6 +19,9 @@ export const Avatar: FC<Props> = ({ avatar, name, className, href }) => {
         className={`${className}`}
         src={avatar}
         alt={`${name} Profile Image`}
+        style={{
+          margin: 0,
+        }}
       />
     ) : (
       <div