diff --git a/website/src/components/views/compareSideBySide/GenericCompareSideBySidePage.astro b/website/src/components/views/compareSideBySide/GenericCompareSideBySidePage.astro
index 5fd6fcb3..fe397ea9 100644
--- a/website/src/components/views/compareSideBySide/GenericCompareSideBySidePage.astro
+++ b/website/src/components/views/compareSideBySide/GenericCompareSideBySidePage.astro
@@ -1,7 +1,7 @@
 ---
 import { GenericCompareSideBySideDataDisplay } from './GenericCompareSideBySideDataDisplay.tsx';
 import { toDownloadLink } from './toDownloadLink';
-import { isStaging, getDashboardsConfig, getLapisUrl } from '../../../config';
+import { isStaging, getDashboardsConfig } from '../../../config';
 import OrganismViewPageLayout from '../../../layouts/OrganismPage/OrganismViewPageLayout.astro';
 import { type OrganismViewKey, type OrganismWithViewKey } from '../../../views/routing';
 import { ServerSide } from '../../../views/serverSideRouting';
@@ -27,56 +27,54 @@ const downloadLinks = [...pageState.filters.entries()].map(toDownloadLink(view.p
 ---
 
 <OrganismViewPageLayout view={view} downloadLinks={downloadLinks}>
-    <gs-app lapis={getLapisUrl(view.organismConstants.organism)}>
-        <div class='flex overflow-x-auto'>
-            {
-                Array.from(pageState.filters).map(([id, datasetAndVariantData]) => {
-                    return (
-                        <div class='flex min-w-[500px] flex-1 flex-col gap-4 border-r-2 border-gray-200 px-2'>
-                            <div class='mb-4'>
-                                {pageState.filters.size > 1 && (
-                                    <a
-                                        class='block w-full px-2 py-1 text-sm font-light hover:bg-neutral-100'
-                                        href={view.pageStateHandler.toUrl(
-                                            view.pageStateHandler.removeFilter(pageState, id),
-                                        )}
-                                    >
-                                        Remove column
-                                    </a>
-                                )}
-                                <CompareSideBySidePageStateSelector
-                                    filterId={id}
-                                    initialPageState={pageState}
-                                    organismsConfig={organismConfig}
-                                    organismViewKey={organismViewKey}
-                                    enableAdvancedQueryFilter={isStaging()}
-                                    client:only='react'
+    <div class='flex overflow-x-auto'>
+        {
+            Array.from(pageState.filters).map(([id, datasetAndVariantData]) => {
+                return (
+                    <div class='flex min-w-[500px] flex-1 flex-col gap-4 border-r-2 border-gray-200 px-2'>
+                        <div class='mb-4'>
+                            {pageState.filters.size > 1 && (
+                                <a
+                                    class='block w-full px-2 py-1 text-sm font-light hover:bg-neutral-100'
+                                    href={view.pageStateHandler.toUrl(
+                                        view.pageStateHandler.removeFilter(pageState, id),
+                                    )}
                                 >
-                                    <CompareSideBySideSelectorFallback
-                                        slot='fallback'
-                                        numFilters={pageState.filters.size}
-                                    />
-                                </CompareSideBySidePageStateSelector>
-                            </div>
-
-                            <GenericCompareSideBySideDataDisplay
-                                organismViewKey={organismViewKey}
+                                    Remove column
+                                </a>
+                            )}
+                            <CompareSideBySidePageStateSelector
+                                filterId={id}
+                                initialPageState={pageState}
                                 organismsConfig={organismConfig}
-                                datasetAndVariantData={datasetAndVariantData}
-                                hideMutationComponents={hideMutationComponents}
-                                client:load
-                            />
+                                organismViewKey={organismViewKey}
+                                enableAdvancedQueryFilter={isStaging()}
+                                client:only='react'
+                            >
+                                <CompareSideBySideSelectorFallback
+                                    slot='fallback'
+                                    numFilters={pageState.filters.size}
+                                />
+                            </CompareSideBySidePageStateSelector>
                         </div>
-                    );
-                })
-            }
-            <a
-                class='py-4 pt-8 text-left text-sm font-light hover:bg-neutral-100'
-                href={view.pageStateHandler.toUrl(view.pageStateHandler.addEmptyFilter(pageState))}
-                style='writing-mode: vertical-rl;'
-            >
-                Add column
-            </a>
-        </div>
-    </gs-app>
+
+                        <GenericCompareSideBySideDataDisplay
+                            organismViewKey={organismViewKey}
+                            organismsConfig={organismConfig}
+                            datasetAndVariantData={datasetAndVariantData}
+                            hideMutationComponents={hideMutationComponents}
+                            client:load
+                        />
+                    </div>
+                );
+            })
+        }
+        <a
+            class='py-4 pt-8 text-left text-sm font-light hover:bg-neutral-100'
+            href={view.pageStateHandler.toUrl(view.pageStateHandler.addEmptyFilter(pageState))}
+            style='writing-mode: vertical-rl;'
+        >
+            Add column
+        </a>
+    </div>
 </OrganismViewPageLayout>
diff --git a/website/src/layouts/OrganismPage/DataPageLayout.astro b/website/src/layouts/OrganismPage/DataPageLayout.astro
index 4cca64d0..fbd92a1c 100644
--- a/website/src/layouts/OrganismPage/DataPageLayout.astro
+++ b/website/src/layouts/OrganismPage/DataPageLayout.astro
@@ -1,11 +1,11 @@
 ---
 import type { ComponentProps } from 'astro/types';
 
-import AccessionsDownloadButton from './AccessionsDownloadButton.astro';
-import LastUpdatedInfo from './LastUpdatedInfo.astro';
 import LapisUnreachableWrapperClient from '../../components/LapisUnreachableWrapperClient';
-import type { DataOrigin } from '../../types/dataOrigins';
 import { type BreadcrumbElement, Breadcrumbs } from '../Breadcrumbs';
+import AccessionsDownloadButton from './AccessionsDownloadButton.astro';
+import LastUpdatedInfo from './LastUpdatedInfo.astro';
+import type { DataOrigin } from '../../types/dataOrigins.ts';
 import BaseLayout from '../base/BaseLayout.astro';
 import DataInfo from '../base/footer/DataInfo.astro';
 
@@ -22,23 +22,27 @@ const { title, breadcrumbs, dataOrigins, lapisUrl, downloadLinks = [], accession
 ---
 
 <BaseLayout title={title}>
-    <div class='ml-2'>
-        <Breadcrumbs breadcrumbs={breadcrumbs} />
-    </div>
-    <LapisUnreachableWrapperClient lapisUrl={lapisUrl} client:only='react'>
-        <slot />
-    </LapisUnreachableWrapperClient>
-    <div class='mt-2 flex flex-col items-center justify-center sm:mt-0 sm:flex-row sm:gap-4' slot='secondary-footer'>
-        {
-            downloadLinks.length > 0 && (
-                <AccessionsDownloadButton
-                    accessionDownloadFields={accessionDownloadFields}
-                    downloadLinks={downloadLinks}
-                    lapisUrl={lapisUrl}
-                />
-            )
-        }
-        <LastUpdatedInfo lapisUrl={lapisUrl} />
-        <DataInfo dataOrigins={dataOrigins} />
+    <div class='flex h-full flex-col'>
+        <div class='ml-2'>
+            <Breadcrumbs breadcrumbs={breadcrumbs} />
+        </div>
+        <div class='grow'>
+            <LapisUnreachableWrapperClient lapisUrl={lapisUrl} client:only='react'>
+                <slot />
+            </LapisUnreachableWrapperClient>
+        </div>
+        <div class='mt-2 flex flex-col items-center justify-center border-t border-gray-200 sm:flex-row sm:gap-4'>
+            {
+                downloadLinks.length > 0 && (
+                    <AccessionsDownloadButton
+                        accessionDownloadFields={accessionDownloadFields}
+                        downloadLinks={downloadLinks}
+                        lapisUrl={lapisUrl}
+                    />
+                )
+            }
+            <LastUpdatedInfo lapisUrl={lapisUrl} />
+            <DataInfo dataOrigins={dataOrigins} />
+        </div>
     </div>
 </BaseLayout>
diff --git a/website/src/layouts/OrganismPage/OrganismViewPageLayout.astro b/website/src/layouts/OrganismPage/OrganismViewPageLayout.astro
index 38d75284..11d51ab7 100644
--- a/website/src/layouts/OrganismPage/OrganismViewPageLayout.astro
+++ b/website/src/layouts/OrganismPage/OrganismViewPageLayout.astro
@@ -24,5 +24,10 @@ const { view, downloadLinks } = Astro.props;
     lapisUrl={getLapisUrl(view.organismConstants.organism)}
     accessionDownloadFields={view.organismConstants.accessionDownloadFields}
 >
-    <slot />
+    <gs-app
+        lapis={getLapisUrl(view.organismConstants.organism)}
+        mutationAnnotations={JSON.stringify(view.organismConstants.mutationAnnotations)}
+    >
+        <slot />
+    </gs-app>
 </DataPageLayout>
diff --git a/website/src/layouts/OrganismPage/SingleVariantOrganismPageLayout.astro b/website/src/layouts/OrganismPage/SingleVariantOrganismPageLayout.astro
index 2841b762..514a91a7 100644
--- a/website/src/layouts/OrganismPage/SingleVariantOrganismPageLayout.astro
+++ b/website/src/layouts/OrganismPage/SingleVariantOrganismPageLayout.astro
@@ -3,7 +3,6 @@ import type { ComponentProps } from 'astro/types';
 
 import AccessionsDownloadButton from './AccessionsDownloadButton.astro';
 import OrganismViewPageLayout from './OrganismViewPageLayout.astro';
-import { getLapisUrl } from '../../config';
 import type { OrganismConstants } from '../../views/OrganismConstants';
 import type { View } from '../../views/View';
 import { type PageStateHandler } from '../../views/pageStateHandlers/PageStateHandler';
@@ -17,15 +16,10 @@ const { view, downloadLinks } = Astro.props;
 ---
 
 <OrganismViewPageLayout view={view} downloadLinks={downloadLinks}>
-    <gs-app
-        lapis={getLapisUrl(view.organismConstants.organism)}
-        mutationAnnotations={JSON.stringify(view.organismConstants.mutationAnnotations)}
-    >
-        <div class='grid-cols-[300px_1fr] gap-x-4 lg:grid'>
-            <div class='h-fit p-2 shadow-lg'>
-                <slot name='filters' />
-            </div>
-            <slot name='dataDisplay' />
+    <div class='grid-cols-[300px_1fr] gap-x-4 lg:grid'>
+        <div class='h-fit p-2 shadow-lg'>
+            <slot name='filters' />
         </div>
-    </gs-app>
+        <slot name='dataDisplay' />
+    </div>
 </OrganismViewPageLayout>
diff --git a/website/src/layouts/base/BaseLayout.astro b/website/src/layouts/base/BaseLayout.astro
index 8f8bccc9..bcf85d40 100644
--- a/website/src/layouts/base/BaseLayout.astro
+++ b/website/src/layouts/base/BaseLayout.astro
@@ -34,14 +34,13 @@ const { title, forceLoggedOutState = false } = Astro.props;
         </script>
     </head>
 
-    <body class='flex min-h-screen flex-col'>
+    <body class='flex h-screen flex-col'>
         <ToastContainer client:load />
+        <Header forceLoggedOutState={forceLoggedOutState} />
         <div class='grow'>
-            <Header forceLoggedOutState={forceLoggedOutState} />
             <slot />
         </div>
         <Footer>
-            <slot slot='secondary-footer' name='secondary-footer' />
             <FooterNavigation slot='primary-footer' />
         </Footer>
     </body>
diff --git a/website/src/layouts/base/footer/Footer.astro b/website/src/layouts/base/footer/Footer.astro
index 0b90db51..918a8612 100644
--- a/website/src/layouts/base/footer/Footer.astro
+++ b/website/src/layouts/base/footer/Footer.astro
@@ -1,12 +1,8 @@
 ---
 import PrimaryFooter from './PrimaryFooter.astro';
-import SecondaryFooter from './SecondaryFooter.astro';
 ---
 
 <footer class='mt-auto'>
-    <SecondaryFooter>
-        <slot name='secondary-footer' />
-    </SecondaryFooter>
     <PrimaryFooter>
         <slot name='primary-footer' />
     </PrimaryFooter>
diff --git a/website/src/layouts/base/footer/SecondaryFooter.astro b/website/src/layouts/base/footer/SecondaryFooter.astro
deleted file mode 100644
index 1725a697..00000000
--- a/website/src/layouts/base/footer/SecondaryFooter.astro
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
----
-
-<div class='mt-2 border-t border-gray-200'>
-    <slot />
-</div>
diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro
index f7c21db3..be85c87e 100644
--- a/website/src/pages/index.astro
+++ b/website/src/pages/index.astro
@@ -117,5 +117,7 @@ import { Page } from '../types/pages';
         </div>
     </div>
 
-    <DataInfo slot='secondary-footer' dataOrigins={[dataOrigins.insdc, dataOrigins.pathoplexus, dataOrigins.wise]} />
+    <div class='mt-2 border-t border-gray-200'>
+        <DataInfo dataOrigins={[dataOrigins.insdc, dataOrigins.pathoplexus, dataOrigins.wise]} />
+    </div>
 </BaseLayout>