diff --git a/src/app/components/MenuSpace.svelte b/src/app/components/MenuSpace.svelte
index 96bdb330..11263682 100644
--- a/src/app/components/MenuSpace.svelte
+++ b/src/app/components/MenuSpace.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import {onMount} from "svelte"
   import {displayRelayUrl} from "@welshman/util"
-  import {fly, slide} from "@lib/transition"
+  import {fly} from "@lib/transition"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import Popover from "@lib/components/Popover.svelte"
@@ -55,17 +55,6 @@
 
   const addRoom = () => pushModal(RoomCreate, {url}, {replaceState})
 
-  const getDelay = (reset = false) => {
-    if (reset) {
-      delay = 0
-    } else {
-      delay += 50
-    }
-
-    return delay
-  }
-
-  let delay = 0
   let showMenu = false
   let replaceState = false
   let element: Element
@@ -120,53 +109,37 @@
         </Popover>
       {/if}
     </div>
-    <div in:fly={{delay: getDelay(true)}}>
-      <SecondaryNavItem href={makeSpacePath(url)}>
-        <Icon icon="home-smile" /> Home
-      </SecondaryNavItem>
-    </div>
-    <div in:fly={{delay: getDelay()}}>
-      <SecondaryNavItem href={threadsPath} notification={$threadsNotification}>
-        <Icon icon="notes-minimalistic" /> Threads
-      </SecondaryNavItem>
-    </div>
-    <div transition:slide={{delay: getDelay()}}>
-      <div class="h-2" />
-      <SecondaryNavHeader>Your Rooms</SecondaryNavHeader>
-    </div>
-    <div transition:slide={{delay: getDelay()}}>
-      <MenuSpaceRoomItem {url} room={GENERAL} />
-    </div>
+    <SecondaryNavItem href={makeSpacePath(url)}>
+      <Icon icon="home-smile" /> Home
+    </SecondaryNavItem>
+    <SecondaryNavItem href={threadsPath} notification={$threadsNotification}>
+      <Icon icon="notes-minimalistic" /> Threads
+    </SecondaryNavItem>
+    <div class="h-2" />
+    <SecondaryNavHeader>Your Rooms</SecondaryNavHeader>
+    <MenuSpaceRoomItem {url} room={GENERAL} />
     {#each rooms as room, i (room)}
-      <div transition:slide={{delay: getDelay()}}>
-        <MenuSpaceRoomItem {url} {room} />
-      </div>
+      <MenuSpaceRoomItem {url} {room} />
     {/each}
     {#if otherRooms.length > 0}
-      <div transition:slide={{delay: getDelay()}}>
-        <div class="h-2" />
-        <SecondaryNavHeader>
-          {#if rooms.length > 0}
-            Other Rooms
-          {:else}
-            Rooms
-          {/if}
-        </SecondaryNavHeader>
-      </div>
+      <div class="h-2" />
+      <SecondaryNavHeader>
+        {#if rooms.length > 0}
+          Other Rooms
+        {:else}
+          Rooms
+        {/if}
+      </SecondaryNavHeader>
     {/if}
     {#each otherRooms as room, i (room)}
-      <div transition:slide={{delay: getDelay()}}>
-        <SecondaryNavItem href={makeSpacePath(url, room)}>
-          <Icon icon="hashtag" />
-          {room}
-        </SecondaryNavItem>
-      </div>
-    {/each}
-    <div in:fly={{delay: getDelay()}}>
-      <SecondaryNavItem on:click={addRoom}>
-        <Icon icon="add-circle" />
-        Create room
+      <SecondaryNavItem href={makeSpacePath(url, room)}>
+        <Icon icon="hashtag" />
+        {room}
       </SecondaryNavItem>
-    </div>
+    {/each}
+    <SecondaryNavItem on:click={addRoom}>
+      <Icon icon="add-circle" />
+      Create room
+    </SecondaryNavItem>
   </SecondaryNavSection>
 </div>
diff --git a/src/app/components/MenuSpaces.svelte b/src/app/components/MenuSpaces.svelte
index 01b62381..840d996e 100644
--- a/src/app/components/MenuSpaces.svelte
+++ b/src/app/components/MenuSpaces.svelte
@@ -1,15 +1,11 @@
 <script lang="ts">
   import Icon from "@lib/components/Icon.svelte"
-  import Link from "@lib/components/Link.svelte"
   import Button from "@lib/components/Button.svelte"
   import Divider from "@lib/components/Divider.svelte"
   import CardButton from "@lib/components/CardButton.svelte"
-  import SpaceAvatar from "@app/components/SpaceAvatar.svelte"
-  import RelayName from "@app/components/RelayName.svelte"
-  import RelayDescription from "@app/components/RelayDescription.svelte"
+  import MenuSpacesItem from "@app/components/MenuSpacesItem.svelte"
   import SpaceAdd from "@app/components/SpaceAdd.svelte"
   import {userMembership, getMembershipUrls, PLATFORM_RELAY} from "@app/state"
-  import {makeSpacePath} from "@app/routes"
   import {pushModal} from "@app/modal"
 
   const addSpace = () => pushModal(SpaceAdd)
@@ -17,23 +13,11 @@
 
 <div class="column menu gap-2">
   {#if PLATFORM_RELAY}
-    <Link replaceState href={makeSpacePath(PLATFORM_RELAY)}>
-      <CardButton>
-        <div slot="icon"><SpaceAvatar url={PLATFORM_RELAY} /></div>
-        <div slot="title"><RelayName url={PLATFORM_RELAY} /></div>
-        <div slot="info"><RelayDescription url={PLATFORM_RELAY} /></div>
-      </CardButton>
-    </Link>
+    <MenuSpacesItem url={PLATFORM_RELAY} />
     <Divider />
   {:else if getMembershipUrls($userMembership).length > 0}
     {#each getMembershipUrls($userMembership) as url (url)}
-      <Link replaceState href={makeSpacePath(url)}>
-        <CardButton>
-          <div slot="icon"><SpaceAvatar {url} /></div>
-          <div slot="title"><RelayName {url} /></div>
-          <div slot="info"><RelayDescription {url} /></div>
-        </CardButton>
-      </Link>
+      <MenuSpacesItem {url} />
     {/each}
     <Divider />
   {/if}
diff --git a/src/app/components/MenuSpacesItem.svelte b/src/app/components/MenuSpacesItem.svelte
new file mode 100644
index 00000000..9e9df6b5
--- /dev/null
+++ b/src/app/components/MenuSpacesItem.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import Link from "@lib/components/Link.svelte"
+  import CardButton from "@lib/components/CardButton.svelte"
+  import SpaceAvatar from "@app/components/SpaceAvatar.svelte"
+  import RelayName from "@app/components/RelayName.svelte"
+  import RelayDescription from "@app/components/RelayDescription.svelte"
+  import {makeSpacePath} from "@app/routes"
+  import {deriveNotification, SPACE_FILTERS} from "@app/notifications"
+
+  export let url
+
+  const path = makeSpacePath(url)
+  const notification = deriveNotification(path, SPACE_FILTERS, url)
+</script>
+
+<Link replaceState href={path}>
+  <CardButton>
+    <div slot="icon"><SpaceAvatar {url} /></div>
+    <div slot="title" class="flex gap-1">
+      <RelayName {url} />
+      {#if $notification}
+        <div class="relative top-1 h-2 w-2 rounded-full bg-primary" />
+      {/if}
+    </div>
+    <div slot="info"><RelayDescription {url} /></div>
+  </CardButton>
+</Link>
diff --git a/src/app/components/PrimaryNav.svelte b/src/app/components/PrimaryNav.svelte
index 0ea7e1fa..eecfcd34 100644
--- a/src/app/components/PrimaryNav.svelte
+++ b/src/app/components/PrimaryNav.svelte
@@ -9,7 +9,7 @@
   import PrimaryNavItemSpace from "@app/components/PrimaryNavItemSpace.svelte"
   import {userMembership, getMembershipUrls, PLATFORM_RELAY, PLATFORM_LOGO} from "@app/state"
   import {pushModal} from "@app/modal"
-  import {deriveNotification, CHAT_FILTERS} from "@app/notifications"
+  import {deriveNotification, spacesNotification, CHAT_FILTERS} from "@app/notifications"
 
   const chatNotification = deriveNotification("/chat", CHAT_FILTERS)
 
@@ -76,10 +76,10 @@
       <PrimaryNavItem title="Notes" href="/notes">
         <Avatar icon="notes-minimalistic" class="!h-10 !w-10" />
       </PrimaryNavItem>
-      <PrimaryNavItem title="Messages" href="/chat">
+      <PrimaryNavItem title="Messages" href="/chat" notification={$chatNotification}>
         <Avatar icon="letter" class="!h-10 !w-10" />
       </PrimaryNavItem>
-      <PrimaryNavItem title="Spaces" on:click={showSpacesMenu}>
+      <PrimaryNavItem title="Spaces" on:click={showSpacesMenu} notification={$spacesNotification}>
         <Avatar icon="settings-minimalistic" class="!h-10 !w-10" />
       </PrimaryNavItem>
     </div>
diff --git a/src/app/notifications.ts b/src/app/notifications.ts
index e559f8eb..87f49ab0 100644
--- a/src/app/notifications.ts
+++ b/src/app/notifications.ts
@@ -4,7 +4,15 @@ import {repository, pubkey} from "@welshman/app"
 import {prop, max, sortBy, assoc, lt, now} from "@welshman/lib"
 import type {Filter} from "@welshman/util"
 import {DIRECT_MESSAGE} from "@welshman/util"
-import {MESSAGE, THREAD, COMMENT, deriveEventsForUrl} from "@app/state"
+import {makeSpacePath} from "@app/routes"
+import {
+  MESSAGE,
+  THREAD,
+  COMMENT,
+  deriveEventsForUrl,
+  getMembershipUrls,
+  userMembership,
+} from "@app/state"
 
 // Checked state
 
@@ -49,3 +57,16 @@ export const deriveNotification = (path: string, filters: Filter[], url?: string
     },
   )
 }
+
+export const spacesNotification = derived(
+  [pubkey, checked, userMembership, deriveEvents(repository, {filters: SPACE_FILTERS})],
+  ([$pubkey, $checked, $userMembership, $events]) => {
+    return getMembershipUrls($userMembership).some(url => {
+      const path = makeSpacePath(url)
+      const lastChecked = max([$checked["*"], $checked[path]])
+      const [latestEvent] = sortBy($e => -$e.created_at, $events)
+
+      return latestEvent?.pubkey !== $pubkey && lt(lastChecked, latestEvent?.created_at)
+    })
+  },
+)
diff --git a/src/lib/components/Delay.svelte b/src/lib/components/Delay.svelte
deleted file mode 100644
index 19f8f42f..00000000
--- a/src/lib/components/Delay.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script lang="ts">
-  import {sleep} from "@welshman/lib"
-
-  export let delay = 1
-</script>
-
-{#await sleep(delay)}
-  <!-- pass -->
-{:then}
-  <slot />
-{/await}
diff --git a/src/lib/components/PrimaryNavItem.svelte b/src/lib/components/PrimaryNavItem.svelte
index fa791b2c..c3c64db1 100644
--- a/src/lib/components/PrimaryNavItem.svelte
+++ b/src/lib/components/PrimaryNavItem.svelte
@@ -17,10 +17,10 @@
       class:bg-base-300={active}
       class:tooltip={title}
       data-tip={title}>
-      {#if !active && notification}
-        <div class="absolute right-1 top-1 h-2 w-2 rounded-full bg-primary" />
-      {/if}
       <slot />
+      {#if !active && notification}
+        <div class="absolute right-2 top-2 h-2 w-2 rounded-full bg-primary" />
+      {/if}
     </div>
   </a>
 {:else}
@@ -30,10 +30,10 @@
       class:bg-base-300={active}
       class:tooltip={title}
       data-tip={title}>
-      {#if !active && notification}
-        <div class="absolute right-1 top-1 h-2 w-2 rounded-full bg-primary" />
-      {/if}
       <slot />
+      {#if !active && notification}
+        <div class="absolute right-2 top-2 h-2 w-2 rounded-full bg-primary" />
+      {/if}
     </div>
   </Button>
 {/if}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2e2b2136..f25003a7 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -2,6 +2,7 @@
   import "@src/app.css"
   import {onMount} from "svelte"
   import {get, derived} from "svelte/store"
+  import {page} from "$app/stores"
   import {dev} from "$app/environment"
   import {identity, uniq, sleep, take, sortBy, ago, now, HOUR, WEEK, Worker} from "@welshman/lib"
   import type {TrustedEvent} from "@welshman/util"
@@ -229,7 +230,9 @@
 {:then}
   <div data-theme={$theme}>
     <AppContainer>
-      <slot />
+      {#key $page.url.pathname}
+        <slot />
+      {/key}
     </AppContainer>
     <ModalContainer />
     <div class="tippy-target" />
diff --git a/src/routes/chat/+layout.svelte b/src/routes/chat/+layout.svelte
index 7e433b9a..5b0e00ba 100644
--- a/src/routes/chat/+layout.svelte
+++ b/src/routes/chat/+layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import {onMount} from "svelte"
-  import {page} from "$app/stores"
   import {ctx} from "@welshman/lib"
   import {WRAP} from "@welshman/util"
   import type {TrustedEvent} from "@welshman/util"
@@ -56,22 +55,17 @@
     <Icon icon="magnifer" />
     <input bind:value={term} class="grow" type="text" />
   </label>
-  {#key $page.params.chat}
-    <div class="overflow-auto">
-      {#each chats as { id, pubkeys, messages } (id)}
-        <ChatItem {id} {pubkeys} {messages} />
-      {/each}
-      {#await promise}
-        <div class="border-t border-solid border-base-100 px-6 py-4 text-xs">
-          <Spinner loading>Loading conversations...</Spinner>
-        </div>
-      {/await}
-    </div>
-  {/key}
+  <div class="overflow-auto">
+    {#each chats as { id, pubkeys, messages } (id)}
+      <ChatItem {id} {pubkeys} {messages} />
+    {/each}
+    {#await promise}
+      <div class="border-t border-solid border-base-100 px-6 py-4 text-xs">
+        <Spinner loading>Loading conversations...</Spinner>
+      </div>
+    {/await}
+  </div>
 </SecondaryNav>
-
 <Page>
-  {#key JSON.stringify($page.params)}
-    <slot />
-  {/key}
+  <slot />
 </Page>
diff --git a/src/routes/chat/+page.svelte b/src/routes/chat/+page.svelte
index f8ac56b6..3dafbfe5 100644
--- a/src/routes/chat/+page.svelte
+++ b/src/routes/chat/+page.svelte
@@ -1,4 +1,6 @@
 <script lang="ts">
+  import {page} from "$app/stores"
+  import {onDestroy} from "svelte"
   import Icon from "@lib/components/Icon.svelte"
   import Button from "@lib/components/Button.svelte"
   import ContentSearch from "@lib/components/ContentSearch.svelte"
@@ -6,12 +8,17 @@
   import ChatStart from "@app/components/ChatStart.svelte"
   import {chatSearch} from "@app/state"
   import {pushModal} from "@app/modal"
+  import {setChecked} from "@app/notifications"
 
   let term = ""
 
   const startChat = () => pushModal(ChatStart)
 
   $: chats = $chatSearch.searchOptions(term).filter(c => c.pubkeys.length > 1)
+
+  onDestroy(() => {
+    setChecked($page.url.pathname)
+  })
 </script>
 
 <div class="hidden min-h-screen md:hero">
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index 8490ce7e..08e77eed 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -1,16 +1,18 @@
 <script lang="ts">
-  import {onMount, onDestroy} from "svelte"
+  import {onMount} from "svelte"
   import {page} from "$app/stores"
   import Page from "@lib/components/Page.svelte"
-  import Delay from "@lib/components/Delay.svelte"
   import SecondaryNav from "@lib/components/SecondaryNav.svelte"
   import MenuSpace from "@app/components/MenuSpace.svelte"
   import {pushToast} from "@app/toast"
   import {setChecked} from "@app/notifications"
   import {checkRelayConnection, checkRelayAuth} from "@app/commands"
   import {decodeRelay} from "@app/state"
+  import {deriveNotification, SPACE_FILTERS} from "@app/notifications"
 
-  $: url = decodeRelay($page.params.relay)
+  const url = decodeRelay($page.params.relay)
+
+  const notification = deriveNotification($page.url.pathname, SPACE_FILTERS, url)
 
   const ifLet = <T,>(x: T | undefined, f: (x: T) => void) => (x === undefined ? undefined : f(x))
 
@@ -24,24 +26,21 @@
     })
   }
 
+  // We have to watch this one, since on mobile the badge wil be visible when active
+  $: {
+    if ($notification) {
+      setChecked($page.url.pathname)
+    }
+  }
+
   onMount(() => {
     checkConnection()
   })
-
-  onDestroy(() => {
-    setChecked($page.url.pathname)
-  })
 </script>
 
-{#key url}
-  <Delay>
-    <SecondaryNav>
-      <MenuSpace {url} />
-    </SecondaryNav>
-    <Page>
-      {#key $page.params.room}
-        <slot />
-      {/key}
-    </Page>
-  </Delay>
-{/key}
+<SecondaryNav>
+  <MenuSpace {url} />
+</SecondaryNav>
+<Page>
+  <slot />
+</Page>