diff --git a/next.config.js b/next.config.js
index b43512370..53857a977 100644
--- a/next.config.js
+++ b/next.config.js
@@ -35,6 +35,11 @@ module.exports = {
   },
   async redirects () {
     return [
+      {
+        source: '/map',
+        destination: '/maps',
+        permanent: true
+      },
       {
         source: '/areas/:uuid',
         destination: '/area/:uuid/',
diff --git a/package.json b/package.json
index 30f528cdc..3ad0f63ff 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "@turf/bbox": "^6.5.0",
     "@turf/line-to-polygon": "^6.5.0",
     "@udecode/zustood": "^1.1.3",
+    "@vercel/edge": "^1.1.1",
     "auth0": "^2.42.0",
     "awesome-debounce-promise": "^2.1.0",
     "aws-sdk": "^2.1265.0",
diff --git a/src/app/area/[[...slug]]/loading.tsx b/src/app/(default)/area/[[...slug]]/loading.tsx
similarity index 61%
rename from src/app/area/[[...slug]]/loading.tsx
rename to src/app/(default)/area/[[...slug]]/loading.tsx
index e56d4d39b..229609270 100644
--- a/src/app/area/[[...slug]]/loading.tsx
+++ b/src/app/(default)/area/[[...slug]]/loading.tsx
@@ -1,4 +1,4 @@
-import { AreaPageContainer } from '@/app/components/ui/AreaPageContainer'
+import { AreaPageContainer } from '@/app/(default)/components/ui/AreaPageContainer'
 
 /**
  * Loading skeleton for /area/<id> page.
diff --git a/src/app/area/[[...slug]]/page.tsx b/src/app/(default)/area/[[...slug]]/page.tsx
similarity index 97%
rename from src/app/area/[[...slug]]/page.tsx
rename to src/app/(default)/area/[[...slug]]/page.tsx
index c3f1acd39..eda0061f8 100644
--- a/src/app/area/[[...slug]]/page.tsx
+++ b/src/app/(default)/area/[[...slug]]/page.tsx
@@ -8,12 +8,12 @@ import Markdown from 'react-markdown'
 
 import PhotoMontage, { UploadPhotoCTA } from '@/components/media/PhotoMontage'
 import { getArea } from '@/js/graphql/getArea'
-import { StickyHeaderContainer } from '@/app/components/ui/StickyHeaderContainer'
+import { StickyHeaderContainer } from '@/app/(default)/components/ui/StickyHeaderContainer'
 import { AreaCrumbs } from '@/components/breadcrumbs/AreaCrumbs'
 import { ArticleLastUpdate } from '@/components/edit/ArticleLastUpdate'
 import { getMapHref, getFriendlySlug, getAreaPageFriendlyUrl, sanitizeName } from '@/js/utils'
 import { LazyAreaMap } from '@/components/maps/AreaMap'
-import { AreaPageContainer } from '@/app/components/ui/AreaPageContainer'
+import { AreaPageContainer } from '@/app/(default)/components/ui/AreaPageContainer'
 import { AreaPageActions } from '../../components/AreaPageActions'
 import { SubAreasSection } from './sections/SubAreasSection'
 import { ClimbListSection } from './sections/ClimbListSection'
diff --git a/src/app/area/[[...slug]]/sections/ClimbListSection.tsx b/src/app/(default)/area/[[...slug]]/sections/ClimbListSection.tsx
similarity index 91%
rename from src/app/area/[[...slug]]/sections/ClimbListSection.tsx
rename to src/app/(default)/area/[[...slug]]/sections/ClimbListSection.tsx
index 9c4ae1ec8..af07cebcc 100644
--- a/src/app/area/[[...slug]]/sections/ClimbListSection.tsx
+++ b/src/app/(default)/area/[[...slug]]/sections/ClimbListSection.tsx
@@ -1,4 +1,4 @@
-import { ClimbList } from '@/app/editArea/[slug]/general/components/climb/ClimbListForm'
+import { ClimbList } from '@/app/(default)/editArea/[slug]/general/components/climb/ClimbListForm'
 import { AreaType } from '@/js/types'
 /**
  * Climb list section
diff --git a/src/app/area/[[...slug]]/sections/SubAreasSection.tsx b/src/app/(default)/area/[[...slug]]/sections/SubAreasSection.tsx
similarity index 91%
rename from src/app/area/[[...slug]]/sections/SubAreasSection.tsx
rename to src/app/(default)/area/[[...slug]]/sections/SubAreasSection.tsx
index 483d01825..bf0283093 100644
--- a/src/app/area/[[...slug]]/sections/SubAreasSection.tsx
+++ b/src/app/(default)/area/[[...slug]]/sections/SubAreasSection.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link'
 import { PlusSquare } from '@phosphor-icons/react/dist/ssr'
-import { AreaList } from 'app/editArea/[slug]/general/components/AreaList'
+import { AreaList } from '@/app/(default)/editArea/[slug]/general/components/AreaList'
 import { AreaEntityBullet } from '@/components/cues/Entities'
 import { AreaType } from '@/js/types'
 
diff --git a/src/app/components/AreaPageActions.tsx b/src/app/(default)/components/AreaPageActions.tsx
similarity index 92%
rename from src/app/components/AreaPageActions.tsx
rename to src/app/(default)/components/AreaPageActions.tsx
index c05dc21f9..3a4e9dde1 100644
--- a/src/app/components/AreaPageActions.tsx
+++ b/src/app/(default)/components/AreaPageActions.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link'
 import { PencilSimple, ArrowElbowLeftDown } from '@phosphor-icons/react/dist/ssr'
-import { ShareAreaLinkButton } from '@/app/components/ShareAreaLinkButton'
+import { ShareAreaLinkButton } from '@/app/(default)/components/ShareAreaLinkButton'
 import { UploadPhotoButton } from '@/components/media/PhotoUploadButtons'
 
 /**
diff --git a/src/app/components/DesktopHeader.tsx b/src/app/(default)/components/DesktopHeader.tsx
similarity index 90%
rename from src/app/components/DesktopHeader.tsx
rename to src/app/(default)/components/DesktopHeader.tsx
index b3994381c..459707c20 100644
--- a/src/app/components/DesktopHeader.tsx
+++ b/src/app/(default)/components/DesktopHeader.tsx
@@ -1,11 +1,11 @@
 'use client'
 import { signIn, useSession } from 'next-auth/react'
 
-import { Logo } from 'app/header'
+import { Logo } from '../header'
 import { XSearchMinimal } from '@/components/search/XSearch'
 import { NavMenuItem, NavMenuItemProps } from '@/components/ui/NavMenuButton'
 import GitHubStars from '@/components/GitHubStars'
-import ProfileNavButton from './ProfileNavButton'
+import AuthenticatedProfileNavButton from '../../../components/AuthenticatedProfileNavButton'
 
 export const DesktopHeader: React.FC = () => {
   const { status } = useSession()
@@ -56,7 +56,7 @@ export const DesktopHeader: React.FC = () => {
   let nav
   switch (status) {
     case 'authenticated':
-      nav = <ProfileNavButton isMobile={false} />
+      nav = <AuthenticatedProfileNavButton isMobile={false} />
       break
     case 'loading':
       nav = (
diff --git a/src/app/components/FinancialContributors.tsx b/src/app/(default)/components/FinancialContributors.tsx
similarity index 100%
rename from src/app/components/FinancialContributors.tsx
rename to src/app/(default)/components/FinancialContributors.tsx
diff --git a/src/app/components/InternationalToC.tsx b/src/app/(default)/components/InternationalToC.tsx
similarity index 100%
rename from src/app/components/InternationalToC.tsx
rename to src/app/(default)/components/InternationalToC.tsx
diff --git a/src/app/components/LandingCTA.tsx b/src/app/(default)/components/LandingCTA.tsx
similarity index 100%
rename from src/app/components/LandingCTA.tsx
rename to src/app/(default)/components/LandingCTA.tsx
diff --git a/src/app/(default)/components/LandingHero.tsx b/src/app/(default)/components/LandingHero.tsx
new file mode 100644
index 000000000..ec1c1813b
--- /dev/null
+++ b/src/app/(default)/components/LandingHero.tsx
@@ -0,0 +1,21 @@
+import { ArrowRight } from '@phosphor-icons/react/dist/ssr'
+
+export const LandingHero: React.FC = () => {
+  return (
+    <section className='w-full px-6 py-4'>
+      <h1 className='text-2xl tracking-tighter font-semibold'>Share your climbing route knowledge!</h1>
+      <div className='font-medium text-neutral/80'>
+        Join us to help improve this comprehensive climbing resource for the community.
+      </div>
+      <div className='mt-2'>
+        <HeroAlert />
+      </div>
+    </section>
+  )
+}
+
+export const HeroAlert: React.FC = () => (
+  <div className='mt-2 alert alert-warning'>
+    <span className='badge badge-sm badge-primary'>NEW</span>
+    <a href='/maps' className='underline flex items-center gap-1 text-sm'>Crag maps<ArrowRight size={20} /></a>
+  </div>)
diff --git a/src/app/components/LatestContributions.tsx b/src/app/(default)/components/LatestContributions.tsx
similarity index 100%
rename from src/app/components/LatestContributions.tsx
rename to src/app/(default)/components/LatestContributions.tsx
diff --git a/src/app/components/LoginButton.tsx b/src/app/(default)/components/LoginButton.tsx
similarity index 100%
rename from src/app/components/LoginButton.tsx
rename to src/app/(default)/components/LoginButton.tsx
diff --git a/src/app/components/MobileHeader.tsx b/src/app/(default)/components/MobileHeader.tsx
similarity index 67%
rename from src/app/components/MobileHeader.tsx
rename to src/app/(default)/components/MobileHeader.tsx
index ae25b868a..08bb22739 100644
--- a/src/app/components/MobileHeader.tsx
+++ b/src/app/(default)/components/MobileHeader.tsx
@@ -1,16 +1,16 @@
 'use client'
 import { useSession } from 'next-auth/react'
-import { Logo } from 'app/header'
+import { Logo } from '../header'
 import { XSearchMinimal } from '@/components/search/XSearch'
 import { LoginButton, More } from '@/components/MobileAppBar'
-import ProfileNavButton from './ProfileNavButton'
+import AuthenticatedProfileNavButton from '../../../components/AuthenticatedProfileNavButton'
 
 /**
  * Main header for mobile
  */
 export const MobileHeader: React.FC = () => {
   const { status } = useSession()
-  const nav = status === 'authenticated' ? <ProfileNavButton /> : <LoginButton />
+  const nav = status === 'authenticated' ? <AuthenticatedProfileNavButton /> : <LoginButton />
   return (
     <header className='flex lg:hidden items-center justify-between gap-6'>
       <Logo />
diff --git a/src/app/components/PageFooter.tsx b/src/app/(default)/components/PageFooter.tsx
similarity index 94%
rename from src/app/components/PageFooter.tsx
rename to src/app/(default)/components/PageFooter.tsx
index ead279311..a971b1334 100644
--- a/src/app/components/PageFooter.tsx
+++ b/src/app/(default)/components/PageFooter.tsx
@@ -1,10 +1,10 @@
-import { Logo, LogoSize } from 'app/header'
+import { Logo, LogoSize } from '../header'
 /**
  * Page footer
  */
 export const PageFooter: React.FC = () => {
   return (
-    <footer className='footer p-10 bg-base-200 bg-base-content text-base-100 snap-start snap-normal'>
+    <footer className='relative footer p-10 bg-base-200 bg-base-content text-base-100 snap-start snap-normal'>
       <aside>
         <div className='border-2 border-accent py-3 pl-2 pr-4 rounded-full'><Logo size={LogoSize.md} className='fill-accent' /></div>
         <p><span className='font-semibold text-lg'>OpenBeta</span><br /><span className='tracking-tight font-sm'>Free climbing database built & run by climbers.</span></p>
diff --git a/src/app/components/ReactToastifyProvider.tsx b/src/app/(default)/components/ReactToastifyProvider.tsx
similarity index 100%
rename from src/app/components/ReactToastifyProvider.tsx
rename to src/app/(default)/components/ReactToastifyProvider.tsx
diff --git a/src/app/components/RecentTags.tsx b/src/app/(default)/components/RecentTags.tsx
similarity index 100%
rename from src/app/components/RecentTags.tsx
rename to src/app/(default)/components/RecentTags.tsx
diff --git a/src/app/components/ShareAreaLinkButton.tsx b/src/app/(default)/components/ShareAreaLinkButton.tsx
similarity index 100%
rename from src/app/components/ShareAreaLinkButton.tsx
rename to src/app/(default)/components/ShareAreaLinkButton.tsx
diff --git a/src/app/components/ShowEmailJS.tsx b/src/app/(default)/components/ShowEmailJS.tsx
similarity index 100%
rename from src/app/components/ShowEmailJS.tsx
rename to src/app/(default)/components/ShowEmailJS.tsx
diff --git a/src/app/components/USAToC.tsx b/src/app/(default)/components/USAToC.tsx
similarity index 100%
rename from src/app/components/USAToC.tsx
rename to src/app/(default)/components/USAToC.tsx
diff --git a/src/app/components/Volunteers.tsx b/src/app/(default)/components/Volunteers.tsx
similarity index 100%
rename from src/app/components/Volunteers.tsx
rename to src/app/(default)/components/Volunteers.tsx
diff --git a/src/app/components/international-data.ts b/src/app/(default)/components/international-data.ts
similarity index 100%
rename from src/app/components/international-data.ts
rename to src/app/(default)/components/international-data.ts
diff --git a/src/app/components/recent/MapboxLayers.tsx b/src/app/(default)/components/recent/MapboxLayers.tsx
similarity index 100%
rename from src/app/components/recent/MapboxLayers.tsx
rename to src/app/(default)/components/recent/MapboxLayers.tsx
diff --git a/src/app/components/recent/RecentContributionsMap.tsx b/src/app/(default)/components/recent/RecentContributionsMap.tsx
similarity index 100%
rename from src/app/components/recent/RecentContributionsMap.tsx
rename to src/app/(default)/components/recent/RecentContributionsMap.tsx
diff --git a/src/app/components/ui/AreaPageContainer.tsx b/src/app/(default)/components/ui/AreaPageContainer.tsx
similarity index 87%
rename from src/app/components/ui/AreaPageContainer.tsx
rename to src/app/(default)/components/ui/AreaPageContainer.tsx
index 0290c0676..f33316a7c 100644
--- a/src/app/components/ui/AreaPageContainer.tsx
+++ b/src/app/(default)/components/ui/AreaPageContainer.tsx
@@ -1,6 +1,7 @@
 import { GallerySkeleton } from '@/components/media/PhotoMontage'
 import React from 'react'
 import { AreaPageActionsSkeleton } from '../AreaPageActions'
+import { HeroAlert } from '../LandingHero'
 
 /**
  * Area page containter.  Show loading skeleton if no params are provided.
@@ -14,7 +15,10 @@ export const AreaPageContainer: React.FC<{
 }> = ({ photoGallery, pageActions, breadcrumbs, map, children }) => {
   return (
     <article>
-      <div className='p-4 mx-auto max-w-5xl xl:max-w-7xl'>
+      <div className='px-4 mb-2'>
+        <HeroAlert />
+      </div>
+      <div className='px-4 mx-auto max-w-5xl xl:max-w-7xl'>
         {photoGallery == null ? <GallerySkeleton /> : photoGallery}
         <div className='flex justify-end py-4 border-b'>
           {pageActions == null ? <AreaPageActionsSkeleton /> : pageActions}
diff --git a/src/app/components/ui/GlobalAlerts.tsx b/src/app/(default)/components/ui/GlobalAlerts.tsx
similarity index 100%
rename from src/app/components/ui/GlobalAlerts.tsx
rename to src/app/(default)/components/ui/GlobalAlerts.tsx
diff --git a/src/app/components/ui/SectionContainer.tsx b/src/app/(default)/components/ui/SectionContainer.tsx
similarity index 100%
rename from src/app/components/ui/SectionContainer.tsx
rename to src/app/(default)/components/ui/SectionContainer.tsx
diff --git a/src/app/components/ui/StickyHeaderContainer.tsx b/src/app/(default)/components/ui/StickyHeaderContainer.tsx
similarity index 100%
rename from src/app/components/ui/StickyHeaderContainer.tsx
rename to src/app/(default)/components/ui/StickyHeaderContainer.tsx
diff --git a/src/app/edit/page.tsx b/src/app/(default)/edit/page.tsx
similarity index 85%
rename from src/app/edit/page.tsx
rename to src/app/(default)/edit/page.tsx
index 4a688e5a9..692ed2a6e 100644
--- a/src/app/edit/page.tsx
+++ b/src/app/(default)/edit/page.tsx
@@ -1,13 +1,16 @@
-import { getChangeHistoryServerSide } from '../../js/graphql/contribAPI'
-import RecentChangeHistory from '@/components/edit/RecentChangeHistory'
 import { ReactElement } from 'react'
 import { Metadata } from 'next'
 
+import { getChangeHistoryServerSide } from '@/js/graphql/contribAPI'
+import RecentChangeHistory from '@/components/edit/RecentChangeHistory'
+
 export const metadata: Metadata = {
   title: 'Contribute to OpenBeta',
   description: 'Share your climbing adventure photos and contribute to the climbing route catalog.'
 }
 
+export const revalidate = 3600
+
 export default async function Page (): Promise<ReactElement> {
   const history = await getChangeHistoryServerSide()
   return (
diff --git a/src/app/editArea/[slug]/SidebarNav.tsx b/src/app/(default)/editArea/[slug]/SidebarNav.tsx
similarity index 100%
rename from src/app/editArea/[slug]/SidebarNav.tsx
rename to src/app/(default)/editArea/[slug]/SidebarNav.tsx
diff --git a/src/app/editArea/[slug]/components/EditAreaContainers.tsx b/src/app/(default)/editArea/[slug]/components/EditAreaContainers.tsx
similarity index 100%
rename from src/app/editArea/[slug]/components/EditAreaContainers.tsx
rename to src/app/(default)/editArea/[slug]/components/EditAreaContainers.tsx
diff --git a/src/app/editArea/[slug]/components/SingleEntryForm.tsx b/src/app/(default)/editArea/[slug]/components/SingleEntryForm.tsx
similarity index 100%
rename from src/app/editArea/[slug]/components/SingleEntryForm.tsx
rename to src/app/(default)/editArea/[slug]/components/SingleEntryForm.tsx
diff --git a/src/app/editArea/[slug]/general/components/AddAreaForm.tsx b/src/app/(default)/editArea/[slug]/general/components/AddAreaForm.tsx
similarity index 96%
rename from src/app/editArea/[slug]/general/components/AddAreaForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AddAreaForm.tsx
index c12a22b0f..abeefd9fc 100644
--- a/src/app/editArea/[slug]/general/components/AddAreaForm.tsx
+++ b/src/app/(default)/editArea/[slug]/general/components/AddAreaForm.tsx
@@ -3,7 +3,7 @@ import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/navigation'
 import { WarningOctagon } from '@phosphor-icons/react/dist/ssr'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { DashboardInput } from '@/components/ui/form/Input'
 import useUpdateAreasCmd from '@/js/hooks/useUpdateAreasCmd'
 import { AreaType } from '@/js/types'
diff --git a/src/app/editArea/[slug]/general/components/AreaDescriptionForm.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaDescriptionForm.tsx
similarity index 93%
rename from src/app/editArea/[slug]/general/components/AreaDescriptionForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaDescriptionForm.tsx
index d9c1db5f8..c83e57cd6 100644
--- a/src/app/editArea/[slug]/general/components/AreaDescriptionForm.tsx
+++ b/src/app/(default)/editArea/[slug]/general/components/AreaDescriptionForm.tsx
@@ -1,7 +1,7 @@
 'use client'
 import { useSession } from 'next-auth/react'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { AREA_DESCRIPTION_FORM_VALIDATION_RULES } from '@/components/edit/EditAreaForm'
 import useUpdateAreasCmd from '@/js/hooks/useUpdateAreasCmd'
 import { MarkdownTextArea } from '@/components/ui/form/MarkdownTextArea'
diff --git a/src/app/editArea/[slug]/general/components/AreaItem.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaItem.tsx
similarity index 100%
rename from src/app/editArea/[slug]/general/components/AreaItem.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaItem.tsx
diff --git a/src/app/editArea/[slug]/general/components/AreaLatLngForm.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaLatLngForm.tsx
similarity index 93%
rename from src/app/editArea/[slug]/general/components/AreaLatLngForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaLatLngForm.tsx
index 9bec8eeee..def7493fc 100644
--- a/src/app/editArea/[slug]/general/components/AreaLatLngForm.tsx
+++ b/src/app/(default)/editArea/[slug]/general/components/AreaLatLngForm.tsx
@@ -1,7 +1,7 @@
 'use client'
 import { useSession } from 'next-auth/react'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { AREA_LATLNG_FORM_VALIDATION_RULES } from '@/components/edit/EditAreaForm'
 import { DashboardInput } from '@/components/ui/form/Input'
 import useUpdateAreasCmd from '@/js/hooks/useUpdateAreasCmd'
diff --git a/src/app/editArea/[slug]/general/components/AreaList.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaList.tsx
similarity index 100%
rename from src/app/editArea/[slug]/general/components/AreaList.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaList.tsx
diff --git a/src/app/editArea/[slug]/general/components/AreaNameForm.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaNameForm.tsx
similarity index 93%
rename from src/app/editArea/[slug]/general/components/AreaNameForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaNameForm.tsx
index 6dd8d12f0..2a8d9da38 100644
--- a/src/app/editArea/[slug]/general/components/AreaNameForm.tsx
+++ b/src/app/(default)/editArea/[slug]/general/components/AreaNameForm.tsx
@@ -2,7 +2,7 @@
 import { useSession } from 'next-auth/react'
 import { ValidationValueMessage } from 'react-hook-form'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { DashboardInput } from '@/components/ui/form/Input'
 import useUpdateAreasCmd from '@/js/hooks/useUpdateAreasCmd'
 import { AREA_NAME_FORM_VALIDATION_RULES } from '@/components/edit/EditAreaForm'
diff --git a/src/app/editArea/[slug]/general/components/AreaTypeForm.tsx b/src/app/(default)/editArea/[slug]/general/components/AreaTypeForm.tsx
similarity index 94%
rename from src/app/editArea/[slug]/general/components/AreaTypeForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/AreaTypeForm.tsx
index c43ee0848..e7771b350 100644
--- a/src/app/editArea/[slug]/general/components/AreaTypeForm.tsx
+++ b/src/app/(default)/editArea/[slug]/general/components/AreaTypeForm.tsx
@@ -2,7 +2,7 @@
 import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/navigation'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import useUpdateAreasCmd from '@/js/hooks/useUpdateAreasCmd'
 import { AreaType } from '@/js/types'
 import { AreaDesignationRadioGroup, areaDesignationToDb, areaDesignationToForm, AreaTypeFormProp } from '@/components/edit/form/AreaDesignationRadioGroup'
diff --git a/src/app/editArea/[slug]/general/components/climb/ClimbListForm.tsx b/src/app/(default)/editArea/[slug]/general/components/climb/ClimbListForm.tsx
similarity index 100%
rename from src/app/editArea/[slug]/general/components/climb/ClimbListForm.tsx
rename to src/app/(default)/editArea/[slug]/general/components/climb/ClimbListForm.tsx
diff --git a/src/app/editArea/[slug]/general/page.tsx b/src/app/(default)/editArea/[slug]/general/page.tsx
similarity index 100%
rename from src/app/editArea/[slug]/general/page.tsx
rename to src/app/(default)/editArea/[slug]/general/page.tsx
diff --git a/src/app/editArea/[slug]/layout.tsx b/src/app/(default)/editArea/[slug]/layout.tsx
similarity index 93%
rename from src/app/editArea/[slug]/layout.tsx
rename to src/app/(default)/editArea/[slug]/layout.tsx
index 3a136c097..6adce5cf3 100644
--- a/src/app/editArea/[slug]/layout.tsx
+++ b/src/app/(default)/editArea/[slug]/layout.tsx
@@ -18,7 +18,7 @@ export default async function EditAreaDashboardLayout ({
 }): Promise<any> {
   const { area: { uuid, pathTokens, ancestors, areaName, metadata: { leaf } } } = await getPageDataForEdit(params.slug)
   return (
-    <div>
+    <div className='relative w-full h-full'>
       <div className='px-12 pt-8 pb-4'>
         <div className='text-3xl tracking-tight font-semibold'>Edit area</div>
 
@@ -35,7 +35,7 @@ export default async function EditAreaDashboardLayout ({
         </div>
         <div className='flex bg-base-200 flex-col lg:flex-row py-12'>
           <SidebarNav slug={params.slug} canAddAreas={!leaf} canAddClimbs={leaf} />
-          <main className='w-full px-2 lg:px-16'>
+          <main className='relative h-full w-full px-2 lg:px-16'>
             {children}
           </main>
         </div>
diff --git a/src/app/editArea/[slug]/loading.tsx b/src/app/(default)/editArea/[slug]/loading.tsx
similarity index 100%
rename from src/app/editArea/[slug]/loading.tsx
rename to src/app/(default)/editArea/[slug]/loading.tsx
diff --git a/src/app/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx b/src/app/(default)/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx
similarity index 98%
rename from src/app/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx
rename to src/app/(default)/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx
index eaee00b1e..8b4f8248d 100644
--- a/src/app/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx
+++ b/src/app/(default)/editArea/[slug]/manageAreas/components/sorting/SortAreasForm.tsx
@@ -15,7 +15,7 @@ import { SortableContext, rectSortingStrategy, sortableKeyboardCoordinates, arra
 import clx from 'classnames'
 import { DotsSixVertical } from '@phosphor-icons/react/dist/ssr'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { AreaType } from '@/js/types'
 import { areaLeftRightIndexComparator } from '@/js/utils'
 import { SortableClimbItem } from '../../../manageClimbs/components/sorting/SortableClimbItem'
diff --git a/src/app/editArea/[slug]/manageAreas/page.tsx b/src/app/(default)/editArea/[slug]/manageAreas/page.tsx
similarity index 100%
rename from src/app/editArea/[slug]/manageAreas/page.tsx
rename to src/app/(default)/editArea/[slug]/manageAreas/page.tsx
diff --git a/src/app/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx
similarity index 95%
rename from src/app/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx
index 96bccb20b..88bf96f75 100644
--- a/src/app/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx
+++ b/src/app/(default)/editArea/[slug]/manageClimbs/components/AddClimbsForm.tsx
@@ -2,7 +2,7 @@
 import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/navigation'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import useUpdateClimbsCmd from '@/js/hooks/useUpdateClimbsCmd'
 import { DynamicClimbInputList } from './DynamicClimbInputList'
 import { GradeContexts } from '@/js/grades/Grade'
diff --git a/src/app/editArea/[slug]/manageClimbs/components/ClimbListMiniToolbar.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/ClimbListMiniToolbar.tsx
similarity index 100%
rename from src/app/editArea/[slug]/manageClimbs/components/ClimbListMiniToolbar.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/ClimbListMiniToolbar.tsx
diff --git a/src/app/editArea/[slug]/manageClimbs/components/DisciplinesSelection.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/DisciplinesSelection.tsx
similarity index 100%
rename from src/app/editArea/[slug]/manageClimbs/components/DisciplinesSelection.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/DisciplinesSelection.tsx
diff --git a/src/app/editArea/[slug]/manageClimbs/components/DynamicClimbInputList.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/DynamicClimbInputList.tsx
similarity index 100%
rename from src/app/editArea/[slug]/manageClimbs/components/DynamicClimbInputList.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/DynamicClimbInputList.tsx
diff --git a/src/app/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx
similarity index 98%
rename from src/app/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx
index c75de538a..f0e8516aa 100644
--- a/src/app/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx
+++ b/src/app/(default)/editArea/[slug]/manageClimbs/components/sorting/SortClimbsForm.tsx
@@ -15,7 +15,7 @@ import { SortableContext, rectSortingStrategy, sortableKeyboardCoordinates, arra
 import clx from 'classnames'
 import { DotsSixVertical } from '@phosphor-icons/react/dist/ssr'
 
-import { SingleEntryForm } from 'app/editArea/[slug]/components/SingleEntryForm'
+import { SingleEntryForm } from '@/app/(default)/editArea/[slug]/components/SingleEntryForm'
 import { ClimbType } from '@/js/types'
 import { climbLeftRightIndexComparator } from '@/js/utils'
 import { SortableClimbItem } from './SortableClimbItem'
diff --git a/src/app/editArea/[slug]/manageClimbs/components/sorting/SortableClimbItem.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/components/sorting/SortableClimbItem.tsx
similarity index 100%
rename from src/app/editArea/[slug]/manageClimbs/components/sorting/SortableClimbItem.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/components/sorting/SortableClimbItem.tsx
diff --git a/src/app/editArea/[slug]/manageClimbs/page.tsx b/src/app/(default)/editArea/[slug]/manageClimbs/page.tsx
similarity index 94%
rename from src/app/editArea/[slug]/manageClimbs/page.tsx
rename to src/app/(default)/editArea/[slug]/manageClimbs/page.tsx
index 2ecd5b966..5730b8ff5 100644
--- a/src/app/editArea/[slug]/manageClimbs/page.tsx
+++ b/src/app/(default)/editArea/[slug]/manageClimbs/page.tsx
@@ -2,7 +2,7 @@ import { Metadata } from 'next'
 import { DashboardPageProps, getPageDataForEdit } from '../general/page'
 import { PageContainer, SectionContainer } from '../components/EditAreaContainers'
 import { AddClimbsForm } from './components/AddClimbsForm'
-import { ClimbListSection } from '@/app/area/[[...slug]]/sections/ClimbListSection'
+import { ClimbListSection } from '@/app/(default)/area/[[...slug]]/sections/ClimbListSection'
 import { SortClimbsForm } from './components/sorting/SortClimbsForm'
 
 // Opt out of caching for all data requests in the route segment
diff --git a/src/app/editArea/[slug]/page.tsx b/src/app/(default)/editArea/[slug]/page.tsx
similarity index 100%
rename from src/app/editArea/[slug]/page.tsx
rename to src/app/(default)/editArea/[slug]/page.tsx
diff --git a/src/app/header.tsx b/src/app/(default)/header.tsx
similarity index 100%
rename from src/app/header.tsx
rename to src/app/(default)/header.tsx
diff --git a/src/app/layout.tsx b/src/app/(default)/layout.tsx
similarity index 81%
rename from src/app/layout.tsx
rename to src/app/(default)/layout.tsx
index 2005296ab..0876c01a3 100644
--- a/src/app/layout.tsx
+++ b/src/app/(default)/layout.tsx
@@ -1,9 +1,9 @@
 import { Metadata } from 'next'
-import '../../public/fonts/fonts.css'
-import './global.css'
+import '@/public/fonts/fonts.css'
+import '../global.css'
 import Header from './header'
 import { PageFooter } from './components/PageFooter'
-import { NextAuthProvider } from './components/NextAuthProvider'
+import { NextAuthProvider } from '@/components/auth/NextAuthProvider'
 import { ReactToastifyProvider } from './components/ReactToastifyProvider'
 import { BlockingAlertUploadingInProgress } from './components/ui/GlobalAlerts'
 
@@ -26,8 +26,8 @@ export default function RootLayout ({
   children: React.ReactNode
 }): any {
   return (
-    <html lang='en' className='snap-proximity snap-y'>
-      <body>
+    <html lang='en' className='snap-proximity snap-y scroll-smooth'>
+      <body className='relative'>
         <NextAuthProvider>
           <Header />
           <div>
diff --git a/src/app/login/page.tsx b/src/app/(default)/login/page.tsx
similarity index 100%
rename from src/app/login/page.tsx
rename to src/app/(default)/login/page.tsx
diff --git a/src/app/page.tsx b/src/app/(default)/page.tsx
similarity index 97%
rename from src/app/page.tsx
rename to src/app/(default)/page.tsx
index 81ec9751a..df06f4a76 100644
--- a/src/app/page.tsx
+++ b/src/app/(default)/page.tsx
@@ -12,7 +12,7 @@ import { RecentContributionsMap } from './components/recent/RecentContributionsM
 /**
  * Cache duration in seconds
  */
-export const revalidate = 3600
+export const dynamic = 'force-dynamic'
 
 /**
  * Root home page
diff --git a/src/app/(maps)/components/ProfileMenu.tsx b/src/app/(maps)/components/ProfileMenu.tsx
new file mode 100644
index 000000000..a632418cd
--- /dev/null
+++ b/src/app/(maps)/components/ProfileMenu.tsx
@@ -0,0 +1,17 @@
+'use client'
+import { SessionProvider } from 'next-auth/react'
+import { House } from '@phosphor-icons/react/dist/ssr'
+import AuthenticatedProfileNavButton from '@/components/AuthenticatedProfileNavButton'
+
+export const ProfileMenu: React.FC = () => {
+  return (
+    <SessionProvider>
+      <div className='absolute right-4 top-4 z-50'>
+        <nav className='flex items-center gap-2'>
+          <a className='btn glass' href='/'><House size={18} />Home</a>
+          <AuthenticatedProfileNavButton isMobile={false} />
+        </nav>
+      </div>
+    </SessionProvider>
+  )
+}
diff --git a/src/app/(maps)/layout.tsx b/src/app/(maps)/layout.tsx
new file mode 100644
index 000000000..e54d23b04
--- /dev/null
+++ b/src/app/(maps)/layout.tsx
@@ -0,0 +1,31 @@
+import 'mapbox-gl/dist/mapbox-gl.css'
+import { Metadata } from 'next'
+import '@/public/fonts/fonts.css'
+import './../global.css'
+
+/**
+ * Root layout for `/maps` route
+ */
+export default function MapsRootLayout ({
+  children
+}: {
+  children: React.ReactNode
+}): any {
+  return (
+    <html lang='en'>
+      <body className='relative'>
+        {children}
+      </body>
+    </html>
+  )
+}
+
+export const metadata: Metadata = {
+  title: 'Open climb maps',
+  description: 'Free rock climbing platform',
+  openGraph: {
+    description: 'OpenBeta is a free climbing platform.  Join the community and share your knowledge today.',
+    images: '/south-africa-og.jpeg'
+  },
+  metadataBase: new URL(`https://${process.env.VERCEL_URL ?? 'http://localhost:3000'}`)
+}
diff --git a/src/app/(maps)/maps/page.tsx b/src/app/(maps)/maps/page.tsx
new file mode 100644
index 000000000..a93212152
--- /dev/null
+++ b/src/app/(maps)/maps/page.tsx
@@ -0,0 +1,15 @@
+import { GlobalMap } from '@/components/maps/GlobalMap'
+import { ProfileMenu } from '../components/ProfileMenu'
+
+export const dynamic = 'force-dynamic'
+
+export default async function MapPage (): Promise<any> {
+  return (
+    <div className='w-full h-full'>
+      <ProfileMenu />
+      <GlobalMap
+        showFullscreenControl={false}
+      />
+    </div>
+  )
+}
diff --git a/src/app/api/geo/route.ts b/src/app/api/geo/route.ts
new file mode 100644
index 000000000..8e86aaaa9
--- /dev/null
+++ b/src/app/api/geo/route.ts
@@ -0,0 +1,18 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { geolocation } from '@vercel/edge'
+
+export const runtime = 'edge'
+
+/**
+ * Return latitude and longitude of the visitor. Only works when deploying on Vercel.
+ * Endpoint: `/api/geo`
+ */
+export async function GET (request: NextRequest): Promise<any> {
+  const geo = geolocation(request)
+  const longitude = geo?.longitude
+  const latitude = geo?.latitude
+  if (longitude != null && latitude != null) {
+    return NextResponse.json({ longitude: parseFloat(longitude), latitude: parseFloat(latitude) }, { status: 200 })
+  }
+  return NextResponse.json({ message: 'No geo data available.' }, { status: 503 })
+}
diff --git a/src/app/components/LandingHero.tsx b/src/app/components/LandingHero.tsx
deleted file mode 100644
index a29b662f3..000000000
--- a/src/app/components/LandingHero.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-export const LandingHero: React.FC = () => {
-  return (
-    <section className='w-full px-6 py-4'>
-      <h1 className='text-2xl tracking-tighter font-semibold'>Share your climbing route knowledge!</h1>
-      <div className='font-medium text-neutral/80'>
-        Join us to help improve this comprehensive climbing resource for the community.
-      </div>
-    </section>
-  )
-}
diff --git a/src/app/components/ProfileNavButton.tsx b/src/components/AuthenticatedProfileNavButton.tsx
similarity index 83%
rename from src/app/components/ProfileNavButton.tsx
rename to src/components/AuthenticatedProfileNavButton.tsx
index d584bb3df..920939009 100644
--- a/src/app/components/ProfileNavButton.tsx
+++ b/src/components/AuthenticatedProfileNavButton.tsx
@@ -1,7 +1,7 @@
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
-import { useSession, signOut } from 'next-auth/react'
-import { User, HandHeart } from '@phosphor-icons/react/dist/ssr'
+import { useSession, signIn, signOut } from 'next-auth/react'
+import { UserCircle, HandHeart } from '@phosphor-icons/react/dist/ssr'
 import { UserCircleIcon, ChatBubbleOvalLeftEllipsisIcon, Cog6ToothIcon, ChartBarIcon, GiftIcon } from '@heroicons/react/24/outline'
 
 import { DropdownMenu, DropdownTrigger, DropdownContent, DropdownItem, DropdownSeparator } from '@/components/ui/DropdownMenu'
@@ -14,13 +14,13 @@ interface ProfileNavButtonProps {
 /**
  * Render user dropdown menu if the user has logged in.  Return null otherwise.
  */
-export default function ProfileNavButton ({ isMobile = true }: ProfileNavButtonProps): JSX.Element | null {
+export default function AuthenticatedProfileNavButton ({ isMobile = true }: ProfileNavButtonProps): JSX.Element | null {
   const router = useRouter()
   const { status } = useSession()
   if (status === 'authenticated') {
     if (isMobile) {
       return (
-        <Link href='/api/user/me' legacyBehavior>
+        <Link href='/api/user/me'>
           <button className='inline-flex btn btn-ghost btn-square'>
             <UserCircleIcon className='stroke-1 w-8 h-8' />
           </button>
@@ -31,8 +31,8 @@ export default function ProfileNavButton ({ isMobile = true }: ProfileNavButtonP
       <div className='block relative'>
         <DropdownMenu>
           <DropdownTrigger asChild>
-            <button className='btn btn-primary btn-outline gap-2 no-animation rounded-full border-2 shadow-md'>
-              <User size={20} weight='fill' className='text-accent' />
+            <button className='btn btn-primary btn-solid no-animation border-2 shadow-md'>
+              <UserCircle size={24} weight='fill' className='text-accent' />
               Profile
             </button>
           </DropdownTrigger>
@@ -106,5 +106,13 @@ export default function ProfileNavButton ({ isMobile = true }: ProfileNavButtonP
     )
   }
 
-  return null
+  return (
+    <button
+      className='btn btn-solid ring-0 border-b-2 border-b-neutral shadow-md btn-accent'
+      disabled={status === 'loading'}
+      onClick={() => { void signIn('auth0') }}
+    >
+      <UserCircle size={24} weight='fill' />Login
+    </button>
+  )
 }
diff --git a/src/components/ProfileNavButton.tsx b/src/components/ProfileNavButton.tsx
index f9e3ad20a..a080a72c6 100644
--- a/src/components/ProfileNavButton.tsx
+++ b/src/components/ProfileNavButton.tsx
@@ -1,5 +1,5 @@
 import Link from 'next/link'
-import { useRouter } from 'next/router'
+import { useRouter } from 'next/navigation'
 import { useSession, signOut } from 'next-auth/react'
 import { UserCircleIcon, ChatBubbleOvalLeftEllipsisIcon, Cog6ToothIcon, ChartBarIcon, GiftIcon } from '@heroicons/react/24/outline'
 
@@ -12,6 +12,7 @@ interface ProfileNavButtonProps {
 
 /**
  * Render user dropdown menu if the user has logged in.  Return null otherwise.
+ * @deprecated
  */
 export default function ProfileNavButton ({ isMobile = true }: ProfileNavButtonProps): JSX.Element | null {
   const router = useRouter()
diff --git a/src/app/components/NextAuthProvider.tsx b/src/components/auth/NextAuthProvider.tsx
similarity index 100%
rename from src/app/components/NextAuthProvider.tsx
rename to src/components/auth/NextAuthProvider.tsx
diff --git a/src/components/cues/Entities.tsx b/src/components/cues/Entities.tsx
index 1e70f697d..2979858d1 100644
--- a/src/components/cues/Entities.tsx
+++ b/src/components/cues/Entities.tsx
@@ -1,4 +1,4 @@
-import { EntityIcon } from 'app/editArea/[slug]/general/components/AreaItem'
+import { EntityIcon } from '@/app/(default)/editArea/[slug]/general/components/AreaItem'
 
 export const AreaEntityBullet: React.FC = () => <span className='area-entity-box'><EntityIcon type='area' size={24} withLabel={false} /></span>
 
diff --git a/src/components/edit/form/AreaDesignationRadioGroup.tsx b/src/components/edit/form/AreaDesignationRadioGroup.tsx
index 1bd35f086..392de7655 100644
--- a/src/components/edit/form/AreaDesignationRadioGroup.tsx
+++ b/src/components/edit/form/AreaDesignationRadioGroup.tsx
@@ -2,7 +2,7 @@ import { QuestionMarkCircleIcon } from '@heroicons/react/20/solid'
 import { AreaMetadataType, AreaUpdatableFieldsType } from '../../../js/types'
 import { RadioGroup } from '../../ui/form'
 import Tooltip from '../../ui/Tooltip'
-import { EntityIcon } from 'app/editArea/[slug]/general/components/AreaItem'
+import { EntityIcon } from '@/app/(default)/editArea/[slug]/general/components/AreaItem'
 
 export type AreaTypeFormProp = 'crag' | 'area' | 'boulder'
 
diff --git a/src/components/maps/AreaInfoDrawer.tsx b/src/components/maps/AreaInfoDrawer.tsx
index 2d83eb1d6..1697e2757 100644
--- a/src/components/maps/AreaInfoDrawer.tsx
+++ b/src/components/maps/AreaInfoDrawer.tsx
@@ -3,7 +3,7 @@ import * as Popover from '@radix-ui/react-popover'
 import { MapAreaFeatureProperties } from './AreaMap'
 import { getAreaPageFriendlyUrl } from '@/js/utils'
 import { Card } from '../core/Card'
-import { EntityIcon } from '@/app/editArea/[slug]/general/components/AreaItem'
+import { EntityIcon } from '@/app/(default)/editArea/[slug]/general/components/AreaItem'
 import { ArrowRight } from '@phosphor-icons/react/dist/ssr'
 
 /**
diff --git a/src/components/maps/AreaInfoHover.tsx b/src/components/maps/AreaInfoHover.tsx
index a5a3b6588..20fc748a8 100644
--- a/src/components/maps/AreaInfoHover.tsx
+++ b/src/components/maps/AreaInfoHover.tsx
@@ -2,7 +2,7 @@ import * as Popover from '@radix-ui/react-popover'
 import { HoverInfo, MapAreaFeatureProperties } from './AreaMap'
 import { getAreaPageFriendlyUrl } from '@/js/utils'
 import { Card } from '../core/Card'
-import { EntityIcon } from '@/app/editArea/[slug]/general/components/AreaItem'
+import { EntityIcon } from '@/app/(default)/editArea/[slug]/general/components/AreaItem'
 import { SelectedPolygon } from './AreaActiveMarker'
 /**
  * Area info panel
diff --git a/src/components/maps/BaseMap.tsx b/src/components/maps/BaseMap.tsx
index 91ffb5a49..6ee4685d5 100644
--- a/src/components/maps/BaseMap.tsx
+++ b/src/components/maps/BaseMap.tsx
@@ -33,6 +33,7 @@ interface BaseMapProps {
 /**
  * Important! if you want MapGL to pass custom layer data to onClick/onHover,
  * you need to provide the layer id to MapGL via interactiveLayerIds
+ * @deprecated
  */
 export default function BaseMap ({
   height,
diff --git a/src/components/maps/CragsMap.tsx b/src/components/maps/CragsMap.tsx
index 3e5e11db1..eb0f528d7 100644
--- a/src/components/maps/CragsMap.tsx
+++ b/src/components/maps/CragsMap.tsx
@@ -13,6 +13,7 @@ import { MapLayerMouseEvent } from 'mapbox-gl'
 const mapElementId = 'my-area-map'
 /**
  * Make a map of crag markers.
+ * @deprecated
  */
 export default function CragsMap (): JSX.Element {
   const geojson = store.filters.allGeoJson()
diff --git a/src/components/maps/GlobalMap.tsx b/src/components/maps/GlobalMap.tsx
new file mode 100644
index 000000000..681276f39
--- /dev/null
+++ b/src/components/maps/GlobalMap.tsx
@@ -0,0 +1,141 @@
+'use client'
+import { useCallback, useEffect, useState } from 'react'
+import mapboxgl from 'mapbox-gl'
+import { Map, ScaleControl, FullscreenControl, NavigationControl, MapLayerMouseEvent, MapInstance } from 'react-map-gl'
+import { Point, Polygon } from '@turf/helpers'
+
+import { MAP_STYLES } from './BaseMap'
+import { AreaInfoDrawer } from './AreaInfoDrawer'
+import { AreaInfoHover } from './AreaInfoHover'
+import { SelectedFeature } from './AreaActiveMarker'
+
+export interface MapAreaFeatureProperties {
+  id: string
+  name: string
+  content: {
+    description: string
+  }
+  parent: string // due to a backend backend bug, this is a string instead of a parent object
+  // parent: {
+  //   id: string
+  //   name: string
+  // }
+}
+
+export interface HoverInfo {
+  geometry: Point | Polygon
+  data: MapAreaFeatureProperties
+  mapInstance: MapInstance
+}
+
+interface GlobalMapProps {
+  showFullscreenControl?: boolean
+  initialCenter?: { longitude: number, latitude: number }
+}
+
+/**
+ * Global map
+ */
+export const GlobalMap: React.FC<GlobalMapProps> = ({ showFullscreenControl = true }) => {
+  const [initialCenter, setInitialCenter] = useState<[number, number] | undefined>(undefined)
+  const [clickInfo, setClickInfo] = useState<MapAreaFeatureProperties | null>(null)
+  const [hoverInfo, setHoverInfo] = useState<HoverInfo | null>(null)
+  const [selected, setSelected] = useState<Point | Polygon | null>(null)
+  const [mapInstance, setMapInstance] = useState<MapInstance | null>(null)
+  const [cursor, setCursor] = useState<string>('default')
+
+  useEffect(() => {
+    getVisitorLocation().then((visitorLocation) => {
+      if (visitorLocation != null) {
+        setInitialCenter([visitorLocation.longitude, visitorLocation.latitude])
+      }
+    }).catch(() => {
+      console.log('Unable to determine user\'s location')
+    })
+  }, [])
+
+  const onLoad = useCallback((e: mapboxgl.MapboxEvent) => {
+    setMapInstance(e.target)
+    if (initialCenter != null) {
+      e.target.jumpTo({ center: initialCenter })
+    }
+  }, [initialCenter])
+
+  const onClick = useCallback((event: MapLayerMouseEvent): void => {
+    const feature = event?.features?.[0]
+    if (feature == null) {
+      setSelected(null)
+      setClickInfo(null)
+    } else {
+      setSelected(feature.geometry as Point | Polygon)
+      setClickInfo(feature.properties as MapAreaFeatureProperties)
+    }
+  }, [mapInstance])
+
+  const onHover = useCallback((event: MapLayerMouseEvent) => {
+    const obLayerId = event.features?.findIndex((f) => f.layer.id === 'crags' || f.layer.id === 'crag-group-boundaries') ?? -1
+
+    if (obLayerId !== -1) {
+      setCursor('pointer')
+      const feature = event.features?.[obLayerId]
+      if (feature != null && mapInstance != null) {
+        const { geometry } = feature
+        if (geometry.type === 'Point' || geometry.type === 'Polygon') {
+          setHoverInfo({
+            geometry: feature.geometry as Point | Polygon,
+            data: feature.properties as MapAreaFeatureProperties,
+            mapInstance
+          })
+        }
+      }
+    } else {
+      setHoverInfo(null)
+      setCursor('default')
+    }
+  }, [mapInstance])
+
+  return (
+    <div className='relative w-full h-full'>
+      <Map
+        id='global-map'
+        onLoad={onLoad}
+        onDragStart={() => {
+          setCursor('move')
+        }}
+        onDragEnd={() => {
+          setCursor('default')
+        }}
+        onMouseEnter={onHover}
+        onMouseLeave={() => {
+          setHoverInfo(null)
+          setCursor('default')
+        }}
+        onClick={onClick}
+        reuseMaps
+        mapboxAccessToken={process.env.NEXT_PUBLIC_MAPBOX_API_KEY}
+        mapStyle={MAP_STYLES.light}
+        cursor={cursor}
+        cooperativeGestures={showFullscreenControl}
+        interactiveLayerIds={['crags', 'crag-group-boundaries']}
+      >
+        <ScaleControl />
+        {showFullscreenControl && <FullscreenControl />}
+        <NavigationControl showCompass={false} position='bottom-right' />
+        {selected != null &&
+          <SelectedFeature geometry={selected} />}
+        <AreaInfoDrawer data={clickInfo} />
+        {hoverInfo != null && <AreaInfoHover {...hoverInfo} />}
+      </Map>
+    </div>
+  )
+}
+
+const getVisitorLocation = async (): Promise<{ longitude: number, latitude: number } | undefined> => {
+  try {
+    const res = await fetch('/api/geo')
+    return await res.json()
+  } catch (err) {
+    console.log('ERROR', err)
+    return undefined
+  }
+}
diff --git a/src/pages/climbs/[id].tsx b/src/pages/climbs/[id].tsx
index ccab042d7..1c3434e8f 100644
--- a/src/pages/climbs/[id].tsx
+++ b/src/pages/climbs/[id].tsx
@@ -31,7 +31,7 @@ import { TotalLengthInput } from '../../components/edit/form/TotalLengthInput'
 import { LegacyFAInput } from '../../components/edit/form/LegacyFAInput'
 import { getClimbById } from '../../js/graphql/api'
 import { GraphQLError } from 'graphql/error/GraphQLError'
-import { ClimbList } from '@/app/editArea/[slug]/general/components/climb/ClimbListForm'
+import { ClimbList } from '@/app/(default)/editArea/[slug]/general/components/climb/ClimbListForm'
 import { getArea } from '@/js/graphql/getArea'
 import { climbLeftRightIndexComparator } from '@/js/utils'
 import { NeighboringRoutesNav } from '@/components/crag/NeighboringRoute'
diff --git a/tsconfig.json b/tsconfig.json
index 5a841fe0e..ea4a84a11 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -38,6 +38,9 @@
       ],
       "@/assets/*": [
         "assets/*"
+      ],
+      "@/public/*": [
+        "../public/*"
       ]
     },
     "plugins": [
diff --git a/yarn.lock b/yarn.lock
index fb35ad3b8..fce313d10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2923,6 +2923,11 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
+"@vercel/edge@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@vercel/edge/-/edge-1.1.1.tgz#9b2fc0081dfe95db8b4c3598275721b1ad85e43f"
+  integrity sha512-NtKiIbn9Cq6HWGy+qRudz28mz5nxfOJWls5Pnckjw1yCfSX8rhXdvY/il3Sy3Zd5n/sKCM2h7VSCCpJF/oaDrQ==
+
 "@wry/context@^0.7.0", "@wry/context@^0.7.3":
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.3.tgz#240f6dfd4db5ef54f81f6597f6714e58d4f476a1"