diff --git a/src/components/AgendaModal.js b/src/components/AgendaModal.js
index 7be3a18..e1b0b53 100644
--- a/src/components/AgendaModal.js
+++ b/src/components/AgendaModal.js
@@ -188,8 +188,13 @@ export class AgendaModal {
                 ${oaiBadge}
               </div>
               ${
-                speaker.company
-                  ? `<div class="text-sm text-primary-gray uppercase tracking-widest leading-5">${speaker.company}</div>`
+                speaker.job || speaker.company
+                  ? `<div class="text-sm text-primary-gray uppercase tracking-widest leading-5">${[
+                      speaker.job,
+                      speaker.company,
+                    ]
+                      .filter(Boolean)
+                      .join(" / ")}</div>`
                   : ""
               }
             </div>
@@ -215,8 +220,13 @@ export class AgendaModal {
             ${oaiBadge}
           </div>
           ${
-            speaker.company
-              ? `<div class="text-sm text-primary-gray uppercase tracking-widest mb-4">${speaker.company}</div>`
+            speaker.job || speaker.company
+              ? `<div class="text-sm text-primary-gray uppercase tracking-widest mb-4">${[
+                  speaker.job,
+                  speaker.company,
+                ]
+                  .filter(Boolean)
+                  .join(" / ")}</div>`
               : ""
           }
           <div class="flex gap-2">
@@ -267,7 +277,7 @@ export class AgendaModal {
       >
         <!-- Modal -->
         <div
-          class="bg-bg-dark w-full h-full tablet:h-[min(820px,85vh)] tablet:max-w-[960px] flex flex-col overflow-hidden border border-border-primary relative"
+          class="bg-bg-dark w-full h-full tablet:h-[min(820px,85vh)] tablet:max-w-[960px] flex flex-col overflow-hidden tablet:border tablet:border-border-primary relative"
         >
           <button
             data-close-btn
diff --git a/src/index.html b/src/index.html
index 0aff3a2..3bd9700 100644
--- a/src/index.html
+++ b/src/index.html
@@ -91,7 +91,7 @@
       <div class="max-w-[2440px] w-full">
         <!-- Header Hero Section -->
         <header
-          class="flex flex-col tablet:flex-row h-[667px] tablet:min-h-0 tablet:h-[clamp(640px,50vw+160px,900px)] text-text-primary overflow-hidden desktop:h-[max(min(100vh,1116px),744px)] desktop-xl:h-[max(min(100vh,1117px),900px)]"
+          class="flex flex-col tablet:flex-row h-[667px] tablet:min-h-0 tablet:h-[clamp(640px,50vw+160px,900px)] text-text-primary overflow-hidden desktop:h-[max(min(100vh,1116px),744px)] desktop-xl:h-[max(min(100vh,1117px),900px)] desktop-xxl:h-[max(min(100vh,1280px),1117px)]"
         >
           <!-- Left Content Container (2/3) -->
           <div