diff --git a/apps/dashboard/src/lib/components/Navigation/Logo.svelte b/apps/dashboard/src/lib/components/Navigation/Logo.svelte
index 5251c27f..2e859ca1 100644
--- a/apps/dashboard/src/lib/components/Navigation/Logo.svelte
+++ b/apps/dashboard/src/lib/components/Navigation/Logo.svelte
@@ -12,7 +12,7 @@
 
 <div class="logo">
   <a
-    href={resolve('/')}
+    href={resolve('/', {})}
     title={`${$t('navigation.goto')} ${orgName || 'ClassroomIO'} ${$t('navigation.home')}`}
     class="flex items-center gap-2"
     id="logo"
@@ -22,7 +22,8 @@
       src={logo || '/logo-192.png'}
       alt={`${orgName || 'ClassroomIO'} logo`}
       class="mx-auto inline-block w-9 rounded"
-      data-atf="1"
+      width="36"
+      height="36"
     />
     {#if orgName}
       <span class="line-clamp-1 hidden text-sm font-medium md:block">{orgName}</span>
diff --git a/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte b/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
index dc775454..d0e1a9fe 100644
--- a/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
+++ b/apps/dashboard/src/lib/features/org/components/landing-page/landing-page.svelte
@@ -131,6 +131,13 @@
   <title>
     {!org?.name ? '' : `${org.name}'s `}{$t('course.navItem.landing_page.landing_page')}
   </title>
+  {#if $landingPageSettings.header.background?.show !== false}
+    <link
+      rel="preload"
+      as="image"
+      href={$landingPageSettings.header.background?.image || '/images/org-landingpage-banner.jpeg'}
+    />
+  {/if}
 </svelte:head>
 
 <PoweredBy />
@@ -201,7 +208,14 @@
                     />
                   </div>
                 {:else}
-                  <img class="rounded-md" src={$landingPageSettings.header?.banner?.image} alt="landing page banner" />
+                  <img
+                    class="rounded-md"
+                    src={$landingPageSettings.header?.banner?.image}
+                    alt="landing page banner"
+                    width="640"
+                    height="427"
+                    fetchpriority="high"
+                  />
                 {/if}
               </div>
             </div>
@@ -245,7 +259,14 @@
           </div>
 
           <div class="image">
-            <img src={$landingPageSettings.aboutUs.imageUrl} alt="Our Story" class=" max-h-[450px] rounded-2xl" />
+            <img
+              src={$landingPageSettings.aboutUs.imageUrl}
+              alt="Our Story"
+              class="max-h-[450px] rounded-2xl"
+              width="900"
+              height="562"
+              loading="lazy"
+            />
           </div>
         </div>
       </section>
@@ -477,7 +498,9 @@
                 src={org.avatarUrl || '/logo-192.png'}
                 alt={`${org.name} logo`}
                 class="mx-auto inline-block max-h-10 w-10 rounded"
-                data-atf="1"
+                width="40"
+                height="40"
+                loading="lazy"
               />
               <h3 class="ml-3 text-xl text-black">{org.name}</h3>
             </a>
diff --git a/apps/dashboard/src/routes/+layout.svelte b/apps/dashboard/src/routes/+layout.svelte
index e978f233..e48b07f6 100644
--- a/apps/dashboard/src/routes/+layout.svelte
+++ b/apps/dashboard/src/routes/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from '$app/state';
 
-  import { OrgLandingPage, PlayQuiz } from '$features/org';
+  import { OrgLandingPage } from '$features/org';
   import { Snackbar } from '$features/ui';
   import { UpgradeModal, PageLoadProgress, PageRestricted } from '$features/ui';
   import { user } from '$lib/utils/store/user';
@@ -144,8 +144,6 @@
 
   {#if data.org?.isRestricted || $currentOrg.isRestricted}
     <PageRestricted />
-  {:else if data.skipAuth}
-    <PlayQuiz />
   {:else if data.isOrgSite && data.org && path === '/'}
     <OrgLandingPage orgSiteName={data.orgSiteName} org={data.org} />
   {:else}
diff --git a/apps/dashboard/static/images/org-landingpage-banner.jpeg b/apps/dashboard/static/images/org-landingpage-banner.jpeg
index 980715ec..8333d16a 100644
Binary files a/apps/dashboard/static/images/org-landingpage-banner.jpeg and b/apps/dashboard/static/images/org-landingpage-banner.jpeg differ
diff --git a/apps/dashboard/static/images/riverside.jpeg b/apps/dashboard/static/images/riverside.jpeg
index 680f5edc..2323b3f8 100644
Binary files a/apps/dashboard/static/images/riverside.jpeg and b/apps/dashboard/static/images/riverside.jpeg differ