diff --git a/site/src/components/talkCard.js b/site/src/components/talkCard.js
index 8843c2c..d63e596 100644
--- a/site/src/components/talkCard.js
+++ b/site/src/components/talkCard.js
@@ -2,9 +2,11 @@ import React from "react";
 import { Link } from "gatsby";
 
 export default function TalkCard({ talk }) {
-  const { name, title, time, avatar, link = "" } = talk;
+  const { name, title, time, avatar, fields } = talk;
+  const { slug = "" } = fields;
+
   return (
-    <Link to={link}>
+    <Link to={slug}>
       <div className="flex items-center hover:bg-indigo-100 border px-4 py-2">
         <img
           className="w-10 h-10 rounded-full mr-4"
diff --git a/site/src/pages/index.js b/site/src/pages/index.js
index 74a6f19..3b4a44e 100644
--- a/site/src/pages/index.js
+++ b/site/src/pages/index.js
@@ -52,6 +52,9 @@ function IndexPage() {
             name
             title
             time
+            fields {
+              slug
+            }
           }
         }
       }
diff --git a/site/src/templates/speaker-page.js b/site/src/templates/speaker-page.js
index 61bff0f..4a765d0 100644
--- a/site/src/templates/speaker-page.js
+++ b/site/src/templates/speaker-page.js
@@ -6,14 +6,14 @@ export default function SpeakerPage({ data }) {
   const speaker = data.speakersYaml;
   return (
     <Layout>
-     <div>
+      <div>
         <h1 className="text-5xl font-extrabold text-blue-500 tracking-tight font-inter p-4">
           {speaker.title}
         </h1>
         <h2 className="text-4xl font-extrabold  tracking-tight font-inter p-4">
           with {speaker.name}
         </h2>
-     </div>
+      </div>
     </Layout>
   );
 }