diff --git a/src/components/BestPracticeHeader.astro b/src/components/BestPracticeHeader.astro
index 504fff3f8..e496b4012 100644
--- a/src/components/BestPracticeHeader.astro
+++ b/src/components/BestPracticeHeader.astro
@@ -20,7 +20,7 @@ const isBestPracticeReady = !isUpcoming;
 
 <div class='border-b'>
   <div class='container relative py-5 sm:py-12'>
-    <div class='mt-0 mb-3 sm:mb-6'>
+    <div class='mb-3 mt-0 sm:mb-6'>
       <h1 class='mb-0.5 text-2xl font-bold sm:mb-2 sm:text-4xl'>
         {title}
       </h1>
@@ -31,7 +31,7 @@ const isBestPracticeReady = !isUpcoming;
       <div class='flex gap-1 sm:gap-2'>
         <a
           href='/best-practices'
-          class='rounded-md bg-gray-500 py-1.5 px-3 text-xs font-medium text-white hover:bg-gray-600 sm:text-sm'
+          class='rounded-md bg-gray-500 px-3 py-1.5 text-xs font-medium text-white hover:bg-gray-600 sm:text-sm'
           aria-label='Back to All Best Practices'
         >
           &larr;<span class='hidden sm:inline'>&nbsp;All Best Practices</span>
@@ -40,9 +40,9 @@ const isBestPracticeReady = !isUpcoming;
         {
           isBestPracticeReady && (
             <button
-              id='download-button'
+              data-guest-required
               data-popup='login-popup'
-              class='inline-flex items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
+              class='hidden inline-flex items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
               aria-label='Download Roadmap'
               ga-category='Subscription'
               ga-action='Clicked Popup Opener'
@@ -57,13 +57,14 @@ const isBestPracticeReady = !isUpcoming;
         {
           isBestPracticeReady && (
             <a
-              id='download-link'
+              data-auth-required
               class='inline-flex hidden items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
               aria-label='Download Roadmap'
               ga-category='Subscription'
               ga-action='Clicked Popup Opener'
               ga-label='Download Roadmap Popup'
-              href={`/best-practices/${bestPracticeId}.png`}
+              target="_blank"
+              href={`/pdfs/best-practices/${bestPracticeId}.pdf`}
             >
               <Icon icon='download' />
               <span class='ml-2 hidden sm:inline'>Download</span>
@@ -72,9 +73,9 @@ const isBestPracticeReady = !isUpcoming;
         }
 
         <button
-          id='subscribe-button'
+          data-guest-required
           data-popup='login-popup'
-          class='inline-flex items-center justify-center rounded-md bg-yellow-400 py-1.5 px-3 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
+          class='inline-flex hidden items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
           aria-label='Subscribe for Updates'
           ga-category='Subscription'
           ga-action='Clicked Popup Opener'
@@ -104,19 +105,3 @@ const isBestPracticeReady = !isUpcoming;
     <BestPracticeHint bestPracticeId={bestPracticeId} />
   </div>
 </div>
-
-<script>
-  import Cookies from 'js-cookie';
-  import { TOKEN_COOKIE_NAME } from '../lib/constants';
-
-  const subscribeButton = document.getElementById('subscribe-button');
-  const downloadButton = document.getElementById('download-button');
-  const downloadLink = document.getElementById('download-link');
-  const token = Cookies.get(TOKEN_COOKIE_NAME);
-
-  if (token) {
-    subscribeButton?.classList.add('hidden');
-    downloadButton?.classList.add('hidden');
-    downloadLink?.classList.remove('hidden');
-  }
-</script>
diff --git a/src/components/Navigation/Navigation.astro b/src/components/Navigation/Navigation.astro
index 1a835ddfb..66317528e 100644
--- a/src/components/Navigation/Navigation.astro
+++ b/src/components/Navigation/Navigation.astro
@@ -27,8 +27,8 @@ import AccountDropdown from './AccountDropdown.astro';
         <a href='/videos' class='text-gray-400 hover:text-white'>Videos</a>
       </li>
     </ul>
-    <ul class='hidden w-[172px] h-8 items-center gap-5 sm:flex justify-end'>
-      <li data-guest-required class="hidden">
+    <ul class='hidden h-8 w-[172px] items-center justify-end gap-5 sm:flex'>
+      <li data-guest-required class='hidden'>
         <a href='/login' class='text-gray-400 hover:text-white'>Login</a>
       </li>
       <li>
@@ -36,7 +36,7 @@ import AccountDropdown from './AccountDropdown.astro';
 
         <a
           data-guest-required
-          class='hidden w-28 flex h-8 cursor-pointer items-center justify-center rounded-full bg-gradient-to-r from-blue-500 to-blue-700 px-4 py-2 text-sm font-medium text-white hover:from-blue-500 hover:to-blue-600'
+          class='flex hidden h-8 w-28 cursor-pointer items-center justify-center rounded-full bg-gradient-to-r from-blue-500 to-blue-700 px-4 py-2 text-sm font-medium text-white hover:from-blue-500 hover:to-blue-600'
           href='/signup'
         >
           <span>Sign Up</span>
@@ -116,7 +116,7 @@ import AccountDropdown from './AccountDropdown.astro';
           <a
             data-guest-required
             href='/signup'
-            class='text-xl text-white md:text-lg hidden'
+            class='hidden text-xl text-white md:text-lg'
           >
             Login
           </a>
@@ -125,7 +125,7 @@ import AccountDropdown from './AccountDropdown.astro';
           <a
             data-guest-required
             href='/signup'
-            class='text-xl text-green-300 hover:text-green-400 md:text-lg hidden'
+            class='hidden text-xl text-green-300 hover:text-green-400 md:text-lg'
           >
             Sign Up
           </a>
diff --git a/src/components/RoadmapHeader.astro b/src/components/RoadmapHeader.astro
index be8e2caec..9a067491d 100644
--- a/src/components/RoadmapHeader.astro
+++ b/src/components/RoadmapHeader.astro
@@ -41,7 +41,7 @@ const isRoadmapReady = !isUpcoming;
   <div class='container relative py-5 sm:py-12'>
     <YouTubeAlert />
 
-    <div class='mt-0 mb-3 sm:mb-4 sm:mt-4'>
+    <div class='mb-3 mt-0 sm:mb-4 sm:mt-4'>
       <h1 class='mb-0.5 text-2xl font-bold sm:mb-2 sm:text-4xl'>
         {title}
       </h1>
@@ -63,9 +63,9 @@ const isRoadmapReady = !isUpcoming;
 
               {isRoadmapReady && (
                 <button
-                  id='download-button'
+                  data-guest-required
                   data-popup='login-popup'
-                  class='inline-flex items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
+                  class='inline-flex hidden items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
                   aria-label='Download Roadmap'
                   ga-category='Subscription'
                   ga-action='Clicked Popup Opener'
@@ -78,12 +78,13 @@ const isRoadmapReady = !isUpcoming;
 
               {isRoadmapReady && (
                 <a
-                  id='download-link'
+                  data-auth-required
                   class='inline-flex hidden items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
                   aria-label='Download Roadmap'
                   ga-category='Subscription'
                   ga-action='Clicked Popup Opener'
                   ga-label='Download Roadmap Popup'
+                  target='_blank'
                   href={`/pdfs/roadmaps/${roadmapId}.pdf`}
                 >
                   <Icon icon='download' />
@@ -92,9 +93,9 @@ const isRoadmapReady = !isUpcoming;
               )}
 
               <button
-                id='subscribe-button'
+                data-guest-required
                 data-popup='login-popup'
-                class='inline-flex items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
+                class='inline-flex hidden items-center justify-center rounded-md bg-yellow-400 px-3 py-1.5 text-xs font-medium hover:bg-yellow-500 sm:text-sm'
                 aria-label='Subscribe for Updates'
                 ga-category='Subscription'
                 ga-action='Clicked Popup Opener'
@@ -149,19 +150,3 @@ const isRoadmapReady = !isUpcoming;
 </div>
 
 {note && <RoadmapNote text={note} />}
-
-<script>
-  import Cookies from 'js-cookie';
-  import { TOKEN_COOKIE_NAME } from '../lib/constants';
-
-  const subscribeButton = document.getElementById('subscribe-button');
-  const downloadButton = document.getElementById('download-button');
-  const downloadLink = document.getElementById('download-link');
-  const token = Cookies.get(TOKEN_COOKIE_NAME);
-
-  if (token) {
-    subscribeButton?.classList.add('hidden');
-    downloadButton?.classList.add('hidden');
-    downloadLink?.classList.remove('hidden');
-  }
-</script>