diff --git a/messages/en.json b/messages/en.json
index e5f4180d..09aa3467 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -262,6 +262,12 @@
       "viewReport": "View Validation Report",
       "viewJsonReport": "View Validation Report in JSON format"
     },
+    "datasetHistoryColumns": {
+      "downloadedAt": "Downloaded At",
+      "serviceDateRange": "Service Date Range",
+      "validationReport": "Validation Report",
+      "actions": "Actions"
+    },
     "viewRealtimeVisualization": "View real-time visualization",
     "versions": "Versions",
     "dataAttribution": "Transit data provided by",
@@ -368,7 +374,9 @@
       "producerUrl": "Producer URL",
       "providerUrl": "Provider URL",
       "systemId": "System ID",
-      "feedAuthentication": "Feed Authentication"
+      "feedAuthentication": "Feed Authentication",
+      "openAutoDiscoveryUrl": "Open auto-discovery URL in new tab",
+      "downloadProducerUrl": "Download producer URL"
     }
   },
   "account": {
@@ -480,7 +488,7 @@
     "browseFeeds": "Browse Feeds",
     "addFeed": "Add a feed",
     "signUpApi": "Sign up for the API",
-    "description": "The Mobility Database is an open data catalog including over 4000 GTFS, GTFS Realtime, and GBFS feeds in over 75 countries. Whether you're a transportation operator, a researcher studying public transit and shared mobility trends, or a maps app needing reliable data to use with your application, the Mobility Database has everything you need in one central location.",
+    "description": "The Mobility Database is an open data catalog including over 6000 GTFS, GTFS Realtime, and GBFS feeds in over 99 countries. Whether you're a transportation operator, a researcher studying public transit and shared mobility trends, or a maps app needing reliable data to use with your application, the Mobility Database has everything you need in one central location.",
     "validatorIntro": "Our database integrates with",
     "gtfsValidator": "the Canonical GTFS Schedule Validator",
     "and": "and",
@@ -489,7 +497,7 @@
   },
   "about": {
     "title": "About",
-    "description": "The Mobility Database is an open catalog including over 4000 GTFS, GTFS Realtime, and GBFS feeds in over 75 countries. It integrates with the Canonical GTFS Schedule and GBFS Validators to share data quality reports for each feed.\n\nThis database is hosted and maintained by MobilityData, the global non-profit organization dedicated to the advancement of open transportation data standards.",
+    "description": "The Mobility Database is an open catalog including over 6000 GTFS, GTFS Realtime, and GBFS feeds in over 99 countries. It integrates with the Canonical GTFS Schedule and GBFS Validators to share data quality reports for each feed.\n\nThis database is hosted and maintained by MobilityData, the global non-profit organization dedicated to the advancement of open transportation data standards.",
     "learnMore": "Learn more about MobilityData",
     "whyUse": "Why Use the Mobility Database?",
     "whyUseAnswer": "The Mobility Database provides free access to historical and current GTFS, GTFS Realtime, and GBFS feeds from around the world. These feeds are checked for updates every day, ensuring that the data you're looking at is the most recent data available.",
diff --git a/messages/fr.json b/messages/fr.json
index f817b5a7..610c3162 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -262,6 +262,12 @@
       "viewReport": "View Validation Report",
       "viewJsonReport": "View Validation Report in JSON format"
     },
+    "datasetHistoryColumns": {
+      "downloadedAt": "Téléchargé le",
+      "serviceDateRange": "Plage de dates de service",
+      "validationReport": "Rapport de validation",
+      "actions": "Actions"
+    },
     "viewRealtimeVisualization": "View real-time visualization",
     "versions": "Versions",
     "dataAttribution": "Transit data provided by",
@@ -368,7 +374,9 @@
       "producerUrl": "Producer URL",
       "providerUrl": "Provider URL",
       "systemId": "System ID",
-      "feedAuthentication": "Feed Authentication"
+      "feedAuthentication": "Feed Authentication",
+      "openAutoDiscoveryUrl": "Ouvrir l'URL de découverte automatique dans un nouvel onglet",
+      "downloadProducerUrl": "Télécharger l'URL du producteur"
     }
   },
   "account": {
@@ -480,7 +488,7 @@
     "browseFeeds": "Parcourir les flux",
     "addFeed": "Ajouter un flux",
     "signUpApi": "S'inscrire à l'API",
-    "description": "La Mobility Database est un catalogue de données ouvertes comprenant plus de 4000 flux GTFS, GTFS Realtime et GBFS dans plus de 75 pays. Que vous soyez un opérateur de transport, un chercheur étudiant les tendances du transport public et de la mobilité partagée, ou une application de cartes ayant besoin de données fiables, la Mobility Database a tout ce dont vous avez besoin en un seul endroit.",
+    "description": "La Mobility Database est un catalogue de données ouvertes comprenant plus de 6000 flux GTFS, GTFS Realtime et GBFS dans plus de 99 pays. Que vous soyez un opérateur de transport, un chercheur étudiant les tendances du transport public et de la mobilité partagée, ou une application de cartes ayant besoin de données fiables, la Mobility Database a tout ce dont vous avez besoin en un seul endroit.",
     "validatorIntro": "Notre base de données s'intègre avec",
     "gtfsValidator": "le validateur canonique GTFS Schedule",
     "and": "et",
@@ -489,7 +497,7 @@
   },
   "about": {
     "title": "À propos",
-    "description": "La Mobility Database est un catalogue ouvert comprenant plus de 4000 flux GTFS, GTFS Realtime et GBFS dans plus de 75 pays. Elle s'intègre avec les validateurs canoniques GTFS Schedule et GBFS pour partager des rapports de qualité des données pour chaque flux.\n\nCette base de données est hébergée et maintenue par MobilityData, l'organisation mondiale à but non lucratif dédiée à l'avancement des standards de données de transport ouvertes.",
+    "description": "La Mobility Database est un catalogue ouvert comprenant plus de 6000 flux GTFS, GTFS Realtime et GBFS dans plus de 99 pays. Elle s'intègre avec les validateurs canoniques GTFS Schedule et GBFS pour partager des rapports de qualité des données pour chaque flux.\n\nCette base de données est hébergée et maintenue par MobilityData, l'organisation mondiale à but non lucratif dédiée à l'avancement des standards de données de transport ouvertes.",
     "learnMore": "En savoir plus sur MobilityData",
     "whyUse": "Pourquoi utiliser la Mobility Database ?",
     "whyUseAnswer": "La Mobility Database fournit un accès gratuit aux flux GTFS, GTFS Realtime et GBFS historiques et actuels du monde entier. Ces flux sont vérifiés quotidiennement pour les mises à jour, garantissant que les données que vous consultez sont les plus récentes disponibles.",
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
new file mode 100644
index 00000000..4b4705c7
Binary files /dev/null and b/public/android-chrome-192x192.png differ
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
new file mode 100644
index 00000000..8a3e2687
Binary files /dev/null and b/public/android-chrome-512x512.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
new file mode 100644
index 00000000..8ebb4134
Binary files /dev/null and b/public/apple-touch-icon.png differ
diff --git a/public/assets/MOBILTYDATA_logo_light_blue_M.png b/public/assets/MOBILTYDATA_logo_light_blue_M.png
new file mode 100644
index 00000000..42b85c2e
Binary files /dev/null and b/public/assets/MOBILTYDATA_logo_light_blue_M.png differ
diff --git a/public/assets/MOBILTYDATA_logo_purple_M.png b/public/assets/MOBILTYDATA_logo_purple_M.png
index 634f37aa..eeb6eaf4 100644
Binary files a/public/assets/MOBILTYDATA_logo_purple_M.png and b/public/assets/MOBILTYDATA_logo_purple_M.png differ
diff --git a/public/assets/MOBILTYDATA_logo_purple_M.webp b/public/assets/MOBILTYDATA_logo_purple_M.webp
deleted file mode 100644
index b6ce130c..00000000
Binary files a/public/assets/MOBILTYDATA_logo_purple_M.webp and /dev/null differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
new file mode 100644
index 00000000..450d725f
Binary files /dev/null and b/public/favicon-16x16.png differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
new file mode 100644
index 00000000..8e723a6f
Binary files /dev/null and b/public/favicon-32x32.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index 46e32c05..966e2576 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index 1f2f141f..00000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}
diff --git a/public/site.webmanifest b/public/site.webmanifest
new file mode 100644
index 00000000..49cc237d
--- /dev/null
+++ b/public/site.webmanifest
@@ -0,0 +1,21 @@
+{
+  "name": "Mobility Database",
+  "short_name": "MobilityDB",
+  "description": "Access GTFS, GTFS Realtime, GBFS transit data with over 6,000 feeds from 99+ countries.",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#3959fa",
+  "background_color": "#ffffff",
+  "display": "standalone",
+  "start_url": "/"
+}
diff --git a/src/app/[locale]/components/HomePage.tsx b/src/app/[locale]/components/HomePage.tsx
index dcf79915..e456f42f 100644
--- a/src/app/[locale]/components/HomePage.tsx
+++ b/src/app/[locale]/components/HomePage.tsx
@@ -94,7 +94,7 @@ export default async function HomePage(): Promise<ReactElement> {
             sx={{ fontSize: 30, color: 'primary.main', mx: 1 }}
             itemProp='numberOfItems'
           >
-            4000
+            6000
           </Box>
           {t('feeds')}
           <Box
@@ -102,7 +102,7 @@ export default async function HomePage(): Promise<ReactElement> {
             sx={{ fontSize: 30, color: 'primary.main', mx: 1 }}
             itemProp='spatialCoverage'
           >
-            75
+            99
           </Box>
           {t('countries')}
         </Typography>
diff --git a/src/app/[locale]/feeds/[feedDataType]/[feedId]/authed/page.tsx b/src/app/[locale]/feeds/[feedDataType]/[feedId]/authed/page.tsx
index 63de6c9a..0fcad8b2 100644
--- a/src/app/[locale]/feeds/[feedDataType]/[feedId]/authed/page.tsx
+++ b/src/app/[locale]/feeds/[feedDataType]/[feedId]/authed/page.tsx
@@ -1,5 +1,6 @@
 import { type ReactElement } from 'react';
 import FeedView from '../../../../../screens/Feed/FeedView';
+import FeedJsonLd from '../lib/FeedJsonLd';
 import type { Metadata, ResolvingMetadata } from 'next';
 import { getTranslations } from 'next-intl/server';
 import { fetchCompleteFeedData } from '../lib/feed-data';
@@ -22,8 +23,6 @@ export async function generateMetadata(
   return generateFeedMetadata({
     feed: feedData?.feed,
     t,
-    gtfsFeeds: feedData?.relatedFeeds ?? [],
-    gtfsRtFeeds: feedData?.relatedGtfsRtFeeds ?? [],
   });
 }
 
@@ -57,14 +56,20 @@ export default async function AuthedFeedPage({
   } = feedData;
 
   return (
-    <FeedView
-      feed={feed}
-      feedDataType={feedDataType}
-      initialDatasets={initialDatasets}
-      relatedFeeds={relatedFeeds}
-      relatedGtfsRtFeeds={relatedGtfsRtFeeds}
-      totalRoutes={totalRoutes}
-      routeTypes={routeTypes}
-    />
+    <>
+      <FeedJsonLd
+        feed={feed}
+        relatedFeeds={relatedFeeds}
+        relatedGtfsRtFeeds={relatedGtfsRtFeeds}
+      />
+      <FeedView
+        feed={feed}
+        initialDatasets={initialDatasets}
+        relatedFeeds={relatedFeeds}
+        relatedGtfsRtFeeds={relatedGtfsRtFeeds}
+        totalRoutes={totalRoutes}
+        routeTypes={routeTypes}
+      />
+    </>
   );
 }
diff --git a/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/FeedJsonLd.tsx b/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/FeedJsonLd.tsx
new file mode 100644
index 00000000..2a47ee06
--- /dev/null
+++ b/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/FeedJsonLd.tsx
@@ -0,0 +1,60 @@
+import { type ReactElement } from 'react';
+import { getTranslations } from 'next-intl/server';
+import type {
+  AllFeedType,
+  GTFSRTFeedType,
+} from '../../../../../services/feeds/utils';
+import {
+  formatProvidersSorted,
+  generateDescriptionMetaTag,
+} from '../../../../../screens/Feed/Feed.functions';
+import generateFeedStructuredData from './generate-feed-metadata';
+
+interface FeedJsonLdProps {
+  feed: AllFeedType;
+  relatedFeeds?: AllFeedType[];
+  relatedGtfsRtFeeds?: GTFSRTFeedType[];
+}
+
+/**
+ * Server component that renders JSON-LD structured data for SEO.
+ * Injects a <script type="application/ld+json"> tag directly into the page,
+ * following the Next.js App Router recommendation:
+ * https://nextjs.org/docs/app/guides/json-ld
+ */
+export default async function FeedJsonLd({
+  feed,
+  relatedFeeds,
+  relatedGtfsRtFeeds,
+}: FeedJsonLdProps): Promise<ReactElement | null> {
+  if (feed == null) return null;
+
+  const t = await getTranslations();
+
+  const sortedProviders = formatProvidersSorted(feed?.provider ?? '');
+  const feedDataType = feed.data_type;
+  const description = generateDescriptionMetaTag(
+    t,
+    sortedProviders,
+    feedDataType as 'gtfs' | 'gtfs_rt' | 'gbfs',
+    (feed as { feed_name?: string })?.feed_name,
+  );
+
+  const structuredData = generateFeedStructuredData(
+    feed,
+    description,
+    relatedGtfsRtFeeds,
+    relatedFeeds,
+  );
+
+  if (structuredData == null) return null;
+
+  return (
+    <script
+      type='application/ld+json'
+      dangerouslySetInnerHTML={{
+        __html: JSON.stringify(structuredData).replace(/</g, '\\u003c'),
+      }}
+    />
+  );
+}
diff --git a/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/generate-feed-metadata.ts b/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/generate-feed-metadata.ts
index bfa27350..a050c7d3 100644
--- a/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/generate-feed-metadata.ts
+++ b/src/app/[locale]/feeds/[feedDataType]/[feedId]/lib/generate-feed-metadata.ts
@@ -30,6 +30,7 @@ function getBasicStructuredData(
   const structuredData: StructureDataInterface = {
     '@context': 'https://schema.org',
     '@type': 'Dataset',
+    isAccessibleForFree: true,
     name: `${dataTypeNaming ?? ''} Feed for ${feed?.provider}`,
     description,
     url: `https://mobilitydatabase.org/feeds/${feed?.data_type}/${feed?.id}`,
@@ -213,6 +214,8 @@ function getGtfsRtStructuredData(
     (structuredGtfsRtData.hasPart as unknown[]).push({
       '@type': 'Dataset',
       name: `GTFS Static Feed for ${feed?.provider}`,
+      description: `The GTFS static feed associated with this GTFS Realtime feed, if available.`,
+      isAccessibleForFree: true,
       url: `https://mobilitydatabase.org/feeds/gtfs/${associatedGtfsFeed.id}`,
       distribution: {
         '@type': 'DataDownload',
@@ -237,6 +240,8 @@ function getGtfsRtStructuredData(
 
       (structuredGtfsRtData.hasPart as unknown[]).push({
         '@type': 'Dataset',
+        isAccessibleForFree: true,
+        description: `A related GTFS Realtime feed for the same provider, with entity types ${relatedFeed?.entity_types?.join(', ')}`,
         name,
         url: `https://mobilitydatabase.org/feeds/gtfs_rt/${relatedFeed?.id}`,
         distribution: {
@@ -278,23 +283,17 @@ export default function generateFeedStructuredData(
 interface GenerateFeedMetadataParams {
   feed: AllFeedType | undefined;
   t: (key: string) => string;
-  gtfsFeeds?: GTFSFeedType[];
-  gtfsRtFeeds?: GTFSRTFeedType[];
 }
 
 /**
  * Shared metadata generation logic for feed pages (authed and static).
  *
- * @param feed - The feed data\
+ * @param feed - The feed data
  * @param t - Translation function
- * @param gtfsFeeds - Related GTFS feeds (for GTFS-RT)
- * @param gtfsRtFeeds - Related GTFS-RT feeds
  */
 export function generateFeedMetadata({
   feed,
   t,
-  gtfsFeeds = [],
-  gtfsRtFeeds = [],
 }: GenerateFeedMetadataParams): Metadata {
   if (feed == null) {
     return {
@@ -316,14 +315,6 @@ export function generateFeedMetadata({
     (feed as { feed_name?: string })?.feed_name,
   );
 
-  // Generate structured data for SEO
-  const structuredData = generateFeedStructuredData(
-    feed,
-    description,
-    gtfsFeeds,
-    gtfsRtFeeds,
-  );
-
   return {
     title,
     description,
@@ -340,13 +331,7 @@ export function generateFeedMetadata({
       description,
     },
     alternates: {
-      canonical: `/feeds/${feedDataType}/${feedId}`,
-    },
-    other: {
-      // Structured data for JSON-LD
-      ...(structuredData != null && {
-        'script:ld+json': JSON.stringify(structuredData),
-      }),
+      canonical: `https://mobilitydatabase.org/feeds/${feedDataType}/${feedId}`,
     },
   };
 }
diff --git a/src/app/[locale]/feeds/[feedDataType]/[feedId]/loading.tsx b/src/app/[locale]/feeds/[feedDataType]/[feedId]/loading.tsx
index 8dfaf2b4..eb1b6f77 100644
--- a/src/app/[locale]/feeds/[feedDataType]/[feedId]/loading.tsx
+++ b/src/app/[locale]/feeds/[feedDataType]/[feedId]/loading.tsx
@@ -1,5 +1,12 @@
 import { Box, Container, Skeleton } from '@mui/material';
 
+/**
+ *  Loading page streams content as it becomes available, providing a faster time-to-interactive and better user experience.
+ *  NextJs automatically automatically detects user agents to choose between blocking and streaming behavior.
+ *  Since streaming is server-rendered, it does not impact SEO
+ *  ref: https://nextjs.org/docs/app/api-reference/file-conventions/loading
+ */
+
 export default function Loading(): React.ReactElement {
   return (
     <Container
diff --git a/src/app/[locale]/feeds/[feedDataType]/[feedId]/static/page.tsx b/src/app/[locale]/feeds/[feedDataType]/[feedId]/static/page.tsx
index b016f3f7..b962f42f 100644
--- a/src/app/[locale]/feeds/[feedDataType]/[feedId]/static/page.tsx
+++ b/src/app/[locale]/feeds/[feedDataType]/[feedId]/static/page.tsx
@@ -1,6 +1,8 @@
 import { type ReactElement } from 'react';
 import FeedView from '../../../../../screens/Feed/FeedView';
+import FeedJsonLd from '../lib/FeedJsonLd';
 import type { Metadata, ResolvingMetadata } from 'next';
+import { notFound } from 'next/navigation';
 import { getTranslations } from 'next-intl/server';
 import { fetchGuestFeedData } from '../lib/guest-feed-data';
 import { generateFeedMetadata } from '../lib/generate-feed-metadata';
@@ -15,16 +17,15 @@ export async function generateMetadata(
   parent: ResolvingMetadata,
 ): Promise<Metadata> {
   const { feedId, feedDataType } = await params;
-  const t = await getTranslations();
 
-  // Use guest (ISR-safe) fetcher - same cache as page component
-  const feedData = await fetchGuestFeedData(feedDataType, feedId);
+  const [t, feedData] = await Promise.all([
+    getTranslations(),
+    fetchGuestFeedData(feedDataType, feedId),
+  ]);
 
   return generateFeedMetadata({
     feed: feedData.feed,
     t,
-    gtfsFeeds: feedData.relatedFeeds,
-    gtfsRtFeeds: feedData.relatedGtfsRtFeeds,
   });
 }
 
@@ -40,7 +41,7 @@ export default async function StaticFeedPage({
   } catch (e) {
     // Layout should have caught non-existent feeds, but handle edge case
     console.error(`[StaticFeedPage] Failed to fetch feed ${feedId}:`, e);
-    return <div>Feed not found</div>;
+    notFound();
   }
 
   const {
@@ -53,14 +54,20 @@ export default async function StaticFeedPage({
   } = feedData;
 
   return (
-    <FeedView
-      feed={feed}
-      feedDataType={feedDataType}
-      initialDatasets={initialDatasets}
-      relatedFeeds={relatedFeeds}
-      relatedGtfsRtFeeds={relatedGtfsRtFeeds}
-      totalRoutes={totalRoutes}
-      routeTypes={routeTypes}
-    />
+    <>
+      <FeedJsonLd
+        feed={feed}
+        relatedFeeds={relatedFeeds}
+        relatedGtfsRtFeeds={relatedGtfsRtFeeds}
+      />
+      <FeedView
+        feed={feed}
+        initialDatasets={initialDatasets}
+        relatedFeeds={relatedFeeds}
+        relatedGtfsRtFeeds={relatedGtfsRtFeeds}
+        totalRoutes={totalRoutes}
+        routeTypes={routeTypes}
+      />
+    </>
   );
 }
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index 15d2b089..6c324e05 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -14,13 +14,23 @@ import { Container } from '@mui/material';
 import { type Locale, routing } from '../../i18n/routing';
 
 export const metadata = {
-  title: 'Mobility Database',
+  title:
+    'MobilityDatabase | The Global Catalog of GTFS, GTFS-Realtime & GBFS Feeds',
   description:
-    "Access GTFS, GTFS Realtime, GBFS transit data with over 4,000 feeds from 70+ countries on the web's leading transit data platform.",
+    "Access GTFS, GTFS Realtime, GBFS transit data with over 6,000 feeds from 99+ countries on the web's leading transit data platform.",
   robots:
     process.env.VERCEL_ENV === 'production'
       ? 'index, follow'
       : 'noindex, nofollow',
+  icons: {
+    icon: [
+      { url: '/favicon-16x16.png', sizes: '16x16', type: 'image/png' },
+      { url: '/favicon-32x32.png', sizes: '32x32', type: 'image/png' },
+    ],
+    shortcut: '/favicon.ico',
+    apple: [{ url: '/apple-touch-icon.png' }],
+  },
+  manifest: '/site.webmanifest',
 };
 
 export const viewport = {
diff --git a/src/app/[locale]/page.tsx b/src/app/[locale]/page.tsx
index 2f36cf03..1f4bfa71 100644
--- a/src/app/[locale]/page.tsx
+++ b/src/app/[locale]/page.tsx
@@ -17,7 +17,8 @@ interface PageProps {
 }
 
 export const metadata: Metadata = {
-  title: 'Mobility Database',
+  title:
+    'MobilityDatabase | The Global Catalog of GTFS, GTFS-Realtime & GBFS Feeds',
   description:
     'Discover open public transit data worldwide. Mobility Database provides GTFS, GTFS-RT, and GBFS feeds to help developers, cities, and agencies build better mobility tools.',
   applicationName: 'Mobility Database',
diff --git a/src/app/components/ContentBox.tsx b/src/app/components/ContentBox.tsx
index 8a7ff3db..d151cfef 100644
--- a/src/app/components/ContentBox.tsx
+++ b/src/app/components/ContentBox.tsx
@@ -1,6 +1,5 @@
-'use client';
 import * as React from 'react';
-import { Box, Typography, useTheme, type SxProps } from '@mui/material';
+import { Box, Typography, type SxProps } from '@mui/material';
 
 export interface ContentBoxProps {
   title: string;
@@ -15,13 +14,12 @@ export interface ContentBoxProps {
 export const ContentBox = (
   props: React.PropsWithChildren<ContentBoxProps>,
 ): React.ReactElement => {
-  const theme = useTheme();
   return (
     <Box
       width={props.width ?? { xs: '100%', sm: '100%', md: '100%' }}
       sx={{
-        background: theme.palette.background.default,
-        color: theme.palette.text.primary,
+        backgroundColor: 'background.default',
+        color: 'text.primary',
         borderRadius: '6px',
         border: `2px solid ${props.outlineColor}`,
         p: props.padding ?? 5,
diff --git a/src/app/components/CoveredAreaMap.tsx b/src/app/components/CoveredAreaMap.tsx
index 685240ff..17faa30f 100644
--- a/src/app/components/CoveredAreaMap.tsx
+++ b/src/app/components/CoveredAreaMap.tsx
@@ -232,7 +232,8 @@ const CoveredAreaMap: React.FC<CoveredAreaMapProps> = ({
             size='small'
             sx={{ position: 'absolute', top: 16, right: 16 }}
             component={Link}
-            href='./map'
+            href={`/feeds/${feed.data_type}/${feed.id}/map`}
+            aria-label={t('openDetailedMap')}
           >
             <ZoomOutMapIcon></ZoomOutMapIcon>
           </Fab>
@@ -339,7 +340,7 @@ const CoveredAreaMap: React.FC<CoveredAreaMapProps> = ({
                 variant='text'
                 disableElevation
                 component={Link}
-                href='./map'
+                href={`/feeds/${feed.data_type}/${feed.id}/map`}
                 onClick={handleOpenDetailedMapClick}
                 endIcon={<OpenInNewIcon></OpenInNewIcon>}
               >
diff --git a/src/app/components/GtfsVisualizationMap.tsx b/src/app/components/GtfsVisualizationMap.tsx
index 80ddc3a5..6af20a96 100644
--- a/src/app/components/GtfsVisualizationMap.tsx
+++ b/src/app/components/GtfsVisualizationMap.tsx
@@ -624,7 +624,7 @@ export const GtfsVisualizationMap = ({
               style={{
                 backgroundColor: 'white',
                 marginTop: '72px',
-                marginRight: '15px',
+                marginRight: '22px',
                 boxShadow:
                   'rgba(0, 0, 0, 0.2) 0px 3px 5px -1px, rgba(0, 0, 0, 0.14) 0px 6px 10px 0px, rgba(0, 0, 0, 0.12) 0px 1px 18px 0px',
               }}
diff --git a/src/app/components/Header.tsx b/src/app/components/Header.tsx
index be910eeb..50a67255 100644
--- a/src/app/components/Header.tsx
+++ b/src/app/components/Header.tsx
@@ -209,26 +209,30 @@ export default function DrawerAppBar(): React.ReactElement {
                 alignItems: 'center',
               }}
               className='btn-link'
+              aria-label='Mobility Database home'
             >
               <Image
-                src='/assets/MOBILTYDATA_logo_purple_M.webp'
+                src={
+                  theme.palette.mode === 'light'
+                    ? '/assets/MOBILTYDATA_logo_light_blue_M.png'
+                    : '/assets/MOBILTYDATA_logo_purple_M.png'
+                }
                 alt='MobilityData logo'
-                width={50}
-                height={50}
+                width={45}
+                height={45}
                 priority
                 fetchPriority='high'
               />
               <Typography
-                variant='h5'
-                component='h1'
                 color={'primary'}
                 sx={{
                   ml: 1,
                   fontWeight: 700,
+                  fontSize: '1.6rem',
                   display: { xs: 'none', md: 'block' },
                 }}
               >
-                Mobility Database
+                MobilityDatabase
               </Typography>
             </Link>
           </Box>
diff --git a/src/app/components/MapElement.tsx b/src/app/components/MapElement.tsx
index 235e758e..8a50317a 100644
--- a/src/app/components/MapElement.tsx
+++ b/src/app/components/MapElement.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import 'leaflet/dist/leaflet.css';
 import { Box, Typography, useTheme } from '@mui/material';
 import {
   renderLocationTypeIcon,
diff --git a/src/app/components/OfficialChip.tsx b/src/app/components/OfficialChip.tsx
index c7067e0d..fcab85a7 100644
--- a/src/app/components/OfficialChip.tsx
+++ b/src/app/components/OfficialChip.tsx
@@ -1,4 +1,5 @@
 'use client';
+// For this component to become server we will need 'cssVariables' support in MUI
 
 import { Chip, Tooltip } from '@mui/material';
 import { useTranslations } from 'next-intl';
diff --git a/src/app/screens/Analytics/GBFSFeedAnalytics/index.tsx b/src/app/screens/Analytics/GBFSFeedAnalytics/index.tsx
index d9ab0fe3..1608b37a 100644
--- a/src/app/screens/Analytics/GBFSFeedAnalytics/index.tsx
+++ b/src/app/screens/Analytics/GBFSFeedAnalytics/index.tsx
@@ -40,10 +40,7 @@ import { type RootState } from '../../../store/store';
 import { type AnalyticsFile, type GBFSFeedMetrics } from '../types';
 import { useRemoteConfig } from '../../../context/RemoteConfigProvider';
 import DetailPanel from './DetailPanel';
-
-let globalAnalyticsBucketEndpoint: string | undefined;
-export const getAnalyticsBucketEndpoint = (): string | undefined =>
-  globalAnalyticsBucketEndpoint;
+import { setAnalyticsBucketEndpoint } from '../utils';
 
 export default function GBFSFeedAnalytics(): React.ReactElement {
   const { search } = useLocation();
@@ -88,7 +85,7 @@ export default function GBFSFeedAnalytics(): React.ReactElement {
   };
 
   React.useEffect(() => {
-    globalAnalyticsBucketEndpoint = config.gbfsMetricsBucketEndpoint;
+    setAnalyticsBucketEndpoint(config.gbfsMetricsBucketEndpoint);
     dispatch(fetchAvailableFilesStart());
   }, [dispatch, config.gbfsMetricsBucketEndpoint]);
 
diff --git a/src/app/screens/Analytics/utils.ts b/src/app/screens/Analytics/utils.ts
new file mode 100644
index 00000000..58a8888d
--- /dev/null
+++ b/src/app/screens/Analytics/utils.ts
@@ -0,0 +1,13 @@
+/**
+ * Global analytics bucket endpoint storage and access
+ */
+let globalAnalyticsBucketEndpoint: string | undefined;
+
+export const getAnalyticsBucketEndpoint = (): string | undefined =>
+  globalAnalyticsBucketEndpoint;
+
+export const setAnalyticsBucketEndpoint = (
+  endpoint: string | undefined,
+): void => {
+  globalAnalyticsBucketEndpoint = endpoint;
+};
diff --git a/src/app/screens/FAQ.tsx b/src/app/screens/FAQ.tsx
index 02bb18ed..4c9a4496 100644
--- a/src/app/screens/FAQ.tsx
+++ b/src/app/screens/FAQ.tsx
@@ -17,7 +17,7 @@ export default function FAQ(): React.ReactElement {
           What is the Mobility Database?
         </Typography>
         <Typography className='answer'>
-          The Mobility Database is an open database containing over 4000+
+          The Mobility Database is an open database containing over 6000+
           transit and shared mobility feeds in GTFS, GTFS Realtime, and GBFS
           formats. In addition to our database, we also offer an API, and
           data-quality reports using the Canonical GTFS Validator and the GBFS
diff --git a/src/app/screens/Feed/FeedSummary.styles.ts b/src/app/screens/Feed/FeedSummary.styles.ts
index ebf2ea6f..b30bbc1f 100644
--- a/src/app/screens/Feed/FeedSummary.styles.ts
+++ b/src/app/screens/Feed/FeedSummary.styles.ts
@@ -1,4 +1,5 @@
 import { Box, Card, styled, Typography } from '@mui/material';
+import type { ElementType } from 'react';
 
 export const GroupCard = styled(Card)(({ theme }) => ({
   background: theme.palette.background.default,
@@ -10,13 +11,15 @@ export const GroupCard = styled(Card)(({ theme }) => ({
   },
 }));
 
-export const GroupHeader = styled(Typography)(({ theme }) => ({
-  display: 'flex',
-  gap: theme.spacing(1),
-  marginBottom: theme.spacing(1),
-  alignItems: 'center',
-  color: theme.palette.text.secondary,
-}));
+export const GroupHeader = styled(Typography)<{ component?: ElementType }>(
+  ({ theme }) => ({
+    display: 'flex',
+    gap: theme.spacing(1),
+    marginBottom: theme.spacing(1),
+    alignItems: 'center',
+    color: theme.palette.text.secondary,
+  }),
+);
 
 export const FeedLinkElement = styled(Box)(({ theme }) => ({
   width: 'calc(100% - 16px)',
diff --git a/src/app/screens/Feed/FeedView.tsx b/src/app/screens/Feed/FeedView.tsx
index a60c466e..a42c8b57 100644
--- a/src/app/screens/Feed/FeedView.tsx
+++ b/src/app/screens/Feed/FeedView.tsx
@@ -1,29 +1,19 @@
-import {
-  Box,
-  Button,
-  Container,
-  CssBaseline,
-  Grid,
-  Typography,
-} from '@mui/material';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
+import Container from '@mui/material/Container';
+import CssBaseline from '@mui/material/CssBaseline';
+import Grid from '@mui/material/Grid';
+import Typography from '@mui/material/Typography';
 
 // Components
 import FeedTitle from './components/FeedTitle';
 import OfficialChip from '../../components/OfficialChip';
 import DataQualitySummary from './components/DataQualitySummary';
-import CoveredAreaMap from '../../components/CoveredAreaMap';
 import FeedSummary from './components/FeedSummary';
-import AssociatedFeeds from './components/AssociatedFeeds';
-import GbfsVersions from './components/GbfsVersions';
-import PreviousDatasets from './components/PreviousDatasets';
-import { WarningContentBox } from '../../components/WarningContentBox';
 import FeedNavigationControls from './components/FeedNavigationControls';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
-
 import { getTranslations } from 'next-intl/server';
-
-// Styles
-import { ctaContainerStyle } from './Feed.styles';
+import { notFound } from 'next/navigation';
 
 // Utils
 import {
@@ -36,10 +26,42 @@ import ClientDownloadButton from './components/ClientDownloadButton';
 import { type components } from '../../services/feeds/types';
 import ClientQualityReportButton from './components/ClientQualityReportButton';
 import { getBoundingBox } from './Feed.functions';
+import dynamic from 'next/dynamic';
+
+const CoveredAreaMap = dynamic(
+  async () =>
+    await import('../../components/CoveredAreaMap').then((mod) => mod.default),
+  {},
+);
+
+const WarningContentBox = dynamic(
+  async () =>
+    await import('../../components/WarningContentBox').then(
+      (mod) => mod.WarningContentBox,
+    ),
+  {},
+);
+
+const AssociatedFeeds = dynamic(
+  async () =>
+    await import('./components/AssociatedFeeds').then((mod) => mod.default),
+  {},
+);
+
+const GbfsVersions = dynamic(
+  async () =>
+    await import('./components/GbfsVersions').then((mod) => mod.default),
+  {},
+);
+
+const PreviousDatasets = dynamic(
+  async () =>
+    await import('./components/PreviousDatasets').then((mod) => mod.default),
+  {},
+);
 
 interface Props {
   feed: BasicFeedType;
-  feedDataType: string;
   initialDatasets?: Array<components['schemas']['GtfsDataset']>;
   relatedFeeds?: GTFSFeedType[];
   relatedGtfsRtFeeds?: GTFSRTFeedType[];
@@ -51,17 +73,19 @@ type LatestDatasetFull = components['schemas']['GtfsDataset'] | undefined;
 
 export default async function FeedView({
   feed,
-  feedDataType,
   initialDatasets,
   relatedFeeds = [],
   relatedGtfsRtFeeds = [],
   totalRoutes,
   routeTypes,
 }: Props): Promise<React.ReactElement> {
-  const t = await getTranslations('feeds');
-  const tGbfs = await getTranslations('gbfs');
-  const tCommon = await getTranslations('common');
-  if (feed == undefined) return <Box>Feed not found</Box>;
+  if (feed == undefined) notFound();
+
+  const [t, tGbfs, tCommon] = await Promise.all([
+    getTranslations('feeds'),
+    getTranslations('gbfs'),
+    getTranslations('common'),
+  ]);
 
   // Basic derived data
   const sortedProviders =
@@ -151,6 +175,7 @@ export default async function FeedView({
             {feed?.feed_name !== '' && feed?.data_type === 'gtfs' && (
               <Grid size={12}>
                 <Typography
+                  component={'h2'}
                   sx={{
                     fontWeight: 'bold',
                     fontSize: { xs: 18, sm: 24 },
@@ -166,7 +191,7 @@ export default async function FeedView({
               <DataQualitySummary
                 feedStatus={feed?.status}
                 isOfficialFeed={feed.official === true}
-                latestDataset={(feed as GTFSFeedType)?.latest_dataset}
+                latestDataset={latestDataset}
               />
             )}
 
@@ -264,7 +289,7 @@ export default async function FeedView({
               )}
 
             {/* Warnings */}
-            {feedDataType === 'gtfs' && !hasDatasets && !hasFeedRedirect && (
+            {feed.data_type === 'gtfs' && !hasDatasets && !hasFeedRedirect && (
               <WarningContentBox>
                 {t.rich('unableToDownloadFeed', {
                   link: (chunks) => (
@@ -298,7 +323,18 @@ export default async function FeedView({
             )}
 
             {/* CTA Buttons */}
-            <Box sx={ctaContainerStyle}>
+            <Box
+              sx={{
+                my: 3,
+                width: '100%',
+                display: 'flex',
+                flexWrap: { xs: 'wrap', sm: 'nowrap' },
+                gap: 1,
+                borderTop: `1px solid`,
+                borderColor: 'divider',
+                pt: 3,
+              }}
+            >
               {feed.data_type === 'gtfs' &&
                 downloadLatestUrl != null &&
                 downloadLatestUrl.length > 0 && (
diff --git a/src/app/screens/Feed/components/FeedNavigationControls.tsx b/src/app/screens/Feed/components/FeedNavigationControls.tsx
index 85ad21c1..8b6992dc 100644
--- a/src/app/screens/Feed/components/FeedNavigationControls.tsx
+++ b/src/app/screens/Feed/components/FeedNavigationControls.tsx
@@ -25,7 +25,11 @@ export default function FeedNavigationControls({
         startIcon={<ChevronLeft />}
         color={'inherit'}
         onClick={() => {
-          router.back();
+          if (window.history.length > 1) {
+            router.back();
+          } else {
+            router.push('/feeds');
+          }
         }}
       >
         {t('back')}
diff --git a/src/app/screens/Feed/components/FeedSummary.tsx b/src/app/screens/Feed/components/FeedSummary.tsx
index f33b9a0e..954cc652 100644
--- a/src/app/screens/Feed/components/FeedSummary.tsx
+++ b/src/app/screens/Feed/components/FeedSummary.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-// TODO: needs to be a server friendly component
 import { useMemo, useState } from 'react';
 import { type components } from '../../../services/feeds/types';
 import LicenseDialog from './LicenseDialog';
@@ -112,12 +111,18 @@ export default function FeedSummary({
   return (
     <>
       <GroupCard variant='outlined'>
-        <GroupHeader variant='body1'>
-          <BusinessIcon fontSize='inherit' />
+        <GroupHeader variant='body1' component='h3'>
+          <BusinessIcon fontSize='inherit' aria-hidden />
           {feed?.data_type === 'gbfs' ? t('producer') : t('agency')}
         </GroupHeader>
         <Box sx={{ ml: 2 }}>
-          <Typography variant='h6' fontWeight={700} mt={1} mb={0.5}>
+          <Typography
+            variant='h6'
+            component='p'
+            fontWeight={700}
+            mt={1}
+            mb={0.5}
+          >
             {sortedProviders.length > 0
               ? sortedProviders.slice(0, 4).join(', ')
               : t('noAgencyProvided')}
@@ -175,8 +180,8 @@ export default function FeedSummary({
             mb: 1,
           }}
         >
-          <GroupHeader variant='body1' sx={{ mb: 0 }}>
-            <DatasetIcon fontSize='inherit' />
+          <GroupHeader variant='body1' component='h3' sx={{ mb: 0 }}>
+            <DatasetIcon fontSize='inherit' aria-hidden />
             {t('feedSummary.routes')}
           </GroupHeader>
           <Chip
@@ -190,6 +195,7 @@ export default function FeedSummary({
         <Box sx={{ ml: 2, mt: 2, mr: 2 }}>
           <Typography
             variant='subtitle2'
+            component='h4'
             sx={{ fontWeight: 700, color: 'text.secondary' }}
           >
             {t('locations')}
@@ -215,6 +221,7 @@ export default function FeedSummary({
                 feed?.locations?.length === 1 && (
                   <Typography
                     variant='h6'
+                    component='p'
                     sx={{ whiteSpace: 'nowrap', fontWeight: 700, mr: 1, mb: 0 }}
                   >
                     {getLocationName(feed?.locations)}
@@ -273,6 +280,7 @@ export default function FeedSummary({
             <>
               <Typography
                 variant='subtitle2'
+                component='h4'
                 sx={{ fontWeight: 700, color: 'text.secondary' }}
               >
                 {t('feedSummary.routes')}
@@ -335,6 +343,7 @@ export default function FeedSummary({
               <Box sx={{ ml: 2 }}>
                 <Typography
                   variant='subtitle2'
+                  component='h4'
                   sx={{ fontWeight: 700, color: 'text.secondary' }}
                 >
                   {feed?.data_type === 'gbfs' && autoDiscoveryUrl != undefined
@@ -381,12 +390,16 @@ export default function FeedSummary({
                     target='_blank'
                     rel='noreferrer'
                     color='secondary'
-                    aria-label='download producer URL'
+                    aria-label={
+                      feed.data_type === 'gbfs'
+                        ? t('feedSummary.openAutoDiscoveryUrl')
+                        : t('feedSummary.downloadProducerUrl')
+                    }
                   >
                     {feed.data_type === 'gbfs' ? (
-                      <OpenInNewIcon />
+                      <OpenInNewIcon aria-hidden />
                     ) : (
-                      <DownloadIcon />
+                      <DownloadIcon aria-hidden />
                     )}
                   </IconButton>
                 </Box>
@@ -400,6 +413,7 @@ export default function FeedSummary({
               <Box sx={{ ml: 2, mt: 2 }}>
                 <Typography
                   variant='subtitle2'
+                  component='h4'
                   sx={{ fontWeight: 700, color: 'text.secondary' }}
                 >
                   {feed?.data_type === 'gbfs'
@@ -421,6 +435,7 @@ export default function FeedSummary({
           <Box sx={{ ml: 2, mt: 2 }}>
             <Typography
               variant='subtitle2'
+              component='h4'
               sx={{ fontWeight: 700, color: 'text.secondary' }}
             >
               {t('feedSummary.systemId')}
@@ -435,6 +450,7 @@ export default function FeedSummary({
             <Box sx={{ ml: 2, mt: 3 }}>
               <Typography
                 variant='subtitle2'
+                component='h4'
                 sx={{ fontWeight: 700, color: 'text.secondary' }}
               >
                 {t('feedContactEmail')}
@@ -458,12 +474,12 @@ export default function FeedSummary({
         feed.source_info.authentication_type !== 0 &&
         feed?.source_info.authentication_info_url.trim() !== '' && (
           <GroupCard variant='outlined'>
-            <GroupHeader variant='body1'>
-              <LockIcon fontSize='inherit' />
+            <GroupHeader variant='body1' component='h3'>
+              <LockIcon fontSize='inherit' aria-hidden />
               {t('feedSummary.feedAuthentication')}
             </GroupHeader>
             <Box sx={{ ml: 2 }}>
-              <Typography variant='h6' sx={{ fontWeight: 700 }}>
+              <Typography variant='h6' component='p' sx={{ fontWeight: 700 }}>
                 {feed?.source_info?.authentication_type === 1 &&
                   tCommon('apiKey')}
                 {feed?.source_info?.authentication_type === 2 &&
@@ -490,8 +506,8 @@ export default function FeedSummary({
       {latestDataset?.service_date_range_start != undefined &&
         latestDataset.service_date_range_end != undefined && (
           <GroupCard variant='outlined'>
-            <GroupHeader variant='body1'>
-              <CalendarTodayIcon fontSize='inherit' />
+            <GroupHeader variant='body1' component='h3'>
+              <CalendarTodayIcon fontSize='inherit' aria-hidden />
               {t('serviceDateRange')}
               <Tooltip title={t('serviceDateRangeTooltip')} placement='top'>
                 <IconButton size='small'>
@@ -511,7 +527,11 @@ export default function FeedSummary({
               }}
             >
               <Box>
-                <Typography variant='subtitle2' sx={{ lineHeight: 1.5 }}>
+                <Typography
+                  variant='subtitle2'
+                  component='h4'
+                  sx={{ lineHeight: 1.5 }}
+                >
                   {tCommon('start')}
                 </Typography>
                 <Typography variant='body1' sx={{ fontWeight: 700 }}>
@@ -576,7 +596,11 @@ export default function FeedSummary({
               </Tooltip>
 
               <Box>
-                <Typography variant='subtitle2' sx={{ lineHeight: 1.5 }}>
+                <Typography
+                  variant='subtitle2'
+                  component='h4'
+                  sx={{ lineHeight: 1.5 }}
+                >
                   {tCommon('end')}
                 </Typography>
                 <Typography variant='body1' sx={{ fontWeight: 700 }}>
@@ -593,8 +617,8 @@ export default function FeedSummary({
       {latestDataset?.validation_report?.features != undefined &&
         latestDataset?.validation_report?.features.length > 0 && (
           <GroupCard variant='outlined'>
-            <GroupHeader variant='body1'>
-              <LayersIcon fontSize='inherit' />
+            <GroupHeader variant='body1' component='h3'>
+              <LayersIcon fontSize='inherit' aria-hidden />
               {t('features')}
               <Tooltip title={tCommon('moreInfo')} placement='top'>
                 <IconButton
@@ -683,8 +707,8 @@ export default function FeedSummary({
                 mb: 1,
               }}
             >
-              <GroupHeader variant='body1' sx={{ mb: 0 }}>
-                <GavelIcon fontSize='inherit' />
+              <GroupHeader variant='body1' component='h3' sx={{ mb: 0 }}>
+                <GavelIcon fontSize='inherit' aria-hidden />
                 {tCommon('license')}
               </GroupHeader>
               {feed?.source_info?.license_is_spdx != undefined &&
@@ -726,8 +750,9 @@ export default function FeedSummary({
                 href={feed?.source_info?.license_url ?? ''}
                 target='_blank'
                 rel='noopener noreferrer'
-                sx={{ wordBreak: 'break-word' }}
+                sx={{ wordBreak: 'break-word', ml: 2, display: 'flex' }}
                 variant='body1'
+                aria-label={`License URL for feed ${feed?.id ?? ''}`}
               >
                 {feed?.source_info?.license_url}
               </MuiLink>
@@ -737,8 +762,8 @@ export default function FeedSummary({
 
       {hasRelatedLinks() && (
         <GroupCard variant='outlined'>
-          <GroupHeader variant='body1'>
-            <LinkIcon fontSize='inherit' />
+          <GroupHeader variant='body1' component='h3'>
+            <LinkIcon fontSize='inherit' aria-hidden />
             {t('relatedLinks')}
           </GroupHeader>
 
diff --git a/src/app/screens/Feed/components/PreviousDatasets.tsx b/src/app/screens/Feed/components/PreviousDatasets.tsx
index 02f1dde5..f46c9079 100644
--- a/src/app/screens/Feed/components/PreviousDatasets.tsx
+++ b/src/app/screens/Feed/components/PreviousDatasets.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import * as React from 'react';
-import { ContentBox } from '../../../components/ContentBox';
 import {
   Box,
   Button,
@@ -12,10 +11,10 @@ import {
   TableBody,
   TableCell,
   TableContainer,
+  TableHead,
   TableRow,
   Tooltip,
   Typography,
-  useTheme,
 } from '@mui/material';
 import {
   DownloadOutlined,
@@ -43,7 +42,6 @@ export default function PreviousDatasets({
   initialDatasets,
   feedId,
 }: PreviousDatasetsProps): React.ReactElement {
-  const theme = useTheme();
   const t = useTranslations('feeds');
   const tCommon = useTranslations('common');
   const [datasets, setDatasets] = React.useState(initialDatasets ?? []);
@@ -136,263 +134,290 @@ export default function PreviousDatasets({
   return (
     <>
       <Typography
+        component={'h2'}
         sx={{ fontSize: { xs: 18, sm: 24 }, fontWeight: 'bold', mb: 1 }}
       >
         {t('datasetHistory')}
       </Typography>
       <Typography sx={{ mb: 2 }}>{t('datasetHistoryDescription')}</Typography>
-      <ContentBox
-        width={{ xs: '100%' }}
-        title={''}
-        outlineColor={theme.palette.primary.dark}
-        padding={{ xs: 0 }}
-      >
-        <Box
-          sx={{
-            height: '100%',
-            maxHeight: 'min(600px, 60vh)',
-            overflowY: 'auto',
-            pb: '5px', // for the bottomRef trigger spacing
-          }}
+      <Box sx={{ backgroundColor: 'background.default' }}>
+        <TableContainer
+          sx={{ maxHeight: 'min(600px, 60vh)', pb: '5px' }}
           ref={listRef}
         >
-          <TableContainer>
-            <Table>
-              <TableBody sx={{ width: '100%' }}>
-                {datasets?.map((dataset, index) => (
-                  <TableRow data-testid='dataset-item' key={dataset.id}>
-                    {dataset.downloaded_at != null && (
-                      <TableCell>
-                        <Typography variant='body1'>
-                          {index === 0 && <b>Latest: </b>}
-                          {new Date(dataset.downloaded_at).toDateString()}
-                        </Typography>
-                      </TableCell>
-                    )}
+          <Table aria-label={t('datasetHistory')} stickyHeader>
+            <TableHead>
+              <TableRow>
+                <TableCell
+                  component='th'
+                  scope='col'
+                  sx={{ fontWeight: 'bold' }}
+                >
+                  {t('datasetHistoryColumns.downloadedAt')}
+                </TableCell>
+                <TableCell
+                  component='th'
+                  scope='col'
+                  sx={{ fontWeight: 'bold' }}
+                >
+                  {t('datasetHistoryColumns.serviceDateRange')}
+                </TableCell>
+                <TableCell
+                  component='th'
+                  scope='col'
+                  sx={{ fontWeight: 'bold' }}
+                  align='center'
+                >
+                  {t('datasetHistoryColumns.validationReport')}
+                </TableCell>
+                <TableCell
+                  component='th'
+                  scope='col'
+                  sx={{ fontWeight: 'bold' }}
+                  align='center'
+                >
+                  {t('datasetHistoryColumns.actions')}
+                </TableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody sx={{ width: '100%' }}>
+              {datasets?.map((dataset, index) => (
+                <TableRow data-testid='dataset-item' key={dataset.id}>
+                  {dataset.downloaded_at != null && (
                     <TableCell>
-                      {dataset?.service_date_range_start != undefined &&
-                        dataset?.service_date_range_end != undefined && (
-                          <Box
-                            sx={{
-                              display: 'flex',
-                              alignItems: 'center',
-                              gap: 1,
-                            }}
+                      <Typography variant='body1'>
+                        {index === 0 && <b>Latest: </b>}
+                        {new Date(dataset.downloaded_at).toDateString()}
+                      </Typography>
+                    </TableCell>
+                  )}
+                  <TableCell>
+                    {dataset?.service_date_range_start != undefined &&
+                      dataset?.service_date_range_end != undefined && (
+                        <Box
+                          sx={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            gap: 1,
+                          }}
+                        >
+                          <Tooltip
+                            title={t('datasetHistoryTooltip.serviceDateRange')}
+                            placement='top'
                           >
-                            <Tooltip
-                              title={t(
-                                'datasetHistoryTooltip.serviceDateRange',
-                              )}
-                              placement='top'
-                            >
-                              <DateRangeIcon></DateRangeIcon>
-                            </Tooltip>
+                            <DateRangeIcon aria-hidden />
+                          </Tooltip>
 
-                            {formatServiceDateRange(
-                              dataset?.service_date_range_start,
-                              dataset?.service_date_range_end,
-                              dataset.agency_timezone,
-                            )}
-                          </Box>
-                        )}
-                    </TableCell>
-                    <TableCell sx={{ textAlign: { xs: 'left', xl: 'center' } }}>
-                      {dataset.validation_report == null && (
-                        <Typography sx={{ ml: '4px' }}>
-                          {t('validationReportNotAvailable')}
-                        </Typography>
+                          {formatServiceDateRange(
+                            dataset?.service_date_range_start,
+                            dataset?.service_date_range_end,
+                            dataset.agency_timezone,
+                          )}
+                        </Box>
                       )}
-                      {dataset.validation_report != null && (
-                        <>
-                          <Chip
-                            component='a'
-                            clickable
-                            href={`${dataset?.validation_report?.url_html}`}
-                            target='_blank'
-                            rel='noreferrer nofollow'
-                            sx={{ m: '4px' }}
-                            icon={
-                              dataset?.validation_report?.unique_error_count !=
-                                undefined &&
-                              dataset?.validation_report?.unique_error_count >
-                                0 ? (
-                                <ReportOutlined />
-                              ) : (
-                                <CheckCircle />
-                              )
-                            }
-                            label={
-                              dataset?.validation_report?.unique_error_count !=
-                                undefined &&
-                              dataset?.validation_report?.unique_error_count > 0
-                                ? `${
-                                    dataset?.validation_report
-                                      ?.unique_error_count
-                                  } ${tCommon('feedback.errors')}`
-                                : tCommon('feedback.noErrors')
-                            }
-                            color={
-                              dataset?.validation_report?.unique_error_count !=
-                                undefined &&
-                              dataset?.validation_report?.unique_error_count > 0
-                                ? 'error'
-                                : 'success'
-                            }
-                            variant='outlined'
-                          />
-                          <Chip
-                            sx={{ m: '4px' }}
-                            component='a'
-                            clickable
-                            href={`${dataset?.validation_report?.url_html}`}
-                            target='_blank'
-                            rel='noreferrer nofollow'
-                            icon={
-                              dataset?.validation_report
-                                ?.unique_warning_count != undefined &&
-                              dataset?.validation_report?.unique_warning_count >
-                                0 ? (
-                                <ReportOutlined />
-                              ) : (
-                                <CheckCircle />
-                              )
-                            }
-                            label={
-                              dataset?.validation_report
-                                ?.unique_warning_count != undefined &&
-                              dataset?.validation_report?.unique_warning_count >
-                                0
-                                ? `${
-                                    dataset?.validation_report
-                                      ?.unique_warning_count
-                                  } ${tCommon('feedback.warnings')}`
-                                : tCommon('feedback.noWarnings')
-                            }
-                            color={
-                              dataset?.validation_report
-                                ?.unique_warning_count != undefined &&
-                              dataset?.validation_report?.unique_warning_count >
-                                0
-                                ? 'warning'
-                                : 'success'
-                            }
-                            variant='outlined'
-                          />
-                          <Chip
-                            sx={{ m: '4px' }}
-                            component='a'
-                            clickable
-                            href={`${dataset?.validation_report?.url_html}`}
-                            target='_blank'
+                  </TableCell>
+                  <TableCell sx={{ textAlign: { xs: 'left', xl: 'center' } }}>
+                    {dataset.validation_report == null && (
+                      <Typography sx={{ ml: '4px' }}>
+                        {t('validationReportNotAvailable')}
+                      </Typography>
+                    )}
+                    {dataset.validation_report != null && (
+                      <>
+                        <Chip
+                          component='a'
+                          clickable
+                          href={`${dataset?.validation_report?.url_html}`}
+                          target='_blank'
+                          rel='noreferrer nofollow'
+                          sx={{ m: '4px' }}
+                          icon={
+                            dataset?.validation_report?.unique_error_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_error_count >
+                              0 ? (
+                              <ReportOutlined aria-hidden />
+                            ) : (
+                              <CheckCircle aria-hidden />
+                            )
+                          }
+                          label={
+                            dataset?.validation_report?.unique_error_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_error_count > 0
+                              ? `${
+                                  dataset?.validation_report?.unique_error_count
+                                } ${tCommon('feedback.errors')}`
+                              : tCommon('feedback.noErrors')
+                          }
+                          aria-label={
+                            dataset?.validation_report?.unique_error_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_error_count > 0
+                              ? `${dataset.validation_report.unique_error_count} ${tCommon('feedback.errors')} – ${t('datasetHistoryTooltip.viewReport')}`
+                              : `${tCommon('feedback.noErrors')} – ${t('datasetHistoryTooltip.viewReport')}`
+                          }
+                          color={
+                            dataset?.validation_report?.unique_error_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_error_count > 0
+                              ? 'error'
+                              : 'success'
+                          }
+                          variant='outlined'
+                        />
+                        <Chip
+                          sx={{ m: '4px' }}
+                          component='a'
+                          clickable
+                          href={`${dataset?.validation_report?.url_html}`}
+                          target='_blank'
+                          rel='noreferrer nofollow'
+                          icon={
+                            dataset?.validation_report?.unique_warning_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_warning_count >
+                              0 ? (
+                              <ReportOutlined aria-hidden />
+                            ) : (
+                              <CheckCircle aria-hidden />
+                            )
+                          }
+                          label={
+                            dataset?.validation_report?.unique_warning_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_warning_count > 0
+                              ? `${
+                                  dataset?.validation_report
+                                    ?.unique_warning_count
+                                } ${tCommon('feedback.warnings')}`
+                              : tCommon('feedback.noWarnings')
+                          }
+                          aria-label={
+                            dataset?.validation_report?.unique_warning_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_warning_count > 0
+                              ? `${dataset.validation_report.unique_warning_count} ${tCommon('feedback.warnings')} – ${t('datasetHistoryTooltip.viewReport')}`
+                              : `${tCommon('feedback.noWarnings')} – ${t('datasetHistoryTooltip.viewReport')}`
+                          }
+                          color={
+                            dataset?.validation_report?.unique_warning_count !=
+                              undefined &&
+                            dataset?.validation_report?.unique_warning_count > 0
+                              ? 'warning'
+                              : 'success'
+                          }
+                          variant='outlined'
+                        />
+                        <Chip
+                          sx={{ m: '4px' }}
+                          component='a'
+                          clickable
+                          href={`${dataset?.validation_report?.url_html}`}
+                          target='_blank'
+                          rel='noreferrer nofollow'
+                          icon={<InfoOutlinedIcon aria-hidden />}
+                          label={`${
+                            dataset?.validation_report?.unique_info_count ?? '0'
+                          } ${tCommon('feedback.infoNotices')}`}
+                          aria-label={`${dataset?.validation_report?.unique_info_count ?? '0'} ${tCommon('feedback.infoNotices')} – ${t('datasetHistoryTooltip.viewReport')}`}
+                          color='primary'
+                          variant='outlined'
+                        />
+                      </>
+                    )}
+                  </TableCell>
+                  <TableCell>
+                    <Box
+                      sx={{
+                        display: 'flex',
+                        gap: 1,
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                      }}
+                    >
+                      {dataset.hosted_url != null && (
+                        <Tooltip
+                          title={t('datasetHistoryTooltip.downloadReport')}
+                          placement='top'
+                        >
+                          <Button
+                            variant='text'
+                            aria-label={`${t('datasetHistoryTooltip.downloadReport')}${dataset.downloaded_at != null ? ` - ${new Date(dataset.downloaded_at).toDateString()}` : ''}`}
+                            startIcon={<DownloadOutlined aria-hidden />}
+                            size='medium'
+                            href={dataset.hosted_url}
                             rel='noreferrer nofollow'
-                            icon={<InfoOutlinedIcon />}
-                            label={`${
-                              dataset?.validation_report?.unique_info_count ??
-                              '0'
-                            } ${tCommon('feedback.infoNotices')}`}
-                            color='primary'
-                            variant='outlined'
-                          />
-                        </>
+                          >
+                            {tCommon('download')}
+                          </Button>
+                        </Tooltip>
                       )}
-                    </TableCell>
-                    <TableCell>
-                      <Box
-                        sx={{
-                          display: 'flex',
-                          gap: 1,
-                          justifyContent: 'center',
-                          alignItems: 'center',
-                        }}
-                      >
-                        {dataset.hosted_url != null && (
+                      {dataset.validation_report == undefined && (
+                        <Button
+                          variant='contained'
+                          sx={{ mx: 2 }}
+                          disableElevation
+                          endIcon={<LaunchOutlined aria-hidden />}
+                          aria-label={`${t('runValidationReportYourself')}${dataset.downloaded_at != null ? ` – ${new Date(dataset.downloaded_at).toDateString()}` : ''}`}
+                          href={WEB_VALIDATOR_LINK}
+                          target='_blank'
+                          rel='noreferrer'
+                        >
+                          {t('runValidationReportYourself')}
+                        </Button>
+                      )}
+
+                      {dataset.validation_report != null && (
+                        <>
+                          {dataset.hosted_url != null && <>|</>}
                           <Tooltip
-                            title={t('datasetHistoryTooltip.downloadReport')}
+                            title={t('datasetHistoryTooltip.viewReport')}
                             placement='top'
                           >
-                            <Button
-                              variant='text'
-                              aria-label={t(
-                                'datasetHistoryTooltip.downloadReport',
-                              )}
-                              startIcon={<DownloadOutlined />}
+                            <IconButton
+                              color='primary'
+                              aria-label={`${t('datasetHistoryTooltip.viewReport')}${dataset.downloaded_at != null ? ` – ${new Date(dataset.downloaded_at).toDateString()}` : ''}`}
                               size='medium'
-                              href={dataset.hosted_url}
+                              href={`${dataset?.validation_report?.url_html}`}
+                              target='_blank'
                               rel='noreferrer nofollow'
+                              data-testid='validation-report-html'
                             >
-                              {tCommon('download')}
-                            </Button>
+                              <SummarizeIcon aria-hidden />
+                            </IconButton>
                           </Tooltip>
-                        )}
-                        {dataset.validation_report == undefined && (
-                          <Button
-                            variant='contained'
-                            sx={{ mx: 2 }}
-                            disableElevation
-                            endIcon={<LaunchOutlined />}
-                            href={WEB_VALIDATOR_LINK}
-                            target='_blank'
-                            rel='noreferrer'
+                          |
+                          <Tooltip
+                            title={t('datasetHistoryTooltip.viewJsonReport')}
+                            placement='top'
                           >
-                            {t('runValidationReportYourself')}
-                          </Button>
-                        )}
-
-                        {dataset.validation_report != null && (
-                          <>
-                            {dataset.hosted_url != null && <>|</>}
-                            <Tooltip
-                              title={t('datasetHistoryTooltip.viewReport')}
-                              placement='top'
-                            >
-                              <IconButton
-                                color='primary'
-                                aria-label={t(
-                                  'datasetHistoryTooltip.viewReport',
-                                )}
-                                size='medium'
-                                href={`${dataset?.validation_report?.url_html}`}
-                                target='_blank'
-                                rel='noreferrer nofollow'
-                                data-testid='validation-report-html'
-                              >
-                                <SummarizeIcon />
-                              </IconButton>
-                            </Tooltip>
-                            |
-                            <Tooltip
-                              title={t('datasetHistoryTooltip.viewJsonReport')}
-                              placement='top'
+                            <IconButton
+                              color='primary'
+                              aria-label={`${t('datasetHistoryTooltip.viewJsonReport')}${dataset.downloaded_at != null ? ` – ${new Date(dataset.downloaded_at).toDateString()}` : ''}`}
+                              size='medium'
+                              href={`${dataset?.validation_report?.url_json}`}
+                              target='_blank'
+                              rel='noreferrer nofollow'
+                              data-testid='validation-report-json'
                             >
-                              <IconButton
-                                color='primary'
-                                aria-label={t(
-                                  'datasetHistoryTooltip.viewJsonReport',
-                                )}
-                                size='medium'
-                                href={`${dataset?.validation_report?.url_json}`}
-                                target='_blank'
-                                rel='noreferrer nofollow'
-                                data-testid='validation-report-json'
-                              >
-                                <CodeIcon />
-                              </IconButton>
-                            </Tooltip>
-                          </>
-                        )}
-                      </Box>
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
+                              <CodeIcon aria-hidden />
+                            </IconButton>
+                          </Tooltip>
+                        </>
+                      )}
+                    </Box>
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
           <Box
             ref={bottomRef}
             style={{ height: '5px', background: 'transparent' }}
           />
-        </Box>
-      </ContentBox>
+        </TableContainer>
+      </Box>
       {hasloadedAllDatasets && (
         <Typography
           variant='caption'
diff --git a/src/app/screens/Feeds/AdvancedSearchTable.tsx b/src/app/screens/Feeds/AdvancedSearchTable.tsx
index e999b9c4..866c6eaf 100644
--- a/src/app/screens/Feeds/AdvancedSearchTable.tsx
+++ b/src/app/screens/Feeds/AdvancedSearchTable.tsx
@@ -24,6 +24,7 @@ import OfficialChip from '../../components/OfficialChip';
 import { getFeatureComponentDecorators } from '../../utils/consts';
 import PopoverList from './PopoverList';
 import ProviderTitle from './ProviderTitle';
+import Link from 'next/link';
 
 export interface AdvancedSearchTableProps {
   feedsData: AllFeedsType | undefined;
@@ -162,7 +163,7 @@ export default function AdvancedSearchTable({
           >
             <CardActionArea
               sx={{ p: 1 }}
-              component={'a'}
+              component={Link}
               href={`/feeds/${feed.data_type}/${feed.id}`}
             >
               <Box
diff --git a/src/app/store/saga/gbfs-analytics-saga.ts b/src/app/store/saga/gbfs-analytics-saga.ts
index ee2eb563..1a995a40 100644
--- a/src/app/store/saga/gbfs-analytics-saga.ts
+++ b/src/app/store/saga/gbfs-analytics-saga.ts
@@ -13,7 +13,7 @@ import {
   type GBFSMetrics,
 } from '../../screens/Analytics/types';
 import { getLocationName } from '../../services/feeds/utils';
-import { getAnalyticsBucketEndpoint } from '../../screens/Analytics/GBFSFeedAnalytics';
+import { getAnalyticsBucketEndpoint } from '../../screens/Analytics/utils';
 
 function* fetchFeedMetricsSaga(
   action: ReturnType<typeof selectFile>,
diff --git a/src/setupTests.ts b/src/setupTests.ts
index 59e25ba5..34388aef 100644
--- a/src/setupTests.ts
+++ b/src/setupTests.ts
@@ -11,7 +11,6 @@ global.TextEncoder = TextEncoder;
 // Mock fetch for Jest environment
 global.fetch = jest.fn();
 
-jest.mock('leaflet/dist/leaflet.css', () => ({}));
 jest.mock('react-leaflet', () => ({}));
 
 // Mock Firebase Auth
diff --git a/tsconfig.json b/tsconfig.json
index 2cbcfa41..3790e084 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -37,6 +37,7 @@
     ]
   },
   "include": [
+    "next-env.d.ts",
     "src",
     "cypress/**/*.ts",
     "jest-global-setup.ts",