diff --git a/.env b/.env
index ee49f15c99..4a3149d38b 100644
--- a/.env
+++ b/.env
@@ -20,6 +20,9 @@ VITE_COMMUNITY_PROGRAM_URL=https://community.preciousplastic.com/academy/guides/
 VITE_PROFILE_GUIDELINES_URL=https://community.preciousplastic.com/academy/guides/platform
 VITE_QUESTIONS_GUIDELINES_URL=https://community.preciousplastic.com/academy/guides/guidelines-questions
 
+# Optional variable for limiting the display of member map pins by default on load
+VITE_HIDE_MEMBER_PINS_BY_DEFAULT=false
+
 # For testing, VITE_PLATFORM_PROFILES in localStorage is prioritised over this value
 # All valid options for VITE_PLATFORM_PROFILES: "member,workspace,community-builder,space,collection-point,machine-builder"
 VITE_PLATFORM_PROFILES="member,workspace,community-builder,collection-point,machine-builder"
diff --git a/packages/components/src/CardList/CardList.stories.tsx b/packages/components/src/CardList/CardList.stories.tsx
index cbd6ce502d..0e3447cd76 100644
--- a/packages/components/src/CardList/CardList.stories.tsx
+++ b/packages/components/src/CardList/CardList.stories.tsx
@@ -8,7 +8,7 @@ export default {
   component: CardList,
 } as Meta<typeof CardList>
 
-const allItems = [
+const list = [
   {
     _deleted: false,
     _id: 'first-one',
@@ -43,44 +43,24 @@ const allItems = [
   },
 ]
 
-const onBlur = () => undefined
 const onPinClick = () => undefined
 
 export const Default: StoryFn<typeof CardList> = () => {
   return (
     <CardList
-      list={allItems}
-      onBlur={onBlur}
+      list={list}
       onPinClick={onPinClick}
-      filteredList={null}
       selectedPin={undefined}
       viewport="stories"
     />
   )
 }
 
-export const FiltedDisplay: StoryFn<typeof CardList> = () => {
-  const filteredList = [allItems[0], allItems[2]]
-
-  return (
-    <CardList
-      list={allItems}
-      onBlur={onBlur}
-      onPinClick={onPinClick}
-      filteredList={filteredList}
-      selectedPin={undefined}
-      viewport="stories"
-    />
-  )
-}
-
-export const WhenFiltedDisplayIsZero: StoryFn<typeof CardList> = () => {
+export const WhenDisplayIsZero: StoryFn<typeof CardList> = () => {
   return (
     <CardList
-      list={allItems}
-      onBlur={onBlur}
+      list={[]}
       onPinClick={onPinClick}
-      filteredList={[]}
       selectedPin={undefined}
       viewport="stories"
     />
diff --git a/packages/components/src/CardList/CardList.test.tsx b/packages/components/src/CardList/CardList.test.tsx
index 1bd6b0e46f..03f1974c64 100644
--- a/packages/components/src/CardList/CardList.test.tsx
+++ b/packages/components/src/CardList/CardList.test.tsx
@@ -4,11 +4,7 @@ import { describe, expect, it } from 'vitest'
 
 import { render } from '../test/utils'
 import { EMPTY_LIST, type IProps } from './CardList'
-import {
-  Default,
-  FiltedDisplay,
-  WhenFiltedDisplayIsZero,
-} from './CardList.stories'
+import { Default, WhenDisplayIsZero } from './CardList.stories'
 
 describe('CardList', () => {
   it('Shows all items when no filtering is done', () => {
@@ -17,17 +13,9 @@ describe('CardList', () => {
     expect(getAllByTestId('CardListItem').length).toBe(4)
   })
 
-  it('Shows only filted items when provided', () => {
-    const { getAllByTestId } = render(
-      <FiltedDisplay {...(FiltedDisplay.args as IProps)} />,
-    )
-
-    expect(getAllByTestId('CardListItem').length).toBe(2)
-  })
-
-  it('Shows the no items label when filted items is empty', () => {
+  it('Shows the no item label when filted items is empty', () => {
     const { getByText } = render(
-      <WhenFiltedDisplayIsZero {...(WhenFiltedDisplayIsZero.args as IProps)} />,
+      <WhenDisplayIsZero {...(WhenDisplayIsZero.args as IProps)} />,
     )
 
     expect(getByText(EMPTY_LIST)).toBeInTheDocument()
diff --git a/packages/components/src/CardList/CardList.tsx b/packages/components/src/CardList/CardList.tsx
index 77f2780653..b3d42f1d97 100644
--- a/packages/components/src/CardList/CardList.tsx
+++ b/packages/components/src/CardList/CardList.tsx
@@ -1,60 +1,68 @@
+import { useEffect, useState } from 'react'
 import Masonry, { ResponsiveMasonry } from 'react-responsive-masonry'
 import { Flex, Text } from 'theme-ui'
 
+import { Button } from '../Button/Button'
 import { CardListItem } from '../CardListItem/CardListItem'
 import { Icon } from '../Icon/Icon'
-import { Loader } from '../Loader/Loader'
 
 import type { IMapPin } from 'oa-shared'
 
 export interface IProps {
   columnsCountBreakPoints?: { [key: number]: number }
-  filteredList: IMapPin[] | null
   list: IMapPin[]
-  onBlur: () => void
   onPinClick: (arg: IMapPin) => void
   selectedPin: IMapPin | undefined
   viewport: string
 }
 
+const DEFAULT_BREAKPOINTS = { 600: 1, 1100: 2, 1600: 3 }
 export const EMPTY_LIST = 'Oh nos! Nothing to show!'
+const ITEMS_PER_RENDER = 20
 
 export const CardList = (props: IProps) => {
-  const {
-    columnsCountBreakPoints,
-    filteredList,
-    list,
-    onBlur,
-    onPinClick,
-    selectedPin,
-    viewport,
-  } = props
+  const [renderCount, setRenderCount] = useState<number>(ITEMS_PER_RENDER)
+  const [displayItems, setDisplayItems] = useState<JSX.Element[]>([])
+  const { list, onPinClick, selectedPin, viewport } = props
 
-  const listToShow = filteredList === null ? list : filteredList
-  const displayItems = listToShow
-    .sort(
-      (a, b) =>
-        Date.parse(b.creator?._lastActive || '0') -
-        Date.parse(a.creator?._lastActive || '0'),
-    )
-    .map((item) => {
-      const isSelectedPin = item._id === selectedPin?._id
-      return (
-        <CardListItem
-          item={item}
-          key={item._id}
-          isSelectedPin={isSelectedPin}
-          onPinClick={isSelectedPin ? onBlur : onPinClick}
-          viewport={viewport}
-        />
+  useEffect(() => {
+    setRenderCount(ITEMS_PER_RENDER)
+  }, [list])
+
+  useEffect(() => {
+    const toRender = list
+      .sort(
+        (a, b) =>
+          Date.parse(b.creator?._lastActive || '0') -
+          Date.parse(a.creator?._lastActive || '0'),
       )
-    })
+      .slice(0, renderCount)
+      .map((item) => {
+        const isSelectedPin = item._id === selectedPin?._id
+
+        return (
+          <CardListItem
+            item={item}
+            key={item._id}
+            isSelectedPin={isSelectedPin}
+            onPinClick={onPinClick}
+            viewport={viewport}
+          />
+        )
+      })
+
+    setDisplayItems(toRender)
+  }, [renderCount, list])
+
+  const addRenderItems = () =>
+    setRenderCount((count) => count + ITEMS_PER_RENDER)
+
+  const hasMore = !(displayItems.length === list.length)
 
-  const isListEmpty = displayItems.length === 0
-  const hasListLoaded = list
-  const results = `${displayItems.length} result${
-    displayItems.length == 1 ? '' : 's'
-  } in view`
+  const isListEmpty = list.length === 0
+  const results = `${list.length} result${list.length == 1 ? '' : 's'} in view`
+  const columnsCountBreakPoints =
+    props.columnsCountBreakPoints || DEFAULT_BREAKPOINTS
 
   return (
     <Flex
@@ -65,34 +73,30 @@ export const CardList = (props: IProps) => {
         padding: 2,
       }}
     >
-      {!hasListLoaded && <Loader />}
-      {hasListLoaded && (
+      <Flex
+        sx={{
+          justifyContent: 'space-between',
+          paddingX: 2,
+          paddingTop: 2,
+          fontSize: 2,
+        }}
+      >
+        <Text data-cy="list-results">{results}</Text>
+        <Flex sx={{ alignItems: 'center', gap: 1 }}>
+          <Text> Most recently active</Text>
+          <Icon glyph="arrow-full-down" />
+        </Flex>
+      </Flex>
+      {isListEmpty && EMPTY_LIST}
+      {!isListEmpty && (
         <>
-          <Flex
-            sx={{
-              justifyContent: 'space-between',
-              paddingX: 2,
-              paddingTop: 2,
-              fontSize: 2,
-            }}
-          >
-            <Text data-cy="list-results">{results}</Text>
-            <Flex sx={{ alignItems: 'center', gap: 1 }}>
-              <Text> Most recently active</Text>
-              <Icon glyph="arrow-full-down" />
+          <ResponsiveMasonry columnsCountBreakPoints={columnsCountBreakPoints}>
+            <Masonry>{displayItems}</Masonry>
+          </ResponsiveMasonry>
+          {hasMore && (
+            <Flex sx={{ justifyContent: 'center' }}>
+              <Button onClick={addRenderItems}>Show more </Button>
             </Flex>
-          </Flex>
-          {isListEmpty && EMPTY_LIST}
-          {!isListEmpty && (
-            <ResponsiveMasonry
-              columnsCountBreakPoints={
-                columnsCountBreakPoints
-                  ? columnsCountBreakPoints
-                  : { 600: 1, 1100: 2, 1600: 3 }
-              }
-            >
-              <Masonry>{displayItems}</Masonry>
-            </ResponsiveMasonry>
           )}
         </>
       )}
diff --git a/packages/components/src/CardProfile/CardDetailsMemberProfile.tsx b/packages/components/src/CardProfile/CardDetailsMemberProfile.tsx
index ae0f7897a5..2e6548c228 100644
--- a/packages/components/src/CardProfile/CardDetailsMemberProfile.tsx
+++ b/packages/components/src/CardProfile/CardDetailsMemberProfile.tsx
@@ -1,5 +1,6 @@
 import { Avatar, Box, Flex } from 'theme-ui'
 
+import defaultProfileImage from '../../assets/images/default_member.svg'
 import { MemberBadge } from '../MemberBadge/MemberBadge'
 import { ProfileTagsList } from '../ProfileTagsList/ProfileTagsList'
 import { Username } from '../Username/Username'
@@ -24,29 +25,26 @@ export const CardDetailsMemberProfile = ({ creator, isLink }: IProps) => {
         alignContent: 'stretch',
       }}
     >
-      {userImage && (
-        <Box sx={{ aspectRatio: 1, width: '60px', height: '60px' }}>
-          <Flex
-            sx={{
-              alignContent: 'flex-start',
-              justifyContent: 'flex-end',
-              flexWrap: 'wrap',
-            }}
-          >
-            <Avatar
-              src={userImage}
-              sx={{ width: '60px', height: '60px', objectFit: 'cover' }}
-              loading="lazy"
-            />
-            <MemberBadge
-              profileType={profileType}
-              size={22}
-              sx={{ transform: 'translateY(-22px)' }}
-            />
-          </Flex>
-        </Box>
-      )}
-      {!userImage && <MemberBadge profileType={profileType} size={50} />}
+      <Box sx={{ aspectRatio: 1, width: '60px', height: '60px' }}>
+        <Flex
+          sx={{
+            alignContent: 'flex-start',
+            justifyContent: 'flex-end',
+            flexWrap: 'wrap',
+          }}
+        >
+          <Avatar
+            src={userImage || defaultProfileImage}
+            sx={{ width: '60px', height: '60px', objectFit: 'cover' }}
+            loading="lazy"
+          />
+          <MemberBadge
+            profileType={profileType}
+            size={22}
+            sx={{ transform: 'translateY(-22px)' }}
+          />
+        </Flex>
+      </Box>
 
       <Flex sx={{ flexDirection: 'column', gap: 1, flex: 1 }}>
         <Username
diff --git a/packages/components/src/CardProfile/CardProfile.tsx b/packages/components/src/CardProfile/CardProfile.tsx
index cbf6a8a7dd..f3fa621b9f 100644
--- a/packages/components/src/CardProfile/CardProfile.tsx
+++ b/packages/components/src/CardProfile/CardProfile.tsx
@@ -14,17 +14,20 @@ export interface IProps {
 export const CardProfile = ({ item, isLink = false }: IProps) => {
   const { creator } = item
 
-  const isMember = creator?.profileType === 'member'
+  const isWorkspace = creator?.profileType && creator?.profileType !== 'member'
+  const isMember = !isWorkspace && creator
 
   return (
     <Flex sx={{ alignItems: 'stretch', alignContent: 'stretch' }}>
+      {isWorkspace && (
+        <CardDetailsSpaceProfile creator={creator} isLink={isLink} />
+      )}
       {isMember && (
         <CardDetailsMemberProfile creator={creator} isLink={isLink} />
       )}
-      {!isMember && creator && (
-        <CardDetailsSpaceProfile creator={creator} isLink={isLink} />
+      {!isWorkspace && !isMember && (
+        <CardDetailsFallback item={item} isLink={isLink} />
       )}
-      {!creator && <CardDetailsFallback item={item} isLink={isLink} />}
     </Flex>
   )
 }
diff --git a/packages/components/src/Loader/Loader.tsx b/packages/components/src/Loader/Loader.tsx
index 92f5fcaf05..57668e7529 100644
--- a/packages/components/src/Loader/Loader.tsx
+++ b/packages/components/src/Loader/Loader.tsx
@@ -43,7 +43,7 @@ export const Loader = ({ label, sx }: Props) => {
           />
         )}
         <Text sx={{ width: '100%', textAlign: 'center' }}>
-          {label || 'loading...'}
+          {label || 'Loading...'}
         </Text>
       </Flex>
     </>
diff --git a/packages/components/src/MapFilterList/MapFilterList.tsx b/packages/components/src/MapFilterList/MapFilterList.tsx
index 8a318d850d..b490169fc0 100644
--- a/packages/components/src/MapFilterList/MapFilterList.tsx
+++ b/packages/components/src/MapFilterList/MapFilterList.tsx
@@ -32,14 +32,15 @@ export const MapFilterList = (props: IProps) => {
     ({ filterType }) => filterType === 'profileType',
   )
 
-  const tagFilters = availableFilters.filter(
-    ({ filterType }) => filterType === 'profileTag',
-  )
+  const tagFilters = availableFilters
+    .slice(0)
+    .filter(({ filterType }) => filterType === 'profileTag')
+    .sort((a, b) => (a.label > b.label ? 1 : 0))
 
   const isActive = (checkingFilter: string) =>
     !!activeFilters.find((filter) => filter.label === checkingFilter)
 
-  const buttonLabel = `Show ${pinCount} result${pinCount === 1 ? '' : 's'}`
+  const buttonLabel = `${pinCount} result${pinCount === 1 ? '' : 's'} in current view`
 
   return (
     <Flex
@@ -60,9 +61,15 @@ export const MapFilterList = (props: IProps) => {
           padding: 2,
         }}
       >
-        <Heading as="h3" variant="small">
-          So what are you looking for?
-        </Heading>
+        <Flex sx={{ flexDirection: 'column' }}>
+          <Heading as="h3" variant="small">
+            Filter what you see
+          </Heading>
+
+          <Text variant="quiet">
+            Zoom out on the map to search the whole world
+          </Text>
+        </Flex>
 
         <ButtonIcon
           data-cy="MapFilterList-CloseButton"
@@ -111,7 +118,7 @@ export const MapFilterList = (props: IProps) => {
 
         {tagFilters.length > 0 && (
           <Flex sx={{ gap: 1, flexDirection: 'column' }}>
-            <Text>Activities</Text>
+            <Text>Spaces activities</Text>
             <MapFilterListWrapper>
               {tagFilters.map((typeFilter, index) => {
                 const onClick = () => onFilterChange(typeFilter)
diff --git a/packages/components/src/MapMemberCard/MapMemberCard.stories.tsx b/packages/components/src/MapMemberCard/MapMemberCard.stories.tsx
deleted file mode 100644
index da0140b779..0000000000
--- a/packages/components/src/MapMemberCard/MapMemberCard.stories.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { faker } from '@faker-js/faker'
-
-import { MapMemberCard } from './MapMemberCard'
-
-import type { Meta } from '@storybook/react'
-
-export default {
-  title: 'Map/MapMemberCard',
-  component: MapMemberCard,
-} as Meta<typeof MapMemberCard>
-
-export const Default = {
-  args: {
-    imageUrl: 'https://placekitten.com/450/450',
-    description: `${faker.lorem.sentence()}`,
-    user: {
-      countryCode: faker.address.countryCode('alpha-2'),
-      userName: faker.internet.userName(),
-      isSupporter: faker.datatype.boolean(),
-      isVerified: faker.datatype.boolean(),
-    },
-    heading: `${faker.lorem.word()}`,
-    isEditable: false,
-    comments: null,
-  },
-}
-
-export const LoadingState = {
-  args: {
-    loading: true,
-    imageUrl: 'https://placekitten.com/450/450',
-    description: `${faker.lorem.sentence()}`,
-    user: {
-      countryCode: faker.address.countryCode('alpha-2'),
-      userName: faker.internet.userName(),
-      isSupporter: faker.datatype.boolean(),
-      isVerified: faker.datatype.boolean(),
-    },
-    heading: `${faker.lorem.word()}`,
-    isEditable: false,
-  },
-}
-
-export const ModerationComments = {
-  args: {
-    imageUrl: 'https://placekitten.com/450/450',
-    description: `${faker.lorem.sentence()}`,
-    comments: `${faker.lorem.sentence()}`,
-    user: {
-      countryCode: faker.address.countryCode('alpha-2'),
-      userName: faker.internet.userName(),
-      isSupporter: faker.datatype.boolean(),
-      isVerified: faker.datatype.boolean(),
-    },
-    heading: `${faker.lorem.word()}`,
-    isEditable: false,
-  },
-}
diff --git a/packages/components/src/MapMemberCard/MapMemberCard.test.tsx b/packages/components/src/MapMemberCard/MapMemberCard.test.tsx
deleted file mode 100644
index 5130870eab..0000000000
--- a/packages/components/src/MapMemberCard/MapMemberCard.test.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import '@testing-library/jest-dom/vitest'
-
-import { describe, expect, it } from 'vitest'
-
-import { render } from '../test/utils'
-import { MapMemberCard } from './MapMemberCard'
-import { Default, ModerationComments } from './MapMemberCard.stories'
-
-describe('MapMemberCard', () => {
-  it('includes description if it exists', () => {
-    const { getByText, getByTestId } = render(
-      <MapMemberCard {...Default.args} />,
-    )
-
-    expect(getByText(Default.args.description)).toBeInTheDocument()
-    expect(() => getByTestId('MapMemberCard: moderation comments')).toThrow()
-  })
-
-  it('shows moderation comments if they exist', () => {
-    const { getByText, getByTestId } = render(
-      <MapMemberCard {...ModerationComments.args} />,
-    )
-    expect(
-      getByTestId('MapMemberCard: moderation comments'),
-    ).toBeInTheDocument()
-    expect(getByText(ModerationComments.args.comments)).toBeInTheDocument()
-  })
-})
diff --git a/packages/components/src/MapMemberCard/MapMemberCard.tsx b/packages/components/src/MapMemberCard/MapMemberCard.tsx
deleted file mode 100644
index 3e22090319..0000000000
--- a/packages/components/src/MapMemberCard/MapMemberCard.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { keyframes } from '@emotion/react'
-import { Alert, AspectRatio, Box, Card, Image, Text } from 'theme-ui'
-
-import { Username } from '../Username/Username'
-
-import type { User } from '../types/common'
-
-export interface Props {
-  loading?: boolean
-  imageUrl: string
-  description: string
-  comments: string | null
-  user: User
-  heading: string
-}
-
-const wave = keyframes`
-  from {
-    background: lightgrey;
-  }
-  to {
-    background: grey;
-  }
-`
-
-export const MapMemberCard = (props: Props) => {
-  const { imageUrl, description, user, heading, comments } = props
-
-  return (
-    <Card sx={{ maxWidth: '230px' }} data-cy="MapMemberCard">
-      <Box>
-        {!!props.loading && (
-          <>
-            <AspectRatio
-              ratio={230 / 120}
-              sx={{
-                background: 'lightgrey',
-                animation: `${wave} 800ms ease infinite`,
-              }}
-            />
-            <Box sx={{ p: 2, height: '109px' }} />
-          </>
-        )}
-        {!props.loading && (
-          <>
-            <AspectRatio
-              ratio={230 / 120}
-              sx={{
-                background: 'lightgrey',
-              }}
-            >
-              <Image
-                src={imageUrl}
-                sx={{ objectFit: 'cover', width: '100%', height: '100%' }}
-              />
-            </AspectRatio>
-            <Box sx={{ p: 2 }}>
-              <Text mb={2} sx={{ fontSize: '12px', color: 'blue' }}>
-                {heading}
-              </Text>
-              <div>
-                <Username user={user} />
-              </div>
-              <Text
-                mb={2}
-                sx={{
-                  wordBreak: 'break-word',
-                  fontSize: 1,
-                  display: 'block',
-                  color: 'black',
-                }}
-              >
-                {description}
-              </Text>
-
-              {comments ? (
-                <Alert
-                  variant="info"
-                  sx={{ fontSize: 1, textAlign: 'left' }}
-                  data-testid="MapMemberCard: moderation comments"
-                >
-                  <Box>
-                    This map pin has been marked as requiring further changes.
-                    <Box>{comments}</Box>
-                  </Box>
-                </Alert>
-              ) : null}
-            </Box>
-          </>
-        )}
-      </Box>
-    </Card>
-  )
-}
diff --git a/packages/components/src/PinProfile/PinProfile.tsx b/packages/components/src/PinProfile/PinProfile.tsx
index 7defc71ba7..3d74490a79 100644
--- a/packages/components/src/PinProfile/PinProfile.tsx
+++ b/packages/components/src/PinProfile/PinProfile.tsx
@@ -17,7 +17,7 @@ export const PinProfile = (props: IProps) => {
   const { item, onClose } = props
   const { creator } = item
 
-  const isMember = creator?.profileType === 'member'
+  const isWorkspace = creator?.profileType && creator?.profileType !== 'member'
 
   return (
     <CardButton sx={{ '&:hover': 'none' }} data-cy="PinProfile">
@@ -34,11 +34,12 @@ export const PinProfile = (props: IProps) => {
       <Box sx={{ width: '100%', height: '100%', zIndex: 2 }}>
         <CardProfile item={item} isLink />
 
-        {!isMember && creator?.isContactableByPublic !== false && (
+        {isWorkspace && creator?.isContactableByPublic !== false && (
           <Flex sx={{ justifyContent: 'flex-end' }}>
             <InternalLink
-              to={`/u/${creator?._id}`}
+              to={`/u/${creator?._id}#contact`}
               data-cy="PinProfileMessageLink"
+              target="_blank"
             >
               <Button icon="contact" sx={{ margin: 1 }} small>
                 Send Message
diff --git a/packages/components/src/ProfileTagsList/ProfileTagsList.tsx b/packages/components/src/ProfileTagsList/ProfileTagsList.tsx
index f8c8601e5e..23f78e935e 100644
--- a/packages/components/src/ProfileTagsList/ProfileTagsList.tsx
+++ b/packages/components/src/ProfileTagsList/ProfileTagsList.tsx
@@ -14,21 +14,20 @@ const DEFAULT_COLOR = '#999999'
 
 export const ProfileTagsList = ({ sx, tags }: IProps) => {
   return (
-    <Flex data-cy="ProfileTagsList" sx={{ gap: 2, flexWrap: 'wrap', ...sx }}>
+    <Flex data-cy="ProfileTagsList" sx={{ gap: 1, flexWrap: 'wrap', ...sx }}>
       {tags.map(
-        (tag, index) =>
-          tag?.label && (
+        ({ color, label }, index) =>
+          label && (
             <Category
               key={index}
-              category={{ label: tag.label }}
+              category={{ label }}
               sx={{
                 borderRadius: 99,
                 border: '1px solid',
-                borderColor: tag.color ? tag.color : DEFAULT_COLOR,
-                backgroundColor: tag.color
-                  ? `${tag.color}20`
-                  : `${DEFAULT_COLOR}20`,
-                color: tag.color ? tag.color : DEFAULT_COLOR,
+                borderColor: color || DEFAULT_COLOR,
+                backgroundColor: color ? `${color}20` : `${DEFAULT_COLOR}20`,
+                color: color || DEFAULT_COLOR,
+                fontSize: '11px',
               }}
             />
           ),
diff --git a/packages/components/src/Username/Username.tsx b/packages/components/src/Username/Username.tsx
index a6d3979103..0df1e5a848 100644
--- a/packages/components/src/Username/Username.tsx
+++ b/packages/components/src/Username/Username.tsx
@@ -61,7 +61,7 @@ export const Username = ({ user, sx, target, isLink = true }: IProps) => {
 
       <Text sx={{ color: 'black' }}>{userName}</Text>
       {isVerified && <UserBadge badgeName="verified" />}
-      {isSupporter && !isVerified && <UserBadge badgeName="supporter" />}
+      {isSupporter && <UserBadge badgeName="supporter" />}
     </Flex>
   )
 
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 785be35c17..b2d2436c06 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -45,7 +45,6 @@ export { Loader } from './Loader/Loader'
 export { Map } from './Map/Map.client'
 export { MapFilterList } from './MapFilterList/MapFilterList'
 export { MapFilterProfileTypeCardList } from './MapFilterProfileTypeCardList/MapFilterProfileTypeCardList'
-export { MapMemberCard } from './MapMemberCard/MapMemberCard'
 export { MapWithPin } from './MapWithPin/MapWithPin.client'
 export { MemberBadge } from './MemberBadge/MemberBadge'
 export { Modal } from './Modal/Modal'
diff --git a/packages/cypress/src/integration/map.spec.ts b/packages/cypress/src/integration/map.spec.ts
index c88f6b0f2c..5d721f876f 100644
--- a/packages/cypress/src/integration/map.spec.ts
+++ b/packages/cypress/src/integration/map.spec.ts
@@ -4,35 +4,22 @@ const urlLondon =
   'https://nominatim.openstreetmap.org/search?format=json&q=london&accept-language=en'
 
 describe('[Map]', () => {
-  beforeEach(() => {
-    localStorage.setItem('VITE_THEME', 'fixing-fashion')
-  })
-
   it('[Shows expected pins]', () => {
+    localStorage.setItem('VITE_THEME', 'fixing-fashion')
     cy.viewport('macbook-16')
 
     cy.step('Shows all pins onload')
     cy.visit('/map')
 
-    cy.step('Old map pins can be clicked on')
-    cy.get(`[data-cy=pin-${userId}]`).click()
-    cy.get('[data-cy=MapMemberCard]').within(() => {
-      cy.get('[data-cy=Username]').contains(userId)
-    })
-    cy.url().should('include', `#${userId}`)
-
-    cy.step('Old map pins can be hidden')
-    cy.get('.markercluster-map').click(0, 0)
-    cy.get('[data-cy=MapMemberCard]').should('not.exist')
-    cy.url().should('not.include', `#${userId}`)
-
-    cy.step('Link to new map visible and clickable')
-    cy.wait(500) // wait for interaction
-    cy.get('[data-cy=Banner]').contains('Test it out!').click()
-    cy.get('[data-cy=Banner]').contains('go back to the old one!')
+    cy.step('No filters selected by default')
+    cy.visit('/map')
+    cy.get('[data-cy=MapFilterProfileTypeCardList]')
+      .first()
+      .within(() => {
+        cy.get('[data-cy="MapListFilter-active"]').should('have.length', 0)
+      })
 
-    cy.step('New map shows the cards')
-    cy.get('[data-cy="welome-header"]').should('be.visible')
+    cy.step('Shows the cards')
     cy.get('[data-cy="CardList-desktop"]').should('be.visible')
     cy.get('[data-cy="list-results"]').contains(/\d+ results in view/)
 
@@ -64,23 +51,25 @@ describe('[Map]', () => {
     cy.get('[data-cy=MapFilterList-ShowResultsButton]').first().click()
 
     cy.step('As the user moves in the list updates')
-    for (let i = 0; i < 6; i++) {
+    cy.visit(`/map#${userId}`)
+    cy.wait(500) // Wait for animation to complete
+    for (let i = 0; i < 9; i++) {
       cy.get('.leaflet-control-zoom-in').click()
     }
+    cy.wait(500) // Wait for animation to complete
     cy.get('[data-cy="list-results"]').contains('1 result')
     cy.get('[data-cy="CardList-desktop"]').within(() => {
-      cy.get('[data-cy=CardListItem]').within(() => {
+      cy.get('[data-cy=CardListItem-selected]').within(() => {
         cy.contains(userId)
-        cy.get('[data-cy="MemberBadge-member"]')
+        cy.get('[data-cy="MemberBadge-workshop"]')
       })
     })
-    cy.get('[data-cy=CardListItem]').contains(userId).click()
     cy.get('[data-cy="PinProfile"]')
       .get('[data-cy="Username"]')
       .contains(userId)
     cy.get('[data-cy=CardListItem-selected]').first().click()
 
-    cy.step('New map pins can be clicked on')
+    cy.step('Map pins can be clicked on')
     cy.get(`[data-cy=pin-${userId}]`).click()
     cy.get('[data-cy=PinProfile]').within(() => {
       cy.get('[data-cy=Username]').contains(userId)
@@ -88,7 +77,7 @@ describe('[Map]', () => {
     })
     cy.url().should('include', `#${userId}`)
 
-    cy.step('New map pins can be hidden with the cross button')
+    cy.step('Map pins can be hidden with the cross button')
     cy.get('[data-cy=PinProfile]').should('be.visible')
     cy.get('[data-cy=PinProfileCloseButton]').click()
     cy.url().should('not.include', `#${userId}`)
@@ -113,17 +102,12 @@ describe('[Map]', () => {
     cy.get('[data-cy="ShowMobileListButton"]').click()
     cy.get('[data-cy="CardList-mobile"]').within(() => {
       cy.get('[data-cy=CardListItem]')
-        .last()
+        .first()
         .within(() => {
           cy.contains(userId)
-          cy.get('[data-cy="MemberBadge-member"]')
+          cy.get('[data-cy="MemberBadge-workshop"]')
         })
     })
-    cy.get('[data-cy=MapFilterProfileTypeCardList-ButtonRight]')
-      .last()
-      .click()
-      .click()
-    cy.get('[data-cy=MapListFilter]').last().click()
 
     cy.step('Mobile list view can be hidden')
     cy.get('[data-cy="ShowMapButton"]').click()
@@ -135,53 +119,27 @@ describe('[Map]', () => {
     cy.intercept(urlLondon).as('londonSearch')
     cy.wait('@londonSearch')
     cy.contains('London, Greater London, England, United Kingdom').click()
-  })
 
-  it('Test zoom out/ globe button + zoom in to users location button', () => {
-    cy.viewport('macbook-16')
-    cy.visit('/map')
-    cy.get('[data-cy=Banner]').contains('Test it out!').click()
-    cy.wait(500)
-
-    cy.get('[data-cy="WorldViewButton"]', { timeout: 10000 })
-      .should('exist')
-      .and('be.visible')
-    cy.get('[data-cy="WorldViewButton"]').should('exist').and('be.visible')
-
-    const mapZoomProxySelector = '.leaflet-tile-container.leaflet-zoom-animated'
-
-    cy.get('[data-cy="WorldViewButton"]').click()
-    cy.wait(500)
-
-    // Check if the transform matrix has scale factor 1 (for matrix(a, b, c, d, e, f), 'a' and 'd' should be 1)
-    cy.get(mapZoomProxySelector)
-      .invoke('css', 'transform')
-      .then((transform) => {
-        const matrixValues = transform.match(/matrix\(([^)]+)\)/)[1].split(', ')
-        const scaleX = parseFloat(matrixValues[0]) // 'a' value from matrix
-        const scaleY = parseFloat(matrixValues[3]) // 'd' value from matrix
-        expect(scaleX).to.eq(1)
-        expect(scaleY).to.eq(1)
-      })
+    cy.step('WorldViewButton enabled when zoomed in')
+    cy.get('[data-cy=WorldViewButton').click()
+    cy.wait(1000)
+    cy.get('[data-cy=WorldViewButton-disabled')
 
+    cy.step('LocationViewButton visable and clickable')
     cy.get('[data-cy="LocationViewButton"]').click()
-    cy.wait(500)
-
-    // Check if the transform matrix has scale factor 1 (for matrix(a, b, c, d, e, f), 'a' and 'd' should be 1)
-    cy.get(mapZoomProxySelector)
-      .invoke('css', 'transform')
-      .then((transform) => {
-        const matrixValues = transform.match(/matrix\(([^)]+)\)/)[1].split(', ')
-        const scaleX = parseFloat(matrixValues[0]) // 'a' value from matrix
-        const scaleY = parseFloat(matrixValues[3]) // 'd' value from matrix
-        expect(scaleX).to.eq(8)
-        expect(scaleY).to.eq(8)
-      })
+  })
+
+  it("Doesn't show member pins when config is set", () => {
+    localStorage.setItem('VITE_THEME', 'precious-plastic') // Not essential
+    localStorage.setItem('VITE_HIDE_MEMBER_PINS_BY_DEFAULT', 'true')
 
-    cy.step('Zoom in button prompts for user location and zooms')
-    cy.get('[data-cy="LocationViewButton"]', { timeout: 10000 })
-      .should('exist')
-      .and('be.visible')
-    cy.get('[data-cy="LocationViewButton"]').should('exist').and('be.visible')
+    cy.step('Every profile type other than member is set')
+    cy.visit('/map')
+    cy.get('[data-cy=MapFilterProfileTypeCardList]')
+      .first()
+      .within(() => {
+        cy.get('[data-cy="MapListFilter-active"]').should('have.length', 4)
+        cy.get('[data-cy="MapListFilter"]').should('have.length', 1)
+      })
   })
 })
diff --git a/packages/cypress/src/integration/settings.spec.ts b/packages/cypress/src/integration/settings.spec.ts
index 2544407cdc..3daf916ed3 100644
--- a/packages/cypress/src/integration/settings.spec.ts
+++ b/packages/cypress/src/integration/settings.spec.ts
@@ -159,8 +159,7 @@ describe('[Settings]', () => {
       cy.step('Can view pin on new map')
       cy.visit(`/map#${user.username}`)
       cy.wait(2000)
-      cy.get('[data-cy=Banner]').contains('Test it out!').click()
-      cy.get('[data-cy=CardListItem]').contains(user.username)
+      cy.get('[data-cy=CardListItem-selected]').contains(user.username)
 
       cy.step('Can delete map pin')
       cy.visit('/settings')
diff --git a/src/config/config.ts b/src/config/config.ts
index 572a226cf3..f6fcd5aea8 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -172,6 +172,10 @@ export const VITE_PLATFORM_PROFILES = getFromLocalStorage(
   'VITE_PLATFORM_PROFILES',
 )
 
+export const VITE_HIDE_MEMBER_PINS_BY_DEFAULT = getFromLocalStorage(
+  'VITE_HIDE_MEMBER_PINS_BY_DEFAULT',
+)
+
 export const isPreciousPlastic = (): boolean => {
   return getFromLocalStorage('VITE_THEME') === 'precious-plastic'
 }
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 8910dc67ba..66dc7dc1f1 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -28,6 +28,7 @@ export const _supportedConfigurationOptions = [
   'VITE_PATREON_CLIENT_ID',
   'VITE_API_URL',
   'VITE_SITE_NAME',
+  'VITE_HIDE_MEMBER_PINS_BY_DEFAULT',
 ] as const
 
 export type ConfigurationOption =
diff --git a/src/pages/Maps/Content/Controls/Controls.tsx b/src/pages/Maps/Content/Controls/Controls.tsx
deleted file mode 100644
index a6e32451fa..0000000000
--- a/src/pages/Maps/Content/Controls/Controls.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import React, { useState } from 'react'
-import { Link, useNavigate } from '@remix-run/react'
-import { Button, Modal, OsmGeocoding } from 'oa-components'
-import filterIcon from 'src/assets/icons/icon-filters-mobile.png'
-import { useCommonStores } from 'src/common/hooks/useCommonStores'
-import { logger } from 'src/logger'
-import { Box, Flex } from 'theme-ui'
-
-import { GroupingFilterDesktop } from './GroupingFilterDesktop'
-import { GroupingFilterMobile } from './GroupingFilterMobile'
-
-import type { FilterGroup } from './transformAvailableFiltersToGroups'
-
-interface IProps {
-  availableFilters: FilterGroup[]
-  onLocationChange: (latlng: { lat: number; lng: number }) => void
-  onFilterChange: (filters: string[]) => void
-}
-interface IState {
-  showFiltersMobile: boolean
-  filtersSelected: Array<string>
-}
-
-export const Controls = ({
-  availableFilters,
-  onLocationChange,
-  onFilterChange,
-}: IProps) => {
-  const navigate = useNavigate()
-  const { userStore } = useCommonStores().stores
-  const [state, setState] = useState<IState>({
-    showFiltersMobile: false,
-    filtersSelected: [],
-  })
-
-  const toggleFilterMobileModal = () => {
-    setState((state) => ({
-      ...state,
-      showFiltersMobile: !state.showFiltersMobile,
-    }))
-  }
-
-  const onChange = (selected) => {
-    onFilterChange && onFilterChange(selected)
-    setState((state) => ({ ...state, filtersSelected: selected }))
-  }
-
-  const myPinUrl = userStore!.user
-    ? {
-        pathname: `/settings`,
-        hash: '#your-map-pin',
-      }
-    : { pathname: '/sign-up' }
-
-  return (
-    <Flex
-      data-cy="map-controls"
-      sx={{
-        flexDirection: ['column', 'column', 'row', 'row'],
-        alignItems: 'center',
-        justifyContent: 'center',
-        width: '100%',
-        position: 'absolute',
-        top: '220px',
-        zIndex: 2000,
-        transform: 'translateX("-50%")',
-      }}
-      onClick={() => navigate('/map')}
-    >
-      <Box
-        sx={{
-          width: ['95%', '95%', '308px'],
-          height: '45px',
-        }}
-      >
-        <OsmGeocoding
-          callback={(data) => {
-            logger.debug(data, 'Map.Content.Controls.ReactOsmGeocoding')
-            if (data.lat && data.lon) {
-              onLocationChange({
-                lat: data.lat,
-                lng: data.lon,
-              })
-            }
-          }}
-          countrycodes=""
-          acceptLanguage="en"
-        />
-      </Box>
-      <Flex>
-        <GroupingFilterDesktop
-          availableFilters={availableFilters}
-          onChange={(selected) => onChange(selected)}
-        />
-        <Box
-          ml={['0', '50px']}
-          mt="5px"
-          sx={{ display: ['none', 'none', 'none', 'block'] }}
-        >
-          <Link
-            to={myPinUrl}
-            // the map underneath also redirects, so prevent it from doing so
-            onClick={(e) => e.stopPropagation()}
-          >
-            <Button type="button" variant="primary">
-              My pin
-            </Button>
-          </Link>
-        </Box>
-      </Flex>
-      <Box sx={{ display: ['flex', 'flex', 'none'], mt: '5px', width: '95%' }}>
-        <Button
-          type="button"
-          sx={{ display: 'block', width: '100%' }}
-          variant="secondary"
-          onClick={toggleFilterMobileModal}
-        >
-          Filters
-          {state.filtersSelected.length > 0 && (
-            <span> ({state.filtersSelected.length})</span>
-          )}
-          <img
-            src={filterIcon}
-            alt="icon"
-            style={{ width: '18px', marginLeft: '5px' }}
-          />
-        </Button>
-      </Box>
-      <Modal
-        onDidDismiss={toggleFilterMobileModal}
-        isOpen={state.showFiltersMobile}
-      >
-        <GroupingFilterMobile
-          availableFilters={availableFilters}
-          selectedItems={state.filtersSelected}
-          onChange={(selected) => onChange(selected)}
-          onClose={toggleFilterMobileModal}
-        />
-      </Modal>
-    </Flex>
-  )
-}
diff --git a/src/pages/Maps/Content/Controls/GroupingFilterDesktop.tsx b/src/pages/Maps/Content/Controls/GroupingFilterDesktop.tsx
deleted file mode 100644
index e91867c3dd..0000000000
--- a/src/pages/Maps/Content/Controls/GroupingFilterDesktop.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react'
-import { Select } from 'oa-components'
-import { Box } from 'theme-ui'
-
-import type { FilterGroup } from './transformAvailableFiltersToGroups'
-
-interface IProps {
-  availableFilters: FilterGroup[]
-  onChange: (selectedItems: string[]) => void
-}
-
-export const GroupingFilterDesktop = (props: IProps) => {
-  const onSelectChange = (selectedOptions) => {
-    const arr = selectedOptions.map((option) => option.value)
-    props.onChange(arr)
-  }
-
-  return (
-    <Box
-      sx={{
-        display: ['none', 'none', 'block'],
-        width: '308px',
-        height: '45px',
-        m: [0, '5px 0 0 20px'],
-      }}
-    >
-      <Select
-        variant="icons"
-        isMulti
-        isClearable
-        options={props.availableFilters}
-        onChange={onSelectChange}
-        placeholder="Select filters"
-      />
-    </Box>
-  )
-}
diff --git a/src/pages/Maps/Content/Controls/GroupingFilterMobile.tsx b/src/pages/Maps/Content/Controls/GroupingFilterMobile.tsx
deleted file mode 100644
index 4b1642912a..0000000000
--- a/src/pages/Maps/Content/Controls/GroupingFilterMobile.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Button } from 'oa-components'
-import crossClose from 'src/assets/icons/cross-close.svg'
-import checkmarkIcon from 'src/assets/icons/icon-checkmark.svg'
-import { Flex, Image, Text } from 'theme-ui'
-
-import type { FilterGroup } from './transformAvailableFiltersToGroups'
-
-interface IProps {
-  availableFilters: FilterGroup[]
-  selectedItems: Array<string>
-  onChange?: (selectedItems: string[]) => void
-  onClose: () => void
-}
-
-const GroupingFilterMobile = (props: IProps) => {
-  const { availableFilters, selectedItems } = props
-  const addOrRemoveFilter = (selected, item) => {
-    if (selected.includes(item)) {
-      return selected.filter((selectedItem) => selectedItem !== item)
-    } else {
-      return [...selected, item]
-    }
-  }
-
-  const handleChange = (item: string) => {
-    if (props.onChange) {
-      props.onChange(addOrRemoveFilter(props.selectedItems, item))
-    }
-  }
-
-  return (
-    <Flex sx={{ flexDirection: 'column' }}>
-      <Flex p={0} mx={-1} sx={{ justifyContent: 'space-between' }}>
-        <Text sx={{ fontWeight: 'bold' }}>Select filters</Text>
-        <Image
-          loading="lazy"
-          width="25px"
-          src={crossClose}
-          alt="cross-close"
-          onClick={() => props.onClose()}
-        />
-      </Flex>
-
-      {availableFilters.map((item, idx) => {
-        return (
-          <div key={idx}>
-            <Text
-              sx={{
-                fontSize: 2,
-                display: 'block',
-                paddingTop: 2,
-                paddingBottom: 2,
-              }}
-            >
-              {item.label}
-            </Text>
-
-            {item.options.map((filter) => (
-              <Flex
-                sx={{
-                  alignItems: 'center',
-                  justifyContent: 'space-between',
-                }}
-                mt="5px"
-                onClick={(evt) => {
-                  evt.preventDefault()
-                  evt.stopPropagation()
-                  handleChange(filter.value)
-                }}
-                key={filter.label}
-              >
-                <Flex sx={{ alignItems: 'center' }}>
-                  {filter.imageElement}
-                  <Text sx={{ fontSize: 2 }} ml="10px">
-                    {filter.label} ({filter.number})
-                  </Text>
-                </Flex>
-                {selectedItems.includes(filter.value) && (
-                  <Image loading="lazy" src={checkmarkIcon} width="20px" />
-                )}
-              </Flex>
-            ))}
-          </div>
-        )
-      })}
-
-      <Button type="button" mt={3} onClick={props.onClose}>
-        Apply filters
-      </Button>
-    </Flex>
-  )
-}
-
-export { GroupingFilterMobile }
diff --git a/src/pages/Maps/Content/Controls/transformAvailableFiltersToGroups.tsx b/src/pages/Maps/Content/Controls/transformAvailableFiltersToGroups.tsx
deleted file mode 100644
index fac5f73963..0000000000
--- a/src/pages/Maps/Content/Controls/transformAvailableFiltersToGroups.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { MemberBadge } from 'oa-components'
-import VerifiedBadgeIcon from 'src/assets/icons/icon-verified-badge.svg'
-import { filterMapPinsByType } from 'src/stores/Maps/filter'
-import { Image } from 'theme-ui'
-
-import { transformSpecialistWorkspaceTypeToWorkspace } from './transformSpecialistWorkspaceTypeToWorkspace'
-
-import type {
-  IMapGrouping,
-  IMapPin,
-  IPinGrouping,
-  ProfileTypeName,
-  WorkspaceType,
-} from 'oa-shared'
-
-const ICON_SIZE = 30
-
-const asOptions = (mapPins, items: Array<IMapGrouping>): FilterGroupOption[] =>
-  (items || [])
-    .filter((item) => {
-      return !item.hidden
-    })
-    .map((item) => {
-      const filterType =
-        (item.type as string) === 'verified'
-          ? ['verified']
-          : item.subType
-            ? item.subType.split(' ')
-            : item.type.split(' ')
-
-      const value = item.subType ? item.subType : item.type
-      const profileType = transformSpecialistWorkspaceTypeToWorkspace(value)
-
-      return {
-        label: item.displayName,
-        value,
-        number: filterMapPinsByType(mapPins, filterType, false).length,
-        imageElement:
-          (item.type as string) === 'verified' ? (
-            <Image src={VerifiedBadgeIcon} width={ICON_SIZE} />
-          ) : (
-            <MemberBadge size={ICON_SIZE} profileType={profileType} />
-          ),
-      }
-    })
-    .filter(({ number }) => !!number) //LADEBUG
-
-type FilterGroupOption = {
-  label: string
-  value: WorkspaceType | ProfileTypeName
-  number: number
-  imageElement: JSX.Element
-}
-
-export type FilterGroup = {
-  label: string
-  options: FilterGroupOption[]
-}
-
-type FilterItem = {
-  grouping: string
-  displayName: string
-  type: ProfileTypeName | 'verified'
-}
-
-export const transformAvailableFiltersToGroups = (
-  mapPinList: IMapPin[],
-  availableFilters: FilterItem[],
-): FilterGroup[] => {
-  const reducedItems = availableFilters.reduce(
-    (accumulator, current) => {
-      const { grouping } = current
-      if (accumulator[grouping] === undefined) {
-        accumulator[grouping] = []
-      }
-      accumulator[grouping].push(current)
-      return accumulator
-    },
-    {} as Record<IPinGrouping, Array<IMapGrouping>>,
-  )
-
-  return Object.keys(reducedItems).map((item) => {
-    let label = item === 'place' ? 'All Workspaces' : 'Others'
-
-    if (item === 'verified-filter') {
-      label = ''
-    }
-
-    return {
-      label,
-      options: asOptions(mapPinList, reducedItems[item]),
-    }
-  })
-}
diff --git a/src/pages/Maps/Content/Controls/transformSpecialistWorkspaceTypeToWorkspace.tsx b/src/pages/Maps/Content/Controls/transformSpecialistWorkspaceTypeToWorkspace.tsx
deleted file mode 100644
index fcdb112880..0000000000
--- a/src/pages/Maps/Content/Controls/transformSpecialistWorkspaceTypeToWorkspace.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ProfileTypeList } from 'oa-shared'
-
-import type { ProfileTypeName } from 'oa-shared'
-
-type WorkshopProfileType =
-  | 'extrusion'
-  | 'injection'
-  | 'shredder'
-  | 'sheetpress'
-  | 'mix'
-
-export const transformSpecialistWorkspaceTypeToWorkspace = (
-  type: ProfileTypeName | WorkshopProfileType,
-): ProfileTypeName =>
-  ['extrusion', 'injection', 'shredder', 'sheetpress', 'mix'].includes(type)
-    ? ProfileTypeList.WORKSPACE
-    : (type as ProfileTypeName)
diff --git a/src/pages/Maps/Content/MapView/Cluster.client.tsx b/src/pages/Maps/Content/MapView/Cluster.client.tsx
index d361532a8e..c1d61b4c82 100644
--- a/src/pages/Maps/Content/MapView/Cluster.client.tsx
+++ b/src/pages/Maps/Content/MapView/Cluster.client.tsx
@@ -31,7 +31,7 @@ export const Clusters: React.FunctionComponent<IProps> = ({
       spiderfyOnMaxZoom={true}
       // Pin Icon size is always 37x37 px
       // This means max overlay of pins is 5px when not clustered
-      maxClusterRadius={32}
+      maxClusterRadius={54}
     >
       {pins
         .filter(({ location }) => Boolean(location))
diff --git a/src/pages/Maps/Content/MapView/MapContainer.tsx b/src/pages/Maps/Content/MapView/MapContainer.tsx
new file mode 100644
index 0000000000..d82d91ddd6
--- /dev/null
+++ b/src/pages/Maps/Content/MapView/MapContainer.tsx
@@ -0,0 +1,124 @@
+import { useEffect, useRef, useState } from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { Flex } from 'theme-ui'
+
+import { filterPins } from '../../utils/filterPins'
+import { setDefaultPinFilters } from '../../utils/setDefaultPinFilters'
+import { latLongFilter } from './latLongFilter'
+import { MapList } from './MapList'
+import { MapView } from './MapView'
+
+import type { ILatLng, IMapPin, MapFilterOptionsList } from 'oa-shared'
+import type { Map as MapType } from 'react-leaflet'
+
+interface IProps {
+  allPins: IMapPin[] | null
+  allToggleFilters: MapFilterOptionsList
+  notification: string
+}
+
+export const INITIAL_CENTER = { lat: 30.0, lng: 19.0 }
+export const INITIAL_ZOOM = 2
+
+export const MapContainer = (props: IProps) => {
+  const { allPins, allToggleFilters, notification } = props
+
+  const [selectedPin, setSelectedPin] = useState<IMapPin | undefined>()
+  const [activePinFilters, setActivePinFilters] =
+    useState<MapFilterOptionsList>([])
+  const [boundaries, setBoundaries] = useState(null)
+  const [center, setCenter] = useState<ILatLng>(INITIAL_CENTER)
+  const [filteredPins, setFilteredPins] = useState<IMapPin[] | null>(null)
+  const [showMobileList, setShowMobileList] = useState<boolean>(false)
+  const [zoom, setZoom] = useState<number>(INITIAL_ZOOM)
+
+  const navigate = useNavigate()
+  const location = useLocation()
+  const mapRef = useRef<MapType>(null)
+
+  useEffect(() => {
+    if (allPins) {
+      setFilteredPins(allPins)
+    }
+  }, [allPins])
+
+  useEffect(() => {
+    if (allToggleFilters) {
+      const defaultSetFilteringOptions = setDefaultPinFilters(allToggleFilters)
+      setActivePinFilters(defaultSetFilteringOptions)
+    }
+  }, [allToggleFilters])
+
+  useEffect(() => {
+    if (allPins) {
+      const filteredByLocation = boundaries
+        ? latLongFilter(boundaries, allPins)
+        : allPins
+      const newFiltered = filterPins(activePinFilters, filteredByLocation)
+      return setFilteredPins(newFiltered)
+    }
+  }, [activePinFilters, boundaries])
+
+  useEffect(() => {
+    const pinId = location.hash.slice(1)
+    selectPinByUserId(pinId.length > 0 ? pinId : undefined)
+  }, [location.hash, allPins])
+
+  const selectPinByUserId = async (userId: string | undefined) => {
+    if (allPins) {
+      const foundPin = allPins.find((pin) => pin._id === userId)
+      foundPin && setCenter(foundPin.location)
+      setSelectedPin(foundPin)
+    }
+  }
+
+  const onBlur = () => {
+    navigate(`/map`, { replace: true })
+  }
+
+  const onPinClick = (pin) => {
+    navigate(`/map#${pin._id}`, { replace: true })
+  }
+
+  const onLocationChange = (latlng) => setCenter(latlng)
+  const mapZoom = center ? zoom : 2
+
+  return (
+    <Flex
+      sx={{
+        flexDirection: 'row',
+        height: '100%',
+      }}
+    >
+      <MapList
+        allToggleFilters={allToggleFilters}
+        activePinFilters={activePinFilters}
+        notification={notification}
+        onBlur={onBlur}
+        onLocationChange={onLocationChange}
+        onPinClick={onPinClick}
+        pins={filteredPins}
+        selectedPin={selectedPin}
+        setActivePinFilters={setActivePinFilters}
+        setShowMobileList={setShowMobileList}
+        showMobileList={showMobileList}
+      />
+
+      <MapView
+        allPins={filteredPins}
+        center={center}
+        initialCenter={INITIAL_CENTER}
+        initialZoom={INITIAL_ZOOM}
+        mapRef={mapRef}
+        setBoundaries={setBoundaries}
+        setZoom={setZoom}
+        onBlur={onBlur}
+        onPinClick={onPinClick}
+        setCenter={setCenter}
+        selectedPin={selectedPin}
+        setShowMobileList={setShowMobileList}
+        zoom={mapZoom}
+      />
+    </Flex>
+  )
+}
diff --git a/src/pages/Maps/Content/MapView/MapList.tsx b/src/pages/Maps/Content/MapView/MapList.tsx
new file mode 100644
index 0000000000..436f3f1502
--- /dev/null
+++ b/src/pages/Maps/Content/MapView/MapList.tsx
@@ -0,0 +1,118 @@
+import { Button } from 'oa-components'
+import { Box, Flex } from 'theme-ui'
+
+import { MapWithListHeader } from './MapWithListHeader'
+
+import type { IMapPin, MapFilterOption, MapFilterOptionsList } from 'oa-shared'
+
+interface IProps {
+  activePinFilters: MapFilterOptionsList
+  allToggleFilters: MapFilterOptionsList
+  notification: string
+  onBlur: () => void
+  onLocationChange: (ILatLng) => void
+  onPinClick: (pin: IMapPin) => void
+  pins: IMapPin[] | null
+  selectedPin: IMapPin | undefined
+  setActivePinFilters: (MapFilterOption) => void
+  setShowMobileList: (boolean) => void
+  showMobileList: boolean
+}
+
+export const MapList = (props: IProps) => {
+  const {
+    activePinFilters,
+    allToggleFilters,
+    notification,
+    onBlur,
+    onLocationChange,
+    onPinClick,
+    pins,
+    selectedPin,
+    setActivePinFilters,
+    setShowMobileList,
+    showMobileList,
+  } = props
+
+  const onFilterChange = (changedOption: MapFilterOption) => {
+    const isFilterPresent = !!activePinFilters.find(
+      (pinFilter) => pinFilter.label == changedOption.label,
+    )
+
+    if (isFilterPresent) {
+      setActivePinFilters((filter) =>
+        filter.filter(
+          (existingOption) => existingOption.label !== changedOption.label,
+        ),
+      )
+      return
+    }
+
+    setActivePinFilters((activePinFilters) => [
+      ...activePinFilters,
+      changedOption,
+    ])
+  }
+
+  const mobileListDisplay = showMobileList ? 'block' : 'none'
+
+  const headerProps = {
+    activePinFilters,
+    availableFilters: allToggleFilters,
+    notification,
+    onBlur,
+    onFilterChange,
+    onLocationChange,
+    onPinClick,
+    pins,
+    selectedPin,
+    setShowMobileList,
+  }
+
+  return (
+    <>
+      {/* Desktop list view */}
+      <Box
+        sx={{
+          display: ['none', 'none', 'block', 'block'],
+          background: 'white',
+          flex: 1,
+          overflow: 'scroll',
+        }}
+      >
+        <MapWithListHeader {...headerProps} viewport="desktop" />
+      </Box>
+
+      {/* Mobile/tablet list view */}
+      <Box
+        sx={{
+          display: [mobileListDisplay, mobileListDisplay, 'none', 'none'],
+          background: 'white',
+          width: '100%',
+          overflow: 'scroll',
+        }}
+      >
+        <Flex
+          sx={{
+            justifyContent: 'center',
+            paddingBottom: 2,
+            position: 'absolute',
+            zIndex: 1000,
+            width: '100%',
+          }}
+        >
+          <Button
+            data-cy="ShowMapButton"
+            icon="map"
+            sx={{ position: 'sticky', marginTop: 2 }}
+            onClick={() => setShowMobileList(false)}
+            small
+          >
+            Show map view
+          </Button>
+        </Flex>
+        <MapWithListHeader {...headerProps} viewport="mobile" />
+      </Box>
+    </>
+  )
+}
diff --git a/src/pages/Maps/Content/MapView/MapView.client.tsx b/src/pages/Maps/Content/MapView/MapView.client.tsx
deleted file mode 100644
index 53f8499842..0000000000
--- a/src/pages/Maps/Content/MapView/MapView.client.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useEffect } from 'react'
-import { Map } from 'oa-components'
-
-import { Clusters } from './Cluster.client'
-import { Popup } from './Popup.client'
-
-import type { LatLngExpression } from 'leaflet'
-import type { ILatLng, IMapPin } from 'oa-shared'
-import type { Map as MapType } from 'react-leaflet'
-
-interface IProps {
-  activePin: IMapPin | undefined
-  center: ILatLng
-  mapRef: React.RefObject<MapType>
-  pins: Array<IMapPin>
-  zoom: number
-  onPinClick: (pin: IMapPin) => void
-  onBlur: () => void
-  setZoom: (arg: number) => void
-}
-
-export const MapView = (props: IProps) => {
-  const { activePin, center, mapRef, onPinClick, pins, zoom, setZoom } = props
-  const isViewportGreaterThanTablet = window.innerWidth > 1024
-  const mapCenter: LatLngExpression = center ? [center.lat, center.lng] : [0, 0]
-  const mapZoom = center ? zoom : 2
-
-  useEffect(() => {
-    if (mapRef.current) {
-      mapRef.current.leafletElement.zoomControl?.setPosition('bottomleft')
-    }
-  }, [])
-
-  return (
-    <Map
-      ref={mapRef}
-      className="markercluster-map"
-      center={mapCenter}
-      zoom={mapZoom}
-      setZoom={setZoom}
-      maxZoom={18}
-      zoomControl={isViewportGreaterThanTablet}
-      style={{ height: '100%', zIndex: 0 }}
-      onclick={() => {
-        props.onBlur()
-      }}
-    >
-      <Clusters pins={pins} onPinClick={onPinClick} />
-      {activePin && <Popup activePin={activePin} mapRef={mapRef} />}
-    </Map>
-  )
-}
diff --git a/src/pages/Maps/Content/MapView/MapView.tsx b/src/pages/Maps/Content/MapView/MapView.tsx
new file mode 100644
index 0000000000..9f787309d7
--- /dev/null
+++ b/src/pages/Maps/Content/MapView/MapView.tsx
@@ -0,0 +1,174 @@
+import { useEffect } from 'react'
+import { Tooltip } from 'react-tooltip'
+import { Button, Map } from 'oa-components'
+import { logger } from 'src/logger'
+import { Box, Flex } from 'theme-ui'
+
+import { GetLocation } from '../../utils/geolocation'
+import { Clusters } from './Cluster.client'
+import { Popup } from './Popup.client'
+
+import type { LatLngExpression } from 'leaflet'
+import type { ILatLng, IMapPin } from 'oa-shared'
+import type { RefObject } from 'react'
+import type { Map as MapType, MapProps } from 'react-leaflet'
+
+interface IProps {
+  allPins: IMapPin[] | null
+  center: ILatLng
+  initialCenter: ILatLng
+  initialZoom: number
+  mapRef: RefObject<MapType<MapProps, any>>
+  onBlur: () => void
+  onPinClick: (IMapPin) => void
+  selectedPin: IMapPin | undefined
+  setBoundaries: (LatLngBounds) => void
+  setCenter: (ILatLng) => void
+  setShowMobileList: (boolean) => void
+  setZoom: (number) => void
+  zoom: number
+}
+
+const ZOOM_IN_TOOLTIP = 'Zoom in to your location'
+const ZOOM_OUT_TOOLTIP = 'Zoom out to world view'
+
+export const MapView = (props: IProps) => {
+  const {
+    allPins,
+    center,
+    initialCenter,
+    initialZoom,
+    mapRef,
+    onBlur,
+    onPinClick,
+    selectedPin,
+    setBoundaries,
+    setCenter,
+    setShowMobileList,
+    setZoom,
+    zoom,
+  } = props
+
+  const buttonStyle = {
+    backgroundColor: 'white',
+    borderRadius: 99,
+    padding: 4,
+    ':hover': {
+      backgroundColor: 'lightgray',
+    },
+  }
+
+  const promptUserLocation = async () => {
+    try {
+      const position = await GetLocation()
+      setCenter({
+        lat: position.coords.latitude,
+        lng: position.coords.longitude,
+      })
+    } catch (error) {
+      logger.error(error)
+    }
+  }
+
+  const handleLocationChange = () => {
+    if (mapRef.current) {
+      const boundaries = mapRef.current.leafletElement.getBounds()
+      setBoundaries(boundaries)
+    }
+  }
+
+  const isViewportGreaterThanTablet = window.innerWidth > 1024
+  const mapCenter: LatLngExpression = center ? [center.lat, center.lng] : [0, 0]
+  const mapZoom = center ? zoom : 2
+
+  useEffect(() => {
+    if (mapRef.current) {
+      ;(window as any).mapInstance = mapRef.current
+    }
+  }, [mapRef])
+
+  const isWorldViewButtonDisabled = zoom === initialZoom
+
+  return (
+    <Map
+      ref={mapRef}
+      className="markercluster-map"
+      center={mapCenter}
+      zoom={mapZoom}
+      setZoom={setZoom}
+      maxZoom={18}
+      style={{ flex: 1 }}
+      zoomControl={isViewportGreaterThanTablet}
+      onclick={onBlur}
+      ondragend={handleLocationChange}
+      onzoomend={handleLocationChange}
+      onresize={handleLocationChange}
+      useFlyTo
+    >
+      <Box
+        sx={{
+          position: 'absolute',
+          top: 0,
+          right: 0,
+          padding: 4,
+          zIndex: 1000,
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 2,
+        }}
+      >
+        <Button
+          data-tooltip-content={ZOOM_IN_TOOLTIP}
+          data-cy="LocationViewButton"
+          data-tooltip-id="locationButton-tooltip"
+          sx={buttonStyle}
+          onClick={() => {
+            promptUserLocation()
+            setZoom(9)
+          }}
+          icon="gps-location"
+        />
+        <Tooltip id="locationButton-tooltip" place="left" />
+
+        <Button
+          data-tooltip-content={ZOOM_OUT_TOOLTIP}
+          data-cy={`WorldViewButton${isWorldViewButtonDisabled ? '-disabled' : ''}`}
+          data-tooltip-id="worldViewButton-tooltip"
+          sx={buttonStyle}
+          onClick={() => {
+            setCenter(initialCenter)
+            setZoom(initialZoom)
+          }}
+          disabled={isWorldViewButtonDisabled}
+          icon="globe"
+        />
+        <Tooltip id="worldViewButton-tooltip" place="top" />
+      </Box>
+
+      <Flex
+        sx={{
+          flexDirection: 'column',
+          alignItems: 'center',
+          padding: 2,
+          gap: 2,
+        }}
+      >
+        <Button
+          data-cy="ShowMobileListButton"
+          icon="step"
+          sx={{ display: ['flex', 'flex', 'none'], zIndex: 1000 }}
+          onClick={() => setShowMobileList(true)}
+          small
+        >
+          Show list view
+        </Button>
+      </Flex>
+      {allPins && (
+        <Clusters pins={allPins} onPinClick={onPinClick} prefix="new" />
+      )}
+      {selectedPin && (
+        <Popup activePin={selectedPin} mapRef={mapRef} onClose={onBlur} />
+      )}
+    </Map>
+  )
+}
diff --git a/src/pages/Maps/Content/MapView/MapWithList.tsx b/src/pages/Maps/Content/MapView/MapWithList.tsx
deleted file mode 100644
index 27002e12bb..0000000000
--- a/src/pages/Maps/Content/MapView/MapWithList.tsx
+++ /dev/null
@@ -1,295 +0,0 @@
-import { useEffect, useMemo, useState } from 'react'
-import { Tooltip } from 'react-tooltip'
-import { Button, Map } from 'oa-components'
-import { Box, Flex } from 'theme-ui'
-
-import { filterPins } from '../../utils/filterPins'
-import { allMapFilterOptions } from './allMapFilterOptions'
-import { Clusters } from './Cluster.client'
-import { latLongFilter } from './latLongFilter'
-import { MapWithListHeader } from './MapWithListHeader'
-import { Popup } from './Popup.client'
-
-import type { LatLngExpression } from 'leaflet'
-import type {
-  ILatLng,
-  IMapPin,
-  MapFilterOption,
-  MapFilterOptionsList,
-} from 'oa-shared'
-import type { Map as MapType } from 'react-leaflet'
-
-interface IProps {
-  selectedPin: IMapPin | undefined
-  center: ILatLng
-  initialZoom: number
-  mapRef: React.RefObject<MapType>
-  notification?: string
-  onBlur: () => void
-  onPinClick: (pin: IMapPin) => void
-  onLocationChange: (latlng: ILatLng) => void
-  pins: IMapPin[]
-  promptUserLocation: () => Promise<void>
-  setZoom: (arg: number) => void
-  zoom: number
-}
-
-const ZOOM_IN_TOOLTIP = 'Zoom in to your location'
-const ZOOM_OUT_TOOLTIP = 'Zoom out to world view'
-
-export const MapWithList = (props: IProps) => {
-  const {
-    selectedPin,
-    center,
-    initialZoom,
-    mapRef,
-    notification,
-    onBlur,
-    onLocationChange,
-    onPinClick,
-    pins,
-    promptUserLocation,
-    setZoom,
-    zoom,
-  } = props
-
-  const [activePinFilters, setActivePinFilters] =
-    useState<MapFilterOptionsList>([])
-  const [allPinsInView, setAllPinsInView] = useState<IMapPin[]>(pins)
-  const [filteredPins, setFilteredPins] = useState<IMapPin[] | null>(
-    pins || null,
-  )
-  const [showMobileList, setShowMobileList] = useState<boolean>(false)
-
-  const availableFilters = useMemo(() => {
-    const pinDetails = pins.map(({ creator }) => [
-      creator?.profileType,
-      ...(creator?.tags ? creator.tags.map(({ _id }) => _id) : []),
-      ...(creator?.badges
-        ? Object.keys(creator?.badges).filter((key) => key)
-        : []),
-    ])
-    const filtersNeeded = [...new Set(pinDetails.flat())]
-    return allMapFilterOptions.filter((validFilter) =>
-      filtersNeeded.some((neededfilter) => neededfilter === validFilter._id),
-    )
-  }, [pins])
-
-  const buttonStyle = {
-    backgroundColor: 'white',
-    borderRadius: 99,
-    padding: 4,
-    ':hover': {
-      backgroundColor: 'lightgray',
-    },
-  }
-
-  useEffect(() => {
-    const filtered = filterPins(activePinFilters, allPinsInView)
-    return setFilteredPins(filtered)
-  }, [activePinFilters, allPinsInView])
-
-  const handleLocationFilter = () => {
-    if (mapRef.current) {
-      const boundaries = mapRef.current.leafletElement.getBounds()
-      // Map.getBounds() is wrongly typed
-      const results = latLongFilter(boundaries as any, pins)
-      setAllPinsInView(results)
-    }
-  }
-
-  const onFilterChange = (changedOption: MapFilterOption) => {
-    const isFilterPresent = !!activePinFilters.find(
-      (pinFilter) => pinFilter.label == changedOption.label,
-    )
-
-    if (isFilterPresent) {
-      return setActivePinFilters((filter) =>
-        filter.filter(
-          (existingOption) => existingOption.label !== changedOption.label,
-        ),
-      )
-    }
-
-    return setActivePinFilters((activePinFilters) => [
-      ...activePinFilters,
-      changedOption,
-    ])
-  }
-
-  const isViewportGreaterThanTablet = window.innerWidth > 1024
-  const mapCenter: LatLngExpression = center ? [center.lat, center.lng] : [0, 0]
-  const mapZoom = center ? zoom : 2
-
-  const mobileListDisplay = showMobileList ? 'block' : 'none'
-
-  useEffect(() => {
-    if (mapRef.current) {
-      ;(window as any).mapInstance = mapRef.current
-    }
-  }, [mapRef])
-
-  return (
-    <Flex
-      sx={{
-        flexDirection: 'row',
-        height: '100%',
-      }}
-    >
-      {/* Desktop list view */}
-      <Box
-        sx={{
-          display: ['none', 'none', 'block', 'block'],
-          background: 'white',
-          flex: 1,
-          overflow: 'scroll',
-        }}
-      >
-        <MapWithListHeader
-          pins={pins}
-          activePinFilters={activePinFilters}
-          availableFilters={availableFilters}
-          onBlur={onBlur}
-          onFilterChange={onFilterChange}
-          onLocationChange={onLocationChange}
-          onPinClick={onPinClick}
-          selectedPin={selectedPin}
-          filteredPins={filteredPins}
-          viewport="desktop"
-        />
-      </Box>
-
-      {/* Mobile/tablet list view */}
-      <Box
-        sx={{
-          display: [mobileListDisplay, mobileListDisplay, 'none', 'none'],
-          background: 'white',
-          width: '100%',
-          overflow: 'scroll',
-        }}
-      >
-        <Flex
-          sx={{
-            justifyContent: 'center',
-            paddingBottom: 2,
-            position: 'absolute',
-            zIndex: 1000,
-            width: '100%',
-          }}
-        >
-          <Button
-            data-cy="ShowMapButton"
-            icon="map"
-            sx={{ position: 'sticky', marginTop: 2 }}
-            onClick={() => setShowMobileList(false)}
-            small
-          >
-            Show map view
-          </Button>
-        </Flex>
-        <MapWithListHeader
-          activePinFilters={activePinFilters}
-          availableFilters={availableFilters}
-          filteredPins={filteredPins}
-          onBlur={onBlur}
-          onFilterChange={onFilterChange}
-          onLocationChange={onLocationChange}
-          onPinClick={onPinClick}
-          pins={pins}
-          selectedPin={selectedPin}
-          setShowMobileList={setShowMobileList}
-          viewport="mobile"
-        />
-      </Box>
-
-      {/* Same map for all viewports */}
-      <Map
-        ref={mapRef}
-        className="markercluster-map"
-        center={mapCenter}
-        zoom={mapZoom}
-        setZoom={setZoom}
-        maxZoom={18}
-        style={{ flex: 1 }}
-        zoomControl={isViewportGreaterThanTablet}
-        onclick={() => onBlur()}
-        ondragend={handleLocationFilter}
-        onzoomend={handleLocationFilter}
-        onresize={handleLocationFilter}
-        useFlyTo
-      >
-        <Box
-          sx={{
-            position: 'absolute',
-            top: 0,
-            right: 0,
-            padding: 4,
-            zIndex: 1000,
-            display: 'flex',
-            flexDirection: 'column',
-            gap: 2,
-          }}
-        >
-          <Button
-            data-tooltip-content={ZOOM_IN_TOOLTIP}
-            data-cy="LocationViewButton"
-            data-tooltip-id="locationButton-tooltip"
-            sx={buttonStyle}
-            onClick={() => {
-              promptUserLocation()
-              setZoom(6)
-            }}
-            icon="gps-location"
-          />
-          <Tooltip id="locationButton-tooltip" place="left" />
-
-          <Button
-            data-tooltip-content={ZOOM_OUT_TOOLTIP}
-            data-cy="WorldViewButton"
-            data-tooltip-id="worldViewButton-tooltip"
-            sx={buttonStyle}
-            onClick={() => {
-              setZoom(initialZoom)
-            }}
-            icon="globe"
-          />
-          <Tooltip id="worldViewButton-tooltip" place="top" />
-        </Box>
-
-        <Flex
-          sx={{
-            flexDirection: 'column',
-            alignItems: 'center',
-            padding: 2,
-            gap: 2,
-          }}
-        >
-          <Button
-            data-cy="ShowMobileListButton"
-            icon="step"
-            sx={{ display: ['flex', 'flex', 'none'], zIndex: 1000 }}
-            onClick={() => setShowMobileList(true)}
-            small
-          >
-            Show list view
-          </Button>
-
-          {notification && notification !== '' && (
-            <Button sx={{ zIndex: 1000 }} variant="subtle">
-              {notification}
-            </Button>
-          )}
-        </Flex>
-        <Clusters pins={pins} onPinClick={onPinClick} prefix="new" />
-        {selectedPin && (
-          <Popup
-            activePin={selectedPin}
-            mapRef={mapRef}
-            onClose={onBlur}
-            newMap
-          />
-        )}
-      </Map>
-    </Flex>
-  )
-}
diff --git a/src/pages/Maps/Content/MapView/MapWithListHeader.tsx b/src/pages/Maps/Content/MapView/MapWithListHeader.tsx
index a7f1aac066..4d148e5fa3 100644
--- a/src/pages/Maps/Content/MapView/MapWithListHeader.tsx
+++ b/src/pages/Maps/Content/MapView/MapWithListHeader.tsx
@@ -2,12 +2,13 @@ import { useState } from 'react'
 import {
   Button,
   CardList,
+  Loader,
   MapFilterList,
   MapFilterProfileTypeCardList,
   Modal,
   OsmGeocoding,
 } from 'oa-components'
-import { Flex, Heading, Text } from 'theme-ui'
+import { Flex, Text } from 'theme-ui'
 
 import type {
   ILatLng,
@@ -17,14 +18,14 @@ import type {
 } from 'oa-shared'
 
 interface IProps {
+  pins: IMapPin[] | null
   activePinFilters: MapFilterOptionsList
   availableFilters: MapFilterOptionsList
-  filteredPins: IMapPin[] | null
+  notification: string
   onBlur: () => void
   onPinClick: (pin: IMapPin) => void
   onFilterChange: (filter: MapFilterOption) => void
   onLocationChange: (latlng: ILatLng) => void
-  pins: IMapPin[]
   selectedPin: IMapPin | undefined
   setShowMobileList?: (set: boolean) => void
   viewport: 'desktop' | 'mobile'
@@ -33,14 +34,14 @@ interface IProps {
 export const MapWithListHeader = (props: IProps) => {
   const [showFilters, setShowFilters] = useState<boolean>(false)
   const {
+    pins,
     activePinFilters,
     availableFilters,
-    filteredPins,
+    notification,
     onBlur,
     onFilterChange,
     onLocationChange,
     onPinClick,
-    pins,
     selectedPin,
     setShowMobileList,
     viewport,
@@ -56,16 +57,33 @@ export const MapWithListHeader = (props: IProps) => {
     padding: '0 !important',
   }
 
+  if (notification) {
+    return (
+      <Flex
+        sx={{
+          background: 'background',
+          height: '100%',
+          width: '100%',
+          justifyContent: 'center',
+        }}
+      >
+        <Loader label={notification} sx={{ alignSelf: 'center' }} />
+      </Flex>
+    )
+  }
+
   return (
     <>
       <Modal onDidDismiss={toggleFilterModal} isOpen={showFilters} sx={sx}>
-        <MapFilterList
-          activeFilters={activePinFilters}
-          availableFilters={availableFilters}
-          onClose={toggleFilterModal}
-          onFilterChange={onFilterChange}
-          pinCount={filteredPins?.length || 0}
-        />
+        {pins && (
+          <MapFilterList
+            activeFilters={activePinFilters}
+            availableFilters={availableFilters}
+            onClose={toggleFilterModal}
+            onFilterChange={onFilterChange}
+            pinCount={pins.length}
+          />
+        )}
       </Modal>
 
       <Flex
@@ -74,20 +92,9 @@ export const MapWithListHeader = (props: IProps) => {
           backgroundColor: 'background',
           gap: 2,
           paddingY: 2,
-          paddingTop: isMobile ? '50px' : 2,
+          paddingTop: isMobile ? '50px' : 6,
         }}
       >
-        <Heading
-          data-cy="welome-header"
-          sx={{
-            paddingX: 4,
-          }}
-          variant={isMobile ? 'small' : 'heading'}
-        >
-          Welcome to our world!{' '}
-          {pins && `${pins.length} members (and counting...)`}
-        </Heading>
-
         <Flex sx={{ paddingX: 4, gap: 2, flexDirection: 'row' }}>
           <OsmGeocoding
             callback={({ lat, lon }) => {
@@ -117,15 +124,15 @@ export const MapWithListHeader = (props: IProps) => {
           onFilterChange={onFilterChange}
         />
       </Flex>
-      <CardList
-        columnsCountBreakPoints={isMobile ? { 300: 1, 600: 2 } : undefined}
-        list={pins}
-        filteredList={filteredPins}
-        onBlur={onBlur}
-        onPinClick={onPinClick}
-        selectedPin={selectedPin}
-        viewport={viewport}
-      />
+      {pins && (
+        <CardList
+          columnsCountBreakPoints={isMobile ? { 300: 1, 600: 2 } : undefined}
+          list={pins}
+          onPinClick={onPinClick}
+          selectedPin={selectedPin}
+          viewport={viewport}
+        />
+      )}
     </>
   )
 }
diff --git a/src/pages/Maps/Content/MapView/Popup.client.tsx b/src/pages/Maps/Content/MapView/Popup.client.tsx
index 50718a452d..31a5bbfd50 100644
--- a/src/pages/Maps/Content/MapView/Popup.client.tsx
+++ b/src/pages/Maps/Content/MapView/Popup.client.tsx
@@ -1,9 +1,7 @@
 import React, { useEffect, useRef } from 'react'
 import { Popup as LeafletPopup } from 'react-leaflet'
 import L from 'leaflet'
-import { MapMemberCard, PinProfile } from 'oa-components'
-import { IModerationStatus } from 'oa-shared'
-import { MAP_GROUPINGS } from 'src/stores/Maps/maps.groupings'
+import { PinProfile } from 'oa-components'
 
 import type { ILatLng, IMapPin, IMapPinWithDetail } from 'oa-shared'
 import type { Map } from 'react-leaflet'
@@ -13,7 +11,6 @@ import './popup.css'
 interface IProps {
   activePin: IMapPin | IMapPinWithDetail
   mapRef: React.RefObject<Map>
-  newMap?: boolean
   onClose?: () => void
   customPosition?: ILatLng
 }
@@ -21,7 +18,7 @@ interface IProps {
 export const Popup = (props: IProps) => {
   const leafletRef = useRef<LeafletPopup>(null)
   const activePin = props.activePin as IMapPinWithDetail
-  const { mapRef, newMap, onClose, customPosition } = props
+  const { mapRef, onClose, customPosition } = props
 
   useEffect(() => {
     openPopup()
@@ -35,15 +32,6 @@ export const Popup = (props: IProps) => {
     }
   }
 
-  const getHeading = (pin: IMapPinWithDetail) => {
-    const group = MAP_GROUPINGS.find((g) => {
-      return pin.subType
-        ? g.subType === pin.subType && g.type === pin.type
-        : g.type === pin.type
-    })
-    return group ? group.displayName : pin.type
-  }
-
   return (
     activePin.location && (
       <LeafletPopup
@@ -58,33 +46,10 @@ export const Popup = (props: IProps) => {
         closeOnEscapeKey={false}
         closeButton={false}
         className={activePin !== undefined ? '' : 'closed'}
-        minWidth={230}
-        maxWidth={230}
+        minWidth={250}
+        maxWidth={300}
       >
-        {newMap && onClose && <PinProfile item={activePin} onClose={onClose} />}
-        {!newMap && (
-          <MapMemberCard
-            loading={!activePin.creator}
-            imageUrl={
-              activePin.creator?.coverImage ||
-              activePin.creator?.userImage ||
-              ''
-            }
-            comments={
-              activePin.comments &&
-              activePin.moderation === IModerationStatus.IMPROVEMENTS_NEEDED
-                ? activePin.comments
-                : null
-            }
-            description={activePin.creator?.about || ''}
-            user={{
-              isVerified: !!activePin.creator?.badges?.verified,
-              userName: activePin.creator?._id || '',
-              countryCode: activePin.creator?.countryCode,
-            }}
-            heading={getHeading(activePin)}
-          />
-        )}
+        {onClose && <PinProfile item={activePin} onClose={onClose} />}
       </LeafletPopup>
     )
   )
diff --git a/src/pages/Maps/Content/MapView/Sprites.tsx b/src/pages/Maps/Content/MapView/Sprites.tsx
index 306a5ebb1e..9c8643a8f5 100644
--- a/src/pages/Maps/Content/MapView/Sprites.tsx
+++ b/src/pages/Maps/Content/MapView/Sprites.tsx
@@ -58,6 +58,7 @@ export const createClusterIcon = () => {
 
     return L.divIcon({
       html: `${icon}<span class="icon-cluster-text" style="
+        background: ${theme.colors.accent.base};
         font-size: ${fontSize}px;
         line-height: ${lineHeight}px;
         border-radius: ${borderRadius}px;
@@ -98,22 +99,22 @@ const getClusterSizes = (cluster: MarkerCluster) => {
   switch (order) {
     case 1:
       return {
-        fontSize: 20,
+        fontSize: 18,
         iconSize: 26,
-        lineHeight: 26,
+        lineHeight: 22,
       }
     case 2:
       return {
-        fontSize: 20,
+        fontSize: 18,
         iconSize: 32,
-        lineHeight: 32,
+        lineHeight: 28,
       }
 
     default:
       return {
-        fontSize: 20,
+        fontSize: 18,
         iconSize: 44,
-        lineHeight: 44,
+        lineHeight: 40,
       }
   }
 }
diff --git a/src/pages/Maps/Content/NewMapBanner.tsx b/src/pages/Maps/Content/NewMapBanner.tsx
deleted file mode 100644
index 33e369550b..0000000000
--- a/src/pages/Maps/Content/NewMapBanner.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Banner, ExternalLink, Icon } from 'oa-components'
-import { Flex, Text } from 'theme-ui'
-
-interface IProps {
-  showNewMap: boolean
-  setShowNewMap: (show: boolean) => void
-}
-
-export const NewMapBanner = (props: IProps) => {
-  const { showNewMap, setShowNewMap } = props
-  const sx = { '&:hover': { textDecoration: 'underline', cursor: 'pointer' } }
-
-  return (
-    <Banner variant="accent">
-      <Flex sx={{ justifyItems: 'center', gap: 1 }}>
-        <Icon glyph="map" />
-        {showNewMap ? (
-          <Text>
-            We're still working on this.{' '}
-            <ExternalLink
-              href="https://github.com/ONEARMY/community-platform"
-              sx={{ ...sx, color: 'black', fontWeight: 'bold' }}
-            >
-              Help us develop it
-            </ExternalLink>{' '}
-            <Text onClick={() => setShowNewMap(false)} sx={sx}>
-              or go back to the old one!
-            </Text>
-          </Text>
-        ) : (
-          <Text onClick={() => setShowNewMap(true)} sx={sx}>
-            We're developing new map interface. Test it out!
-          </Text>
-        )}
-      </Flex>
-    </Banner>
-  )
-}
diff --git a/src/pages/Maps/Content/index.ts b/src/pages/Maps/Content/index.ts
deleted file mode 100644
index 0a8d8bee9b..0000000000
--- a/src/pages/Maps/Content/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { MapView } from './MapView/MapView.client'
-export { Controls } from './Controls/Controls'
diff --git a/src/pages/Maps/Maps.client.tsx b/src/pages/Maps/Maps.client.tsx
index c6696244da..a338360979 100644
--- a/src/pages/Maps/Maps.client.tsx
+++ b/src/pages/Maps/Maps.client.tsx
@@ -1,56 +1,27 @@
-import { useContext, useEffect, useMemo, useRef, useState } from 'react'
-import { useLocation, useNavigate } from 'react-router-dom'
-import { observer } from 'mobx-react'
-import { isPreciousPlastic } from 'src/config/config'
-import { filterMapPinsByType } from 'src/stores/Maps/filter'
-import { MAP_GROUPINGS } from 'src/stores/Maps/maps.groupings'
+import { useEffect, useMemo, useState } from 'react'
 import { Box } from 'theme-ui'
 
-import { logger } from '../../logger'
-import { transformAvailableFiltersToGroups } from './Content/Controls/transformAvailableFiltersToGroups'
-import { MapWithList } from './Content/MapView/MapWithList'
-import { NewMapBanner } from './Content/NewMapBanner'
-import { GetLocation } from './utils/geolocation'
-import { Controls, MapView } from './Content'
-import { MapPinServiceContext } from './map.service'
+import { allMapFilterOptions } from './Content/MapView/allMapFilterOptions'
+import { MapContainer } from './Content/MapView/MapContainer'
+import { mapPinService } from './map.service'
 
-import type { ILatLng, IMapPin } from 'oa-shared'
-import type { Map } from 'react-leaflet'
-import type { IMapPinService } from './map.service'
+import type { IMapPin, MapFilterOptionsList } from 'oa-shared'
 
 import './styles.css'
 
-const INITIAL_CENTER = { lat: 51.0, lng: 19.0 }
-const INITIAL_ZOOM = 3
+const STARTING_NOTIFICATION = 'Loading...'
 
-const MapsPage = observer(() => {
-  const [activePinFilters, setActivePinFilters] = useState<string[]>([])
-  const [center, setCenter] = useState<ILatLng>(INITIAL_CENTER)
-  const [mapPins, setMapPins] = useState<IMapPin[]>([])
-  const [notification, setNotification] = useState<string>('')
-  const [selectedPin, setSelectedPin] = useState<IMapPin | undefined>()
-  const [showNewMap, setShowNewMap] = useState<boolean>(false)
-  const [zoom, setZoom] = useState<number>(INITIAL_ZOOM)
-
-  const navigate = useNavigate()
-  const location = useLocation()
-  const mapPinService = useContext(MapPinServiceContext) as IMapPinService
-
-  const mapRef = useRef<Map>(null)
-  const newMapRef = useRef<Map>(null)
-
-  useEffect(() => {
-    if (!selectedPin) {
-      promptUserLocation()
-    }
-  }, [])
+const MapsPage = () => {
+  const [allPins, setAllPins] = useState<IMapPin[] | null>(null)
+  const [notification, setNotification] = useState<string>(
+    STARTING_NOTIFICATION,
+  )
 
   useEffect(() => {
     const fetchMapPins = async () => {
-      setNotification('Loading...')
       try {
         const pins = await mapPinService.getMapPins()
-        setMapPins(pins)
+        setAllPins(pins)
         setNotification('')
       } catch (error) {
         setNotification(error)
@@ -60,117 +31,38 @@ const MapsPage = observer(() => {
     fetchMapPins()
   }, [])
 
-  useEffect(() => {
-    const pinId = location.hash.slice(1)
-    if (pinId.length > 0) {
-      setSelectedPin(selectedPin)
-    }
-  }, [location.hash])
-
-  const promptUserLocation = async () => {
-    try {
-      const position = await GetLocation()
-      setCenter({
-        lat: position.coords.latitude,
-        lng: position.coords.longitude,
-      })
-    } catch (error) {
-      logger.error(error)
+  const allToggleFilters: MapFilterOptionsList = useMemo(() => {
+    if (!allPins) {
+      return []
     }
-  }
 
-  const availableFilters = useMemo(() => {
-    return transformAvailableFiltersToGroups(mapPins, [
-      {
-        grouping: 'verified-filter',
-        displayName: 'Verified',
-        type: 'verified',
-      },
-      ...MAP_GROUPINGS,
+    const pinDetails = allPins.map(({ creator }) => [
+      creator?.profileType,
+      // Hiding member tags for the moment
+      ...(creator?.tags && creator?.profileType !== 'member'
+        ? creator.tags.map(({ _id }) => _id)
+        : []),
+      ...(creator?.badges
+        ? Object.keys(creator?.badges).filter((key) => key)
+        : []),
     ])
-  }, [mapPins])
-
-  // Only really for the old map - can be removed soon
-  const visibleMapPins = useMemo(() => {
-    const hideMemberPins = !showNewMap && isPreciousPlastic()
-    return filterMapPinsByType(mapPins, activePinFilters, hideMemberPins)
-  }, [activePinFilters, mapPins, showNewMap])
-
-  const selectPinByUserId = async (userId: string) => {
-    // First check the mapPins to see if the pin is already
-    // partially loaded
-    const preLoadedPin = mapPins.find((pin) => pin._id === userId)
-    if (preLoadedPin) {
-      setCenter(preLoadedPin.location)
-      return setSelectedPin(preLoadedPin)
-    }
-
-    // If only the mapPins where preloaded with the "detail" property, i think that this could fly away
-    const pin = await mapPinService.getMapPinByUserId(userId)
-    if (pin) {
-      logger.info(`Fetched map pin by user id`, { userId, pin })
-      setCenter(pin.location)
-      setSelectedPin(pin)
-    } else {
-      logger.error(`Failed to fetch map pin by user id`, { userId, pin })
-    }
-  }
 
-  const onBlur = () => {
-    navigate('/map')
-    setSelectedPin(undefined)
-  }
+    const filtersNeeded = [...new Set(pinDetails.flat())]
 
-  const onPinClick = (pin) => {
-    navigate(`/map#${pin._id}`)
-    if (pin._id !== selectedPin?._id) {
-      selectPinByUserId(pin._id)
-    }
-  }
+    return allMapFilterOptions.filter((validFilter) =>
+      filtersNeeded.some((neededfilter) => neededfilter === validFilter._id),
+    )
+  }, [allPins])
 
   return (
-    // the calculation for the height is kind of hacky for now, will set properly on final mockups
     <Box id="mapPage" sx={{ height: 'calc(100vh - 120px)', width: '100%' }}>
-      <NewMapBanner showNewMap={showNewMap} setShowNewMap={setShowNewMap} />
-      {!showNewMap && (
-        <>
-          <Controls
-            availableFilters={availableFilters}
-            onLocationChange={(latlng) => setCenter(latlng)}
-            onFilterChange={(selected) => {
-              setActivePinFilters(selected)
-            }}
-          />
-          <MapView
-            activePin={selectedPin}
-            mapRef={mapRef}
-            pins={visibleMapPins}
-            onPinClick={onPinClick}
-            onBlur={onBlur}
-            center={center}
-            zoom={zoom}
-            setZoom={setZoom}
-          />
-        </>
-      )}
-      {showNewMap && (
-        <MapWithList
-          selectedPin={selectedPin}
-          center={center}
-          initialZoom={INITIAL_ZOOM}
-          mapRef={newMapRef}
-          notification={notification}
-          onBlur={onBlur}
-          onLocationChange={(latlng) => setCenter(latlng)}
-          onPinClick={onPinClick}
-          pins={visibleMapPins}
-          promptUserLocation={promptUserLocation}
-          setZoom={setZoom}
-          zoom={zoom}
-        />
-      )}
+      <MapContainer
+        allPins={allPins}
+        allToggleFilters={allToggleFilters}
+        notification={notification}
+      />
     </Box>
   )
-})
+}
 
 export default MapsPage
diff --git a/src/pages/Maps/utils/filterPins.ts b/src/pages/Maps/utils/filterPins.ts
index 4bd8d908a4..a341caf04c 100644
--- a/src/pages/Maps/utils/filterPins.ts
+++ b/src/pages/Maps/utils/filterPins.ts
@@ -2,10 +2,11 @@ import type { IMapPin, MapFilterOptionsList } from 'oa-shared'
 
 export const filterPins = (
   activePinFilters: MapFilterOptionsList,
-  allPinsInView: IMapPin[],
+  pins: IMapPin[],
 ): IMapPin[] => {
-  if (activePinFilters.length === 0) return allPinsInView
-
+  if (activePinFilters.length === 0) {
+    return pins
+  }
   const typeFilters = activePinFilters
     .filter(({ filterType }) => filterType === 'profileType')
     .map(({ _id }) => _id)
@@ -13,7 +14,7 @@ export const filterPins = (
   let filteredPins: IMapPin[] = []
 
   if (typeFilters.length > 0) {
-    const profileTypeFilteredList = allPinsInView.filter(
+    const profileTypeFilteredList = pins.filter(
       ({ creator }) =>
         creator?.profileType && typeFilters.includes(creator?.profileType),
     )
@@ -25,7 +26,7 @@ export const filterPins = (
     .map(({ _id }) => _id)
 
   if (tagFilters.length > 0) {
-    const listToFilter = filteredPins.length > 0 ? filteredPins : allPinsInView
+    const listToFilter = filteredPins.length > 0 ? filteredPins : pins
     const tagFilteredList = listToFilter.filter(({ creator }) => {
       const tagIds = creator?.tags?.map(({ _id }) => _id)
       return tagFilters.some((tagId) => tagIds?.includes(tagId))
@@ -38,11 +39,13 @@ export const filterPins = (
     .map(({ _id }) => _id)
 
   if (badgeFilters.length > 0) {
-    const listToFilter = filteredPins.length > 0 ? filteredPins : allPinsInView
+    const listToFilter = filteredPins.length > 0 ? filteredPins : pins
     const badgeFilteredList = listToFilter.filter(({ creator }) => {
       if (!creator?.badges) return
-      const badges = Object.keys(creator?.badges).map((key) => key)
-      return badgeFilters.some((badge) => badges?.includes(badge))
+      const badges = Object.keys(creator?.badges).filter(
+        (key) => creator?.badges && creator.badges[key],
+      )
+      return badgeFilters.filter((badge) => badges.includes(badge)).length > 0
     })
     filteredPins = badgeFilteredList
   }
diff --git a/src/pages/Maps/utils/setDefaultPinFilters.test.ts b/src/pages/Maps/utils/setDefaultPinFilters.test.ts
new file mode 100644
index 0000000000..d8b1b76371
--- /dev/null
+++ b/src/pages/Maps/utils/setDefaultPinFilters.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+
+import { setDefaultPinFilters } from './setDefaultPinFilters'
+
+describe('setDefaultPinFilters', () => {
+  const filterOptions = [
+    {
+      _id: 'workspace',
+      filterType: 'profileType',
+      label: 'Workspace',
+    },
+    {
+      _id: 'member',
+      filterType: 'profileType',
+      label: 'Member',
+    },
+  ]
+
+  it('returns nothing when hideMembers is false', () => {
+    expect(setDefaultPinFilters(filterOptions, false)).toEqual([])
+  })
+
+  it('returns non-member options when hideMembers is true', () => {
+    expect(setDefaultPinFilters(filterOptions, true)).toEqual([
+      filterOptions[0],
+    ])
+  })
+})
diff --git a/src/pages/Maps/utils/setDefaultPinFilters.ts b/src/pages/Maps/utils/setDefaultPinFilters.ts
new file mode 100644
index 0000000000..c34d98e665
--- /dev/null
+++ b/src/pages/Maps/utils/setDefaultPinFilters.ts
@@ -0,0 +1,20 @@
+import { VITE_HIDE_MEMBER_PINS_BY_DEFAULT } from 'src/config/config'
+
+import type { MapFilterOptionsList } from 'oa-shared'
+
+const hideMembersDefault =
+  VITE_HIDE_MEMBER_PINS_BY_DEFAULT === 'true' ? true : false
+
+export const setDefaultPinFilters = (
+  filterOptions: MapFilterOptionsList,
+  hideMembers = hideMembersDefault,
+) => {
+  if (hideMembers) {
+    const options = filterOptions.filter(
+      ({ _id, filterType }) => _id !== 'member' && filterType === 'profileType',
+    )
+    return options
+  }
+
+  return []
+}
diff --git a/src/pages/User/content/SpaceProfile.tsx b/src/pages/User/content/SpaceProfile.tsx
index 7514e545ac..e56c9fa68f 100644
--- a/src/pages/User/content/SpaceProfile.tsx
+++ b/src/pages/User/content/SpaceProfile.tsx
@@ -1,3 +1,4 @@
+import { useLocation } from 'react-router-dom'
 import {
   ImageGallery,
   MemberBadge,
@@ -62,16 +63,21 @@ export const SpaceProfile = ({ user, docs }: IProps) => {
     userImage,
   } = user
 
+  const useLocationHook = useLocation()
+
   const coverImage = getCoverImages(user)
   const hasContributed = docs?.howtos.length + docs?.research.length > 0
   const hasImpacted = !!impact
 
-  const userLinks = links.filter(
-    (linkItem) =>
-      ![ExternalLinkLabel.DISCORD, ExternalLinkLabel.FORUM].includes(
-        linkItem.label,
-      ),
-  )
+  const userLinks =
+    links?.filter(
+      (linkItem) =>
+        ![ExternalLinkLabel.DISCORD, ExternalLinkLabel.FORUM].includes(
+          linkItem.label,
+        ),
+    ) || []
+
+  const defaultValue = useLocationHook?.hash?.slice(1) || 'profile'
 
   return (
     <Card data-cy="SpaceProfile">
@@ -157,16 +163,24 @@ export const SpaceProfile = ({ user, docs }: IProps) => {
             </Flex>
           </Box>
 
-          <Tabs defaultValue={0}>
+          <Tabs defaultValue={defaultValue}>
             <TabsList>
-              <Tab>Profile</Tab>
-              {hasContributed && <Tab data-cy="ContribTab">Contributions</Tab>}
+              <Tab value="profile">Profile</Tab>
+              {hasContributed && (
+                <Tab data-cy="ContribTab" value="contributions">
+                  Contributions
+                </Tab>
+              )}
               {hasImpacted && isPreciousPlastic() && (
-                <Tab data-cy="ImpactTab">{heading}</Tab>
+                <Tab data-cy="ImpactTab" value="impact">
+                  {heading}
+                </Tab>
               )}
-              <Tab data-cy="contact-tab">Contact</Tab>
+              <Tab data-cy="contact-tab" value="contact">
+                Contact
+              </Tab>
             </TabsList>
-            <TabPanel>
+            <TabPanel value="profile">
               <Box sx={{ mt: 1 }}>
                 <Flex
                   sx={{
@@ -223,16 +237,16 @@ export const SpaceProfile = ({ user, docs }: IProps) => {
               </Box>
             </TabPanel>
             {hasContributed && (
-              <TabPanel>
+              <TabPanel value="contributions">
                 <UserCreatedDocuments docs={docs} />
               </TabPanel>
             )}
             {hasImpacted && isPreciousPlastic() && (
-              <TabPanel>
+              <TabPanel value="impact">
                 <Impact impact={impact} user={user} />
               </TabPanel>
             )}
-            <TabPanel>
+            <TabPanel value="contact">
               <Box>
                 <ClientOnly fallback={<></>}>
                   {() => <UserContactForm user={user} />}
diff --git a/src/pages/UserSettings/SettingsPageMapPin.test.tsx b/src/pages/UserSettings/SettingsPageMapPin.test.tsx
index a83779f321..5a9bf368cd 100644
--- a/src/pages/UserSettings/SettingsPageMapPin.test.tsx
+++ b/src/pages/UserSettings/SettingsPageMapPin.test.tsx
@@ -24,7 +24,6 @@ vi.mock('src/common/hooks/useCommonStores', () => ({
       },
       mapsStore: {
         getPin: vi.fn().mockResolvedValue(mockPin),
-        getPinDetail: vi.fn().mockResolvedValue(mockPin),
       },
       themeStore: {
         currentTheme: {
diff --git a/src/stores/Maps/filter.test.ts b/src/stores/Maps/filter.test.ts
deleted file mode 100644
index 1492b19426..0000000000
--- a/src/stores/Maps/filter.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { filterMapPinsByType } from './filter'
-
-import type { IMapPin } from 'oa-shared'
-
-describe('filterMapPinsByType', () => {
-  it('excludes deleted items', () => {
-    const mapPins: Partial<IMapPin>[] = [{ _deleted: true, type: 'member' }]
-    expect(
-      filterMapPinsByType(mapPins as IMapPin[], ['member'], false),
-    ).toHaveLength(0)
-  })
-
-  it('excludes deleted verified items', () => {
-    const mapPins: Partial<IMapPin>[] = [
-      { _deleted: true, type: 'member', verified: true },
-    ]
-    expect(
-      filterMapPinsByType(mapPins as IMapPin[], ['verified'], false),
-    ).toHaveLength(0)
-  })
-
-  it('only returns item which match the filter', () => {
-    const mapPins: Partial<IMapPin>[] = [
-      { _deleted: false, type: 'member' },
-      { _deleted: false, type: 'machine-builder' },
-    ]
-    expect(
-      filterMapPinsByType(mapPins as IMapPin[], ['member'], false),
-    ).toHaveLength(1)
-  })
-
-  it('returns only verified pins', () => {
-    const mapPins: Partial<IMapPin>[] = [
-      { _deleted: false, type: 'collection-point', verified: true },
-      { _deleted: false, type: 'machine-builder' },
-    ]
-    expect(
-      filterMapPinsByType(mapPins as IMapPin[], ['verified'], false),
-    ).toHaveLength(1)
-  })
-
-  it('returns verified pins if they are a member', () => {
-    const mapPins: Partial<IMapPin>[] = [
-      { _deleted: false, type: 'member', verified: true },
-      { _deleted: false, type: 'machine-builder', verified: true },
-    ]
-    expect(
-      filterMapPinsByType(mapPins as IMapPin[], ['verified', 'member'], false),
-    ).toHaveLength(1)
-  })
-})
diff --git a/src/stores/Maps/filter.ts b/src/stores/Maps/filter.ts
deleted file mode 100644
index 4766e43198..0000000000
--- a/src/stores/Maps/filter.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { IMapPin } from 'oa-shared'
-
-// filter pins to include matched pin type or subtype
-// excluding items which have been marked as deleted=true
-export const filterMapPinsByType = (
-  mapPins: IMapPin[],
-  filters: string[],
-  hideMemberPins: boolean,
-) => {
-  const filterList = new Set(filters)
-  let filteredPins = mapPins
-
-  if (filterList.has('verified')) {
-    filteredPins = mapPins.filter((p) => p.verified)
-    filterList.delete('verified')
-  }
-
-  return filteredPins.filter((pin) => {
-    if (filterList.size === 0) {
-      // no filter => remove deleted and hide members if precious-plastic
-      if (hideMemberPins) {
-        return !pin._deleted && pin.type !== 'member'
-      }
-
-      return !pin._deleted
-    }
-
-    return !pin._deleted && filterList.has(pin.subType || pin.type)
-  })
-}
diff --git a/src/stores/Maps/maps.groupings.ts b/src/stores/Maps/maps.groupings.ts
deleted file mode 100644
index 78c725ced9..0000000000
--- a/src/stores/Maps/maps.groupings.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { IPinGrouping } from 'oa-shared'
-import { getSupportedProfileTypes } from 'src/modules/profile'
-import Workspace from 'src/pages/User/workspace/Workspace'
-
-import type { IMapGrouping } from 'oa-shared'
-
-// grouping used (icons will be generated from type in method below)
-export const GROUPINGS: IMapGrouping[] = [
-  {
-    grouping: IPinGrouping.PLACE,
-    displayName: 'Extrusion',
-    type: 'workspace',
-    subType: 'extrusion',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.PLACE,
-    displayName: 'Injection',
-    type: 'workspace',
-    subType: 'injection',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.PLACE,
-    displayName: 'Shredder',
-    type: 'workspace',
-    subType: 'shredder',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.PLACE,
-    displayName: 'Sheetpress',
-    type: 'workspace',
-    subType: 'sheetpress',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.PLACE,
-    displayName: 'Mix',
-    type: 'workspace',
-    subType: 'mix',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.INDIVIDUAL,
-    displayName: 'Collection Point',
-    type: 'collection-point',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.INDIVIDUAL,
-    displayName: 'Machine Shop',
-    type: 'machine-builder',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.INDIVIDUAL,
-    displayName: 'Community Point',
-    type: 'community-builder',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.INDIVIDUAL,
-    displayName: 'Want to get started',
-    type: 'member',
-    icon: '',
-  },
-  {
-    grouping: IPinGrouping.INDIVIDUAL,
-    displayName: 'Space',
-    type: 'space',
-    icon: '',
-  },
-]
-
-const supportedProfileTypes = getSupportedProfileTypes().map(
-  ({ label }) => label,
-)
-
-// merge groupings with icons above for export
-export const MAP_GROUPINGS = GROUPINGS.map((g) => ({
-  ...g,
-  icon: Workspace.findWorkspaceBadge(g.type, true),
-})).filter(({ type }) => supportedProfileTypes.includes(type))
diff --git a/src/stores/Maps/maps.store.ts b/src/stores/Maps/maps.store.ts
index d56b136443..cd6f76a9da 100644
--- a/src/stores/Maps/maps.store.ts
+++ b/src/stores/Maps/maps.store.ts
@@ -3,16 +3,10 @@ import { IModerationStatus, ProfileTypeList } from 'oa-shared'
 import { logger } from 'src/logger'
 import { DEFAULT_PUBLIC_CONTACT_PREFERENCE } from 'src/pages/UserSettings/constants'
 import { getValidTags } from 'src/utils/getValidTags'
-import {
-  hasAdminRights,
-  isAllowedToPin,
-  needsModeration,
-} from 'src/utils/helpers'
+import { hasAdminRights, needsModeration } from 'src/utils/helpers'
 
 import { ModuleStore } from '../common/module.store'
 import { getUserAvatar } from '../User/user.store'
-import { filterMapPinsByType } from './filter'
-import { MAP_GROUPINGS } from './maps.groupings'
 
 import type {
   IMapGrouping,
@@ -22,13 +16,10 @@ import type {
   IUploadedFileMeta,
   IUser,
   IUserDB,
-  ProfileTypeName,
 } from 'oa-shared'
 import type { IDBEndpoint } from 'src/models/dbEndpoints'
 import type { IRootStore } from '../RootStore'
 
-type IFilterToRemove = ProfileTypeName | undefined
-
 const COLLECTION_NAME: IDBEndpoint = 'mappins'
 export class MapsStore extends ModuleStore {
   public activePinFilters: Array<IMapGrouping> = []
@@ -44,17 +35,10 @@ export class MapsStore extends ModuleStore {
       mapPins: observable,
       filteredPins: observable,
       processDBMapPins: action,
-      retrieveMapPins: action,
-      retrievePinFilters: action,
-      setActivePinFilters: action,
-      setActivePin: action,
     })
   }
 
-  public processDBMapPins(
-    pins: IMapPin[],
-    filterToRemove: IFilterToRemove = undefined,
-  ) {
+  public processDBMapPins(pins: IMapPin[]) {
     if (pins.length === 0) {
       this.mapPins = []
       return
@@ -83,68 +67,6 @@ export class MapsStore extends ModuleStore {
         return { ...p, verified: this.aggregationsStore.isVerified(p._id) }
       })
     this.mapPins = pins
-
-    const filters = this.activePinFilters
-      .filter(({ type }) => type !== filterToRemove)
-      .map(({ subType, type }) => (subType ? subType : type))
-    this.setActivePinFilters(filters)
-  }
-
-  public async retrieveMapPins(filterToRemove: IFilterToRemove = undefined) {
-    // TODO: make the function accept a bounding box to reduce load from DB
-
-    if (this.mapPins?.length > 0) {
-      // we already fetched pins
-      return
-    }
-
-    // TODO: the client-side filtering done at `processDBMapPins` should be here
-    this.db.collection<IMapPin>(COLLECTION_NAME).syncLocally(
-      (update) => {
-        this.processDBMapPins(update, filterToRemove)
-      },
-      { keepAlive: false },
-    )
-  }
-
-  public async retrievePinFilters() {
-    // TODO: get from database
-    this.activePinFilters = MAP_GROUPINGS
-  }
-
-  public async setActivePinFilters(filters: Array<string>) {
-    if (filters.length === 0) {
-      this.filteredPins = this.mapPins
-      return
-    }
-
-    const mapPins = filterMapPinsByType(this.mapPins, filters, false)
-    this.filteredPins = mapPins
-  }
-
-  /**
-   * Set the location and id of current active pin, and automatically
-   * generate full pin details from database
-   * @param pin - map pin meta containing location and id for detail lookup
-   * set undefined to remove any active popup
-   */
-  public async setActivePin(pin?: IMapPin | IMapPinWithDetail) {
-    // HACK - CC - 2021-07-14 ignore hardcoded pin details, should be retrieved
-    // from profile on open instead (needs cleaning from DB)
-    if (pin && Object.prototype.hasOwnProperty.call(pin, 'detail')) {
-      delete pin['detail']
-    }
-    this.activePin = pin
-    if (pin) {
-      const pinWithDetail = await this.getPinDetail(pin)
-      this.activePin = pinWithDetail
-    }
-  }
-  // call additional action when pin detail received to inform mobx correctly of update
-  public async getPinDetail(pin: IMapPin) {
-    const detail: IMapPinDetail = await this.getUserProfilePin(pin._id)
-    const pinWithDetail: IMapPinWithDetail = { ...pin, detail }
-    return pinWithDetail
   }
 
   // get base pin geo information
@@ -161,13 +83,6 @@ export class MapsStore extends ModuleStore {
     return needsModeration(pin, this.activeUser as IUser)
   }
 
-  public canSeePin(pin: IMapPin) {
-    return (
-      pin.moderation === IModerationStatus.ACCEPTED ||
-      isAllowedToPin(pin, this.activeUser as IUser)
-    )
-  }
-
   public async setUserPin(user: IUserDB) {
     const {
       _id,