diff --git a/pages/index.tsx b/pages/index.tsx
index 793c0f1..3e82e32 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -116,7 +116,14 @@ const Home: NextPage = () => {
         <div className="header">
           <img src="/images/livekit-meet-home.svg" alt="LiveKit Meet" width="360" height="45" />
           <h2>
-            Open source video conferencing app built on LiveKit&nbsp;Components, LiveKit&nbsp;Cloud,
+            Open source video conferencing app built on{' '}
+            <a href="https://github.com/livekit/components-js?ref=meet" rel="noopener">
+              LiveKit&nbsp;Components
+            </a>
+            ,{' '}
+            <a href="https://livekit.io/cloud?ref=meet" rel="noopener">
+              LiveKit&nbsp;Cloud
+            </a>{' '}
             and Next.js.
           </h2>
         </div>
@@ -127,15 +134,11 @@ const Home: NextPage = () => {
       </main>
       <footer data-lk-theme="default">
         Hosted on{' '}
-        <a href="https://livekit.io/cloud?ref=meet" target="_blank" rel="noreferrer">
+        <a href="https://livekit.io/cloud?ref=meet" rel="noopener">
           LiveKit Cloud
         </a>
         . Source code on{' '}
-        <a
-          href="https://github.com/livekit/components-js?ref=meet"
-          target="_blank"
-          rel="noreferrer"
-        >
+        <a href="https://github.com/livekit/meet?ref=meet" rel="noopener">
           GitHub
         </a>
         .
diff --git a/pages/rooms/[name].tsx b/pages/rooms/[name].tsx
index ef28eee..01fc976 100644
--- a/pages/rooms/[name].tsx
+++ b/pages/rooms/[name].tsx
@@ -32,7 +32,9 @@ const Home: NextPage = () => {
           <ActiveRoom
             roomName={roomName}
             userChoices={preJoinChoices}
-            onLeave={() => setPreJoinChoices(undefined)}
+            onLeave={() => {
+              router.push('/');
+            }}
           ></ActiveRoom>
         ) : (
           <div style={{ display: 'grid', placeItems: 'center', height: '100%' }}>
diff --git a/styles/globals.css b/styles/globals.css
index bc05b02..0668ffd 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -47,12 +47,18 @@ footer {
   border-top: 1px solid rgba(255, 255, 255, 0.15);
 }
 
-footer a {
+footer a,
+h2 a {
   color: #ff6352;
   text-decoration-color: #a33529;
   text-underline-offset: 0.125em;
 }
 
-footer a:hover {
+footer a:hover,
+h2 a {
   text-decoration-color: #ff6352;
 }
+
+h2 a {
+  text-decoration: none;
+}