diff --git a/src/lib/components/Card.css b/src/lib/components/Card.css
index 7918ba2f..fbbdc42d 100644
--- a/src/lib/components/Card.css
+++ b/src/lib/components/Card.css
@@ -1,5 +1,5 @@
 .card {
-	border-radius: 5px;
+	border-radius: 24px;
 	box-shadow: 0px 5px 20px 0px rgb(0, 0, 0, 0.1);
 	background-color: var(--bg-secondary);
 }
diff --git a/src/lib/components/Tabs.svelte b/src/lib/components/Tabs.svelte
index 5677403d..b81fbc9f 100644
--- a/src/lib/components/Tabs.svelte
+++ b/src/lib/components/Tabs.svelte
@@ -42,7 +42,7 @@
 </script>
 
 <div class="tabs-container">
-	<div class="tab-buttons" bind:this={tabButtons}>
+	<div class="tab-buttons" class:tabs-6={tabs.length === 6} bind:this={tabButtons}>
 		{#each tabs as tab, i}
 			<button class="tab-button" class:active={i === activeTab} on:click={() => updateActiveTab(i)}>
 				{tab.title}
@@ -92,16 +92,42 @@
 		text-align: center; /* Center text in tabs */
 	}
 
-	/* Desktop: Remove right border from every 5th tab */
+	/* Desktop: For 6 tabs, adjust flex basis and remove min-width to prevent wrapping */
+	.tab-buttons.tabs-6 .tab-button {
+		flex: 1 1 16.67%; /* 6 tabs per row */
+		min-width: 0; /* Remove min-width to allow all 6 tabs to fit in one row */
+	}
+
+	/* Prevent wrapping for 6 tabs above mobile breakpoint */
+	@media (min-width: 769px) {
+		.tab-buttons.tabs-6 {
+			flex-wrap: nowrap; /* Force all 6 tabs in one row */
+		}
+	}
+
+	/* Desktop: Remove right border from every 5th tab (for 5 tabs) */
 	.tab-button:nth-child(5n) {
 		border-right: none;
 	}
 
-	/* Desktop: Remove bottom border from the last row (if there are 5 tabs or less) */
+	/* Desktop: Override for 6 tabs - remove right border from 6th tab */
+	.tab-buttons.tabs-6 .tab-button:nth-child(5n) {
+		border-right: 1px solid var(--brand-subtle);
+	}
+	.tab-buttons.tabs-6 .tab-button:nth-child(6n) {
+		border-right: none;
+	}
+
+	/* Desktop: Remove bottom border from the last row */
 	.tab-button:nth-last-child(-n + 5) {
 		border-bottom: 2px solid transparent;
 	}
 
+	/* Desktop: For 6 tabs, remove bottom border from all 6 */
+	.tab-buttons.tabs-6 .tab-button:nth-last-child(-n + 6) {
+		border-bottom: 2px solid transparent;
+	}
+
 	.tab-button:hover {
 		background-color: rgba(255, 255, 255, 0.1);
 	}
@@ -114,7 +140,7 @@
 	}
 
 	.tab-contents {
-		padding: var(--spacing-md);
+		padding: var(--spacing-md) var(--spacing-md) var(--spacing-sm) var(--spacing-md);
 	}
 
 	.tab-content {
@@ -141,10 +167,20 @@
 		padding-left: var(--spacing-md);
 	}
 
+	.tab-content :global(ul:last-child),
+	.tab-content :global(ol:last-child),
+	.tab-content :global(p:last-child) {
+		margin-bottom: 0;
+	}
+
 	.tab-content :global(li) {
 		margin-bottom: var(--spacing-xs);
 	}
 
+	.tab-content :global(li:last-child) {
+		margin-bottom: 2;
+	}
+
 	.tab-content :global(a) {
 		color: var(--brand);
 		text-decoration: none;
@@ -154,7 +190,7 @@
 		text-decoration: underline;
 	}
 
-	/* Mobile-specific adjustments: 2 tabs in the first row, 3 tabs in the second row */
+	/* Mobile-specific adjustments */
 	@media (max-width: 768px) {
 		.tab-button {
 			font-size: 0.8rem;
@@ -163,37 +199,68 @@
 			border-bottom: none;
 		}
 
-		/* First row (tabs 1 and 2) */
-		.tab-button:nth-child(-n + 2) {
+		/* For 5 tabs: First row (tabs 1 and 2), Second row (tabs 3, 4, and 5) */
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(-n + 2) {
 			flex: 1 1 50%; /* Make them take half width each */
 			max-width: 50%; /* Ensure they don't grow beyond 50% */
 			border-bottom: 1px solid var(--brand-subtle); /* Add bottom border for the first row */
 		}
 
-		/* Second row (tabs 3, 4, and 5) */
-		.tab-button:nth-child(n + 3) {
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(n + 3) {
 			flex: 1 1 33.33%; /* Make them take roughly one-third width each */
 			max-width: 33.33%; /* Ensure they don't grow beyond 33.33% */
 			min-width: unset; /* Remove min-width to allow shrinking */
 			border-bottom: 2px solid transparent; /* Ensure no bottom border for second row */
 		}
 
-		/* Right borders for the first row */
-		.tab-button:nth-child(odd):nth-child(-n + 2) {
+		/* For 6 tabs: First row (tabs 1, 2, 3), Second row (tabs 4, 5, 6) */
+		.tab-buttons.tabs-6 .tab-button:nth-child(-n + 3) {
+			flex: 1 1 33.33%; /* Make them take one-third width each */
+			max-width: 33.33%; /* Ensure they don't grow beyond 33.33% */
+			border-bottom: 1px solid var(--brand-subtle); /* Add bottom border for the first row */
+		}
+
+		.tab-buttons.tabs-6 .tab-button:nth-child(n + 4) {
+			flex: 1 1 33.33%; /* Make them take one-third width each */
+			max-width: 33.33%; /* Ensure they don't grow beyond 33.33% */
+			min-width: unset; /* Remove min-width to allow shrinking */
+			border-bottom: 2px solid transparent; /* Ensure no bottom border for second row */
+		}
+
+		/* Right borders for 5 tabs - first row */
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(odd):nth-child(-n + 2) {
+			border-right: 1px solid var(--brand-subtle);
+		}
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(even):nth-child(-n + 2) {
+			border-right: none;
+		}
+
+		/* Right borders for 5 tabs - second row */
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(3) {
 			border-right: 1px solid var(--brand-subtle);
 		}
-		.tab-button:nth-child(even):nth-child(-n + 2) {
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(4) {
+			border-right: 1px solid var(--brand-subtle);
+		}
+		.tab-buttons:not(.tabs-6) .tab-button:nth-child(5) {
 			border-right: none;
 		}
 
-		/* Right borders for the second row */
-		.tab-button:nth-child(3) {
+		/* Right borders for 6 tabs - first row */
+		.tab-buttons.tabs-6 .tab-button:nth-child(1),
+		.tab-buttons.tabs-6 .tab-button:nth-child(2) {
 			border-right: 1px solid var(--brand-subtle);
 		}
-		.tab-button:nth-child(4) {
+		.tab-buttons.tabs-6 .tab-button:nth-child(3) {
+			border-right: none;
+		}
+
+		/* Right borders for 6 tabs - second row */
+		.tab-buttons.tabs-6 .tab-button:nth-child(4),
+		.tab-buttons.tabs-6 .tab-button:nth-child(5) {
 			border-right: 1px solid var(--brand-subtle);
 		}
-		.tab-button:nth-child(5) {
+		.tab-buttons.tabs-6 .tab-button:nth-child(6) {
 			border-right: none;
 		}
 	}
diff --git a/src/lib/redirects.ts b/src/lib/redirects.ts
index 7f758b5b..b604b2ba 100644
--- a/src/lib/redirects.ts
+++ b/src/lib/redirects.ts
@@ -18,10 +18,12 @@ const REDIRECTS: Record<string, string> = {
 	'/national-chapters': '/national-groups',
 	'/email': '/email-builder',
 	'/dangers': '/risks',
+	'/events': '/communities',
 	'/polls': '/polls-and-surveys',
 	'/surveys': '/polls-and-surveys',
 	'/stipends': '/volunteer-stipends',
-	'/volunteer-vacancies': '/join#volunteer-vacancies'
+	'/volunteer-vacancies': '/join#volunteer-vacancies',
+	'/find-your-community': '/communities'
 }
 
 /** Temporary redirects (302) - for time-limited campaigns, A/B tests, etc. */
diff --git a/src/posts/action.md b/src/posts/action.md
index 4a7e89c7..926228e5 100644
--- a/src/posts/action.md
+++ b/src/posts/action.md
@@ -7,32 +7,100 @@ description: Ways to help reduce AI risk.
 import Tabs from '$lib/components/Tabs.svelte'
 </script>
 
-AI won't get safer unless we act decisively to push for safety.
-Choose an activity below depending on your interests or skills.
+Everyone has a role to play in building a safer future. Whether you have five minutes or five days, there's something meaningful you can do right now. This page will help you find the actions that work best for you, wherever you are and whatever time you can give.
 
-## Demand government action
+## If you have...
 
-- **Write to your politicians**: We've found emails are surprisingly effective and take relatively little effort. If you don't feel confident about what to write, [start with our email builder](/email-builder). When you get a meeting, you should check out our [lobby tips](/lobby-tips).
-- **Call your politicians**: Try calling legislators' offices while having a set of talking points in view so you stay on topic.
-- **Protest**: Join [one of the protests](https://pauseai.info/protests) or [organize one yourself](https://pauseai.info/organizing-a-protest).
-- **Sign petitions**: [**Ours**](/statement), [Statement on Superintelligence](https://superintelligence-statement.org/), [International AI Treaty](https://aitreaty.org), [Demand responsible AI](https://www.change.org/p/artificial-intelligence-time-is-running-out-for-responsible-ai-development-91f0a02c-130a-46e1-9e55-70d6b274f4df).
-
-## Inform people around you
-
-- **Share about AI risk** on your social media. One of [these videos](https://www.youtube.com/watch?v=xBqU1QxCao8&list=PLI46NoubGtIJa0JVCBR-9CayxCOmU0EJt) or this website can be a good start. And don't forget to tag us in your posts.
-- **Talk to people in your life** about AI safety. Answer their questions, and encourage them to act too. Use our [counterarguments](/counterarguments) to help you be more persuasive.
-- **[Tabling](/tabling) and [flyering](/flyering)** are great ways to reach many people in a short amount of time.
-- **Attend local events**: Many cities have (free / low-cost) events about AI & technology policy. Attending these events is a great way to network and share your concerns.
-
-## Support PauseAI
+<Tabs tabs={[
+{
+title: 'Start Here',
+content: `
 
-- **Join or create a [local PauseAI community](/communities)**.
-- **Join the [Discord](https://discord.gg/T3YrWUJsJ5)**, where most of the collaboration happens.
-- **Protest or participate in [events](/events)**. If no protest is near you, consider [starting one](/organizing-a-protest).
-- **Look over our [vacancies](/vacancies)** to see if any of your skills match our organizational needs. We're often looking for people with experience in social media, communications, organizing, outreach, and software. Some positions are compensated.
-- **[Sign up as a volunteer](/join)** so we can find projects in your interest areas.
-- **[Donate](/donate)** to PauseAI or buy some merchandise in our [store](https://pauseai-shop.fourthwall.com/).
-- **Follow our [social media channels](https://linktr.ee/pauseai)** and stay updated. Your local PauseAI chapter may also have dedicated social media pages.
+<h3>Connect</h3>
+<p>Before diving in, take these quick steps to connect with the movement:</p>
+<ol>
+<li><strong>Sign up via our <a href="/join">Join page</a></strong> so we can stay in touch and connect you with volunteer communities around the world.</li>
+<li><strong>Join the <a href="https://discord.gg/T3YrWUJsJ5">Discord</a></strong>, where most of our day-to-day collaboration happens.</li>
+<li><strong>Find the next Community Onboarding Call</strong> in our <a href="/events">event</a> calendar to meet others who have just joined and hear more about what we do.</li>
+<li><strong><a href="/communities">Find your community</a></strong> and meet other local volunteers to find actions happening specifically in your country or city.</li>
+</ol>
+	`
+},
+{
+	title: '5 Minutes',
+	content: `
+<h3>I have 5 minutes</h3>
+<p>Small actions add up. Here are quick ways to contribute:</p>
+<ul>
+<li>Check out our <a href="https://microcommit.io/onboarding?org=135fcd8d-8116-44af-b885-14df992f9a8c">microcommit page</a> for weekly bite-sized actions</li>
+<li>Make a <a href="/donate">donation</a> or pick up some gear from our <a href="https://pauseai-shop.fourthwall.com/">store</a></li>
+<li>Follow our <a href="https://linktr.ee/pauseai">social media channels</a> to stay updated—your local PauseAI chapter may have dedicated pages too</li>
+<li>Sign the petitions: <a href="/statement">PauseAI petition</a>, <a href="https://superintelligence-statement.org/">Statement on Superintelligence</a>, <a href="https://aitreaty.org">International AI Treaty</a>, <a href="https://www.change.org/p/artificial-intelligence-time-is-running-out-for-responsible-ai-development-91f0a02c-130a-46e1-9e55-70d6b274f4df">Demand Responsible AI</a></li>
+</ul>
+	`
+},
+{
+	title: '1 Hour',
+	content: `
+<h3>I have an hour</h3>
+<p>Ready to go a bit deeper? Start conversations and add your voice:</p>
+<ul>
+<li>Talk to someone in your life about AI safety—a friend, neighbour, colleague, or family member. Our <a href="/counterarguments">counterarguments guide</a> can help you answer tough questions and encourage others to act</li>
+<li>Share about AI risk on your social media. One of <a href="https://www.youtube.com/watch?v=xBqU1QxCao8&list=PLI46NoubGtIJa0JVCBR-9CayxCOmU0EJt">these videos</a> or this website can be a good start. And don't forget to tag us in your posts</li>
+</ul>
+	`
+},
+{
+	title: 'A Few Hours',
+	content: `
+<h3>I have a few hours</h3>
+<p>Make your voice heard where it counts:</p>
+<ul>
+<li><strong>Write to your elected representatives</strong> using our email tools:
+	<ul>
+	<li><a href="/writing-a-letter">Writing a Letter</a></li>
+	<li><a href="/uk-email-mp">Emailing your UK MP</a></li>
+	<li><a href="/email-builder">Email Builder</a></li>
+	</ul>
+</li>
+<li><strong>Call your politicians</strong>: Try calling legislators' offices while having a set of talking points in view so you stay on topic</li>
+<li>Follow up with a phone call, and when you secure a meeting, check out our <a href="/lobby-tips">lobby tips</a></li>
+<li>Take a deep dive into our <a href="/learn">educational materials</a> to build your knowledge</li>
+</ul>
+	`
+},
+{
+	title: '1 Day',
+	content: `
+<h3>I have a day</h3>
+<p>Get out into the world and bring others along:</p>
+<ul>
+<li><strong>Attend one of our <a href="/events">upcoming events</a></strong>—or if there isn't one near you, organise your own:
+	<ul>
+	<li><a href="/organizing-a-protest">Protests</a></li>
+	<li><a href="/local-organizing#letter-to-the-editor-writing-workshops">Workshops</a></li>
+	<li><a href="/local-organizing#social-events--having-drinks">Social meetups</a></li>
+	</ul>
+</li>
+<li>Try <a href="/tabling">tabling</a> or <a href="/flyering">flyering</a>—great ways to reach many people in a short time</li>
+<li><strong>Attend local events</strong>: Many cities have (free / low-cost) events about AI & technology policy. Attending these events is a great way to network and share your concerns</li>
+</ul>
+	`
+},
+{
+	title: 'Go All In',
+	content: `
+<h3>I want to go all in</h3>
+<p>Ready to make PauseAI a serious part of your life? We'd love to have you:</p>
+<ul>
+<li>Apply for a <a href="/microgrants">microgrant</a> to fund your own initiative</li>
+<li>Apply for a <a href="/volunteer-stipends">volunteer stipend</a> to support sustained involvement</li>
+<li><a href="/communities">Set up a local chapter</a> or get deeply involved in an existing one</li>
+<li>Check our <a href="/vacancies">paid</a> and <a href="/volunteer-vacancies">volunteer</a> vacancies for open roles</li>
+</ul>
+	`
+}
+]} />
 
 ## If you are a...
 
diff --git a/src/posts/events.md b/src/posts/events.md
deleted file mode 100644
index bc5d5c8b..00000000
--- a/src/posts/events.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-title: PauseAI Events
-description: Meetings, workshops, protests, and more!
----
-
-## View all events [here](https://lu.ma/PauseAI)
-
-<iframe
-  src="https://lu.ma/embed/calendar/cal-E1qhLPs5IvlQr8S/events?"
-  height="450"
-  frameborder="0"
-  style="border: 1px solid #bfcbda88; border-radius: 4px; width: 100%;"
-  allowfullscreen="true"
-  aria-hidden="false"
-  tabindex="0"
-></iframe>
-
-## Create an event
-
-If you want to organize an event, please [create an event on lu.ma](https://lu.ma/create) and press the "submit event" button on [our calendar page](https://lu.ma/PauseAI).
-
-Read more about [local organizing](/local-organizing).
diff --git a/src/posts/organization.md b/src/posts/organization.md
index e742d0f8..782091b4 100644
--- a/src/posts/organization.md
+++ b/src/posts/organization.md
@@ -8,7 +8,7 @@ description: How the PauseAI organization is structured, and what resources are
 - [Legal entities](/legal): PauseAI consists of one international entity (PauseAI Global), and several local / national legal entities. This website and the social media accounts are managed by the international entity.
 - [National groups](/national-groups): National PauseAI groups are hubs that typically manage their own local communities, and are responsible for national-level strategy and coordination. They typically have their own website, social media accounts and legal entity. National leaders meet regularly to coordinate their work.
 - [Teams](/teams): Teams are groups of volunteers who work on specific projects or tasks within PauseAI Global. Every team has its own leader, Discord channel, Drive folder and of course list of members. Reach out to a team leader to join a team!
-- [Local communities](/communities): Check if there already exists a community in your area. Most groups are communicating in our discord server. Some groups are using tools like WhatsApp or a separate Discord server.
+- [Communities](/communities): Check if there already exists a community in your area. Most groups are communicating in our discord server. Some groups are using tools like WhatsApp or a separate Discord server.
 
 ![Organagram](/org.png)
 
diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte
index 49bea776..53726f4f 100644
--- a/src/routes/communities/+page.svelte
+++ b/src/routes/communities/+page.svelte
@@ -126,16 +126,17 @@
 <PostMeta {title} {description} {date} />
 
 <h1>{title}</h1>
-<p>{description}</p>
 <p>
-	Do you want to add your location or a community? <Link href="https://discord.gg/CR5u5BTBwy"
-		>Create a post</Link
-	> on our Discord!
+	PauseAI Global has chapters and local communities across the world. These communities are groups
+	of individuals that care about the future and agree a <Link href="/proposal"
+		>pause is the solution</Link
+	>. They work together to educate members of the public and their political representatives about
+	the <Link href="/risks">risks</Link>.
 </p>
+
 <p>
-	Do you want to start a community? Check our <Link href="https://pauseai.info/local-organizing"
-		>Guide on local organizing</Link
-	>
+	If you're looking for a group closer to home, check out our map below to find the people nearest
+	to you. The map also includes adjacent AI Safety communities in grey.
 </p>
 <div>
 	<div class="map-wrap">
@@ -144,11 +145,42 @@
 </div>
 <CommunitiesList {communities} />
 
+<p>
+	Can't find a community near you and want to lead the way? Learn how to do it <Link
+		href="/national-groups#how-to-set-up-a-pauseai-national-group">here</Link
+	>.
+</p>
+
+<h2>Events</h2>
+
+<p>Interested in attending a PauseAI community event? Find one below.</p>
+
+<iframe
+	src="https://lu.ma/embed/calendar/cal-E1qhLPs5IvlQr8S/events?"
+	height="450"
+	frameborder="0"
+	style="border: 1px solid #bfcbda88; border-radius: 24px; width: 100%;"
+	allowfullscreen
+	aria-hidden="false"
+	title="PauseAI Events Calendar"
+></iframe>
+
+<p>
+	Find the full list of events <Link href="https://lu.ma/PauseAI">here</Link>.
+</p>
+
+<p>
+	If you want to organize an event, please create an event on Luma and press the "submit event"
+	button on <Link href="https://lu.ma/PauseAI">our calendar page</Link>.
+</p>
+
 <style>
 	.map-wrap {
 		position: relative;
 		padding-bottom: 56.25%; /* 16:9 */
 		overflow: hidden;
+		border-radius: 24px;
+		border: 1px solid var(--text-subtle);
 	}
 
 	.map {
@@ -156,4 +188,24 @@
 		width: 100%;
 		height: 100%;
 	}
+
+	:global(.maplibregl-ctrl-group) {
+		border-radius: 24px !important;
+		border: 1px solid var(--text-subtle) !important;
+		overflow: hidden;
+	}
+
+	:global(.maplibregl-ctrl-group button) {
+		border-radius: 0 !important;
+	}
+
+	:global(.maplibregl-ctrl-group button:first-child) {
+		border-top-left-radius: 24px !important;
+		border-top-right-radius: 24px !important;
+	}
+
+	:global(.maplibregl-ctrl-group button:last-child) {
+		border-bottom-left-radius: 24px !important;
+		border-bottom-right-radius: 24px !important;
+	}
 </style>
diff --git a/src/routes/communities/CommunitiesList.svelte b/src/routes/communities/CommunitiesList.svelte
index 10ece4c8..5937cc51 100644
--- a/src/routes/communities/CommunitiesList.svelte
+++ b/src/routes/communities/CommunitiesList.svelte
@@ -1,9 +1,19 @@
 <script lang="ts">
 	import type { Community } from './communities'
 	import Link from '$lib/components/Link.svelte'
+	import LinkWithoutIcon from '$lib/components/LinkWithoutIcon.svelte'
+	import { onMount } from 'svelte'
+	import { loadNationalGroups } from '$lib/stores/nationalGroups'
+	import type { NationalGroup } from '$lib/types'
 
 	export let communities: Community[] = []
 
+	let nationalGroups: NationalGroup[] = []
+
+	onMount(async () => {
+		nationalGroups = await loadNationalGroups()
+	})
+
 	// Group local communities by their country/national community
 	const groupedCommunities = communities
 		.filter((community) => community.type === 'local')
@@ -40,29 +50,202 @@
 		},
 		{} as Record<string, string>
 	)
+
+	// Start with all countries collapsed by default
+	let expandedCountries: Set<string> = new Set()
+
+	function toggleCountry(country: string) {
+		const newSet = new Set(expandedCountries)
+		if (newSet.has(country)) {
+			newSet.delete(country)
+		} else {
+			newSet.add(country)
+		}
+		expandedCountries = newSet
+	}
+
+	function getCountryImage(countryName: string): string {
+		const group = nationalGroups.find((g) => g.name.toLowerCase() === countryName.toLowerCase())
+		return group?.image || '/images/default.png'
+	}
 </script>
 
-<div class="prose">
-	<ul>
+<div class="communities-container">
+	<div class="grid">
 		{#each sortedNationalities as nationality}
-			<li>
-				<strong>
-					{#if nationalLinks[nationality]}
-						<Link href={nationalLinks[nationality]}>{nationality}</Link>
-					{:else}
-						{nationality}
-					{/if}
-				</strong>
-				{#if groupedCommunities[nationality] && groupedCommunities[nationality].length > 0}
-					<ul>
-						{#each groupedCommunities[nationality].sort( (a, b) => a.name.localeCompare(b.name) ) as localCommunity}
-							<li>
-								<Link href={localCommunity.link}>{localCommunity.name}</Link>
-							</li>
+			{@const localCommunities = groupedCommunities[nationality] || []}
+			{@const imageUrl = getCountryImage(nationality)}
+			<div class="country-card">
+				<button
+					class="country-header"
+					class:expanded={expandedCountries.has(nationality)}
+					class:has-communities={localCommunities.length > 0}
+					on:click={() => toggleCountry(nationality)}
+				>
+					<div class="icon" class:is-open={expandedCountries.has(nationality)}>
+						{#if localCommunities.length > 0}
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								width="24"
+								height="24"
+								viewBox="0 0 24 24"
+								fill="none"
+								stroke="currentColor"
+								stroke-width="3"
+								stroke-linecap="round"
+								stroke-linejoin="round"
+							>
+								<polyline points="6 9 12 15 18 9"></polyline>
+							</svg>
+						{:else}
+							<!-- Placeholder for alignment if no communities/arrow -->
+							<div style="width: 24px;"></div>
+						{/if}
+					</div>
+
+					<div class="image-name-wrapper">
+						<img src={imageUrl} alt={nationality} class="country-image" />
+						<span class="country-name">
+							{#if nationalLinks[nationality]}
+								<Link href={nationalLinks[nationality]}>{nationality}</Link>
+							{:else}
+								{nationality}
+							{/if}
+						</span>
+					</div>
+				</button>
+				{#if expandedCountries.has(nationality) && localCommunities.length > 0}
+					<div class="local-communities">
+						{#each localCommunities.sort((a, b) => a.name.localeCompare(b.name)) as localCommunity}
+							<LinkWithoutIcon
+								href={localCommunity.link}
+								class="local-link"
+								target="_blank"
+								rel="noopener noreferrer"
+							>
+								{localCommunity.name}
+							</LinkWithoutIcon>
 						{/each}
-					</ul>
+					</div>
 				{/if}
-			</li>
+			</div>
 		{/each}
-	</ul>
+	</div>
 </div>
+
+<style>
+	.communities-container {
+		margin-top: 2rem;
+	}
+
+	.grid {
+		display: grid;
+		grid-template-columns: repeat(3, 1fr);
+		gap: 0.5rem;
+	}
+
+	.country-card {
+		/* Removed border and background for "No boxes" look */
+		overflow: hidden;
+		transition: transform 0.2s;
+	}
+
+	.country-header {
+		width: 100%;
+		padding: 0.5rem;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		gap: 0.5rem;
+		background: none;
+		border: none;
+		cursor: pointer;
+		text-align: left;
+		font-size: 0.95rem;
+		color: var(--text);
+		border-radius: 8px;
+		transition: background-color 0.2s;
+	}
+
+	.country-header:hover {
+		background-color: var(--bg-subtle);
+	}
+
+	.country-header.has-communities:hover {
+		background-color: var(--bg-subtle);
+	}
+
+	.country-header.expanded {
+		background-color: var(--bg-subtle);
+	}
+
+	.icon {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: var(--text-1);
+		transition: transform 0.2s ease;
+		flex-shrink: 0;
+		opacity: 0.7;
+		width: 24px;
+	}
+
+	.icon.is-open {
+		transform: rotate(180deg);
+		opacity: 1;
+	}
+
+	.image-name-wrapper {
+		display: flex;
+		align-items: center;
+		flex-grow: 1;
+		gap: 0.5rem;
+	}
+
+	.country-image {
+		width: 32px;
+		height: 32px;
+		object-fit: cover;
+		border-radius: 50%;
+	}
+
+	.country-name {
+		font-weight: 600;
+		font-size: 1.1rem;
+		min-width: 0;
+	}
+
+	.country-name :global(a) {
+		text-decoration: none;
+		color: inherit;
+	}
+
+	.country-name :global(a:hover) {
+		text-decoration: underline;
+	}
+
+	.local-communities {
+		padding: 0 0.5rem 0.5rem 3rem; /* Indent to align with text */
+		display: flex;
+		flex-direction: column;
+		gap: 0.25rem;
+	}
+
+	:global(.local-link) {
+		padding: 0.2rem 0;
+		text-decoration: none;
+		color: var(--primary); /* Use primary color for links */
+		font-size: 0.9rem;
+		display: block;
+	}
+
+	:global(.local-link:hover) {
+		text-decoration: underline;
+	}
+
+	@media (max-width: 768px) {
+		.grid {
+			grid-template-columns: 1fr;
+		}
+	}
+</style>
diff --git a/src/routes/communities/communities.ts b/src/routes/communities/communities.ts
index d8a6b0d4..0a67438b 100644
--- a/src/routes/communities/communities.ts
+++ b/src/routes/communities/communities.ts
@@ -21,9 +21,8 @@ export type Community = RawCommunity & {
 }
 
 export const communitiesMeta: Post = {
-	title: 'PauseAI Local Communities',
-	description:
-		'A map of all the local PauseAI communities and people around the world. Also shows adjacent AI Safety communities.',
+	title: 'Find your PauseAI Community',
+	description: 'A map of all PauseAI communities, people and events around the world.',
 	date: '2023-12-15',
 	slug: 'communities',
 	categories: []
diff --git a/src/routes/communities/national-chapters.json b/src/routes/communities/national-chapters.json
index 904b339d..814b9e31 100644
--- a/src/routes/communities/national-chapters.json
+++ b/src/routes/communities/national-chapters.json
@@ -1,91 +1,91 @@
 {
 	"communities": [
 		{
-			"name": "PauseAI Netherlands",
+			"name": "Nederland",
 			"lat": 52,
 			"lon": 5.6,
 			"link": "https://chat.whatsapp.com/EOGvhoPCiCqDqwuf9JUxtB"
 		},
 		{
-			"name": "PauseAI Serbia",
+			"name": "Srbija",
 			"lat": 44,
 			"lon": 21,
 			"link": "https://www.facebook.com/PauseAISerbia"
 		},
 		{
-			"name": "PauseAI UK",
+			"name": "United Kingdom",
 			"lat": 54.2,
 			"lon": -2.4,
 			"link": "https://x.com/PauseAI_UK"
 		},
 		{
-			"name": "PauseAI France",
+			"name": "France",
 			"lat": 47.8,
 			"lon": 2.6,
 			"link": "$$DISCORD_FRANCE$$"
 		},
 		{
-			"name": "PauseAI Canada",
+			"name": "Canada",
 			"lat": 56,
 			"lon": -105,
 			"link": "https://pauseai.ca/"
 		},
 		{
-			"name": "PauseAI Romania",
+			"name": "România",
 			"lat": 44.5,
 			"lon": 26,
 			"link": "https://www.facebook.com/people/Pause-AI-Romania/61581783381263/?rdid=LfnCxIeWHG9TL4Bp&share_url=https%3A%2F%2Fwww.facebook.com%2Fshare%2F19yinn6qj4%2F"
 		},
 		{
-			"name": "PauseAI Kenya",
+			"name": "Kenya",
 			"lat": 0.5,
 			"lon": 38,
 			"link": "https://x.com/Pauseaikenya"
 		},
 		{
-			"name": "PauseAI España",
+			"name": "España",
 			"lat": 41.3,
 			"lon": -4,
 			"link": "https://chat.whatsapp.com/KEgD22LEo6xEVvjH4fD8br"
 		},
 		{
-			"name": "PauseAI Australia",
+			"name": "Australia",
 			"lat": -25,
 			"lon": 134.5,
 			"link": "https://www.facebook.com/groups/571590459293618/"
 		},
 		{
-			"name": "PauseAI Germany",
+			"name": "Deutschland",
 			"lat": 51.1,
 			"lon": 10,
 			"link": "$$DISCORD_GERMANY$$"
 		},
 		{
-			"name": "PauseAI US",
+			"name": "United States",
 			"lat": 39.5,
 			"lon": -98,
 			"link": "$$WEBSITE_US$$"
 		},
 		{
-			"name": "PauseAI Czechia",
+			"name": "Czechia",
 			"lat": 50,
 			"lon": 15,
 			"link": "https://discord.gg/4rZ2nGZB3r"
 		},
 		{
-			"name": "PauseAI Polonia",
+			"name": "Polska",
 			"lat": 52,
 			"lon": 19.5,
 			"link": "mailto:patryk@pauseai.info"
 		},
 		{
-			"name": "PauseAI Nigeria",
+			"name": "Nigeria",
 			"lat": 9.5,
 			"lon": 8,
 			"link": "https://chat.whatsapp.com/L4o2IiOX1HI2GWQi0J9ZJv"
 		},
 		{
-			"name": "PauseAI Sweden",
+			"name": "Sverige",
 			"lat": 65,
 			"lon": 17,
 			"link": "mailto:carl@pauseai.info"
diff --git a/src/routes/communities/pauseai-communities.json b/src/routes/communities/pauseai-communities.json
index b23ae781..b52aac09 100644
--- a/src/routes/communities/pauseai-communities.json
+++ b/src/routes/communities/pauseai-communities.json
@@ -5,35 +5,35 @@
 			"lat": 52.09073739999999,
 			"lon": 5.081420100000023,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Netherlands"
+			"parent_name": "Nederland"
 		},
 		{
 			"name": "Nottingham",
 			"lat": 52.9548,
 			"lon": -1.1581,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Oldenburg",
 			"lat": 53.1412,
 			"lon": 8.2146,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Edinburgh",
 			"lat": 55.9533,
 			"lon": -3.1883,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Manchester",
 			"lat": 53.4808,
 			"lon": -2.2426,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Copenhagen",
@@ -46,7 +46,7 @@
 			"lat": 51.5073509,
 			"lon": -0.12775829999998223,
 			"link": "https://chat.whatsapp.com/CkkycjLr6H96lEzJs2ezox",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Rosario",
@@ -59,42 +59,42 @@
 			"lat": 48.3705,
 			"lon": 10.8978,
 			"link": "$$DISCORD_GERMANY$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Paris",
 			"lat": 48.8647,
 			"lon": 2.349,
 			"link": "$$DISCORD_FRANCE$$",
-			"parent_name": "PauseAI France"
+			"parent_name": "France"
 		},
 		{
 			"name": "Montreal",
 			"lat": 45.5088,
 			"lon": -73.5616,
 			"link": "https://pauseai.ca/montreal.html",
-			"parent_name": "PauseAI Canada"
+			"parent_name": "Canada"
 		},
 		{
 			"name": "Nairobi",
 			"lat": -1.286389,
 			"lon": 36.817223,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Kenya"
+			"parent_name": "Kenya"
 		},
 		{
 			"name": "Stockholm",
 			"lat": 59.3293,
 			"lon": 18.0686,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Sweden"
+			"parent_name": "Sverige"
 		},
 		{
 			"name": "Marseille",
 			"lat": 43.2963,
 			"lon": 5.37,
 			"link": "$$DISCORD_FRANCE$$",
-			"parent_name": "PauseAI France"
+			"parent_name": "France"
 		},
 		{
 			"name": "São Paulo",
@@ -119,7 +119,7 @@
 			"lat": 52.52,
 			"lon": 13.405,
 			"link": "https://t.me/+12wemb6BZuQyNjVi",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Rome",
@@ -132,28 +132,28 @@
 			"lat": 43.6511,
 			"lon": -79.347,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Canada"
+			"parent_name": "Canada"
 		},
 		{
 			"name": "Amsterdam",
 			"lat": 52.378,
 			"lon": 4.8971,
 			"link": "https://chat.whatsapp.com/EOGvhoPCiCqDqwuf9JUxtB",
-			"parent_name": "PauseAI Netherlands"
+			"parent_name": "Nederland"
 		},
 		{
 			"name": "Munich",
 			"lat": 48.1372,
 			"lon": 11.5761,
 			"link": "$$DISCORD_GERMANY$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Cambridge",
 			"lat": 52.2053,
 			"lon": 0.1192,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Hanoi",
@@ -166,42 +166,42 @@
 			"lat": 54.5168,
 			"lon": 18.5419,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Poland"
+			"parent_name": "Polska"
 		},
 		{
 			"name": "Madrid",
 			"lat": 40.4168,
 			"lon": -3.7038,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI España"
+			"parent_name": "España"
 		},
 		{
 			"name": "Blackpool",
 			"lat": 53.8159,
 			"lon": -3.0553,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI UK"
+			"parent_name": "United Kingdom"
 		},
 		{
 			"name": "Vancouver",
 			"lat": 49.2463,
 			"lon": -123.1162,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Canada"
+			"parent_name": "Canada"
 		},
 		{
 			"name": "Melbourne",
 			"lat": -37.8136,
 			"lon": 144.9631,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Australia"
+			"parent_name": "Australia"
 		},
 		{
 			"name": "Hamburg",
 			"lat": 53.5511,
 			"lon": 9.9937,
 			"link": "$$DISCORD_GERMANY$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Zurich",
@@ -214,7 +214,7 @@
 			"lat": 52.2681,
 			"lon": 8.0566,
 			"link": "$$DISCORD_GERMANY$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Milan",
@@ -227,7 +227,7 @@
 			"lat": 50.0647,
 			"lon": 19.945,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Poland"
+			"parent_name": "Polska"
 		},
 		{
 			"name": "Yaoundé",
@@ -264,7 +264,7 @@
 			"lat": 50.0755,
 			"lon": 14.4378,
 			"link": "https://discord.gg/4rZ2nGZB3r",
-			"parent_name": "PauseAI Czechia"
+			"parent_name": "Czechia"
 		},
 		{
 			"name": "Santiago",
@@ -283,28 +283,28 @@
 			"lat": 51.4872,
 			"lon": 11.9656,
 			"link": "https://t.me/+tobhhF27liwyMjhi",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Munster",
 			"lat": 51.9612,
 			"lon": 7.6282,
 			"link": "$$DISCORD_GERMANY$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Freiburg",
 			"lat": 48,
 			"lon": 7.8333,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Canberra",
 			"lat": -35.2809,
 			"lon": 149.13,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Australia"
+			"parent_name": "Australia"
 		},
 		{
 			"name": "Hispanohablantes",
@@ -317,14 +317,14 @@
 			"lat": -41.433349,
 			"lon": 147.123323,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Australia"
+			"parent_name": "Australia"
 		},
 		{
 			"name": "Rostock",
 			"lat": 54.18,
 			"lon": 12.08,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI Germany"
+			"parent_name": "Deutschland"
 		},
 		{
 			"name": "Manila",
@@ -355,7 +355,7 @@
 			"lat": -21.115,
 			"lon": 55.533,
 			"link": "$$DISCORD_GLOBAL$$",
-			"parent_name": "PauseAI France"
+			"parent_name": "France"
 		},
 		{
 			"name": "Veszprém",
@@ -368,217 +368,217 @@
 			"lat": 33.4484,
 			"lon": -112.074,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Las Positas College (Livermore)",
 			"lat": 37.6185,
 			"lon": -121.7639,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "San Diego",
 			"lat": 32.7157,
 			"lon": -117.1611,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "San Francisco",
 			"lat": 37.7749,
 			"lon": -122.4194,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "UC Santa Barbara",
 			"lat": 34.414,
 			"lon": -119.8489,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Stanford",
 			"lat": 37.4275,
 			"lon": -122.1697,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "UC Boulder",
 			"lat": 40.0076,
 			"lon": -105.2659,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Denver",
 			"lat": 39.7392,
 			"lon": -104.9903,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Hartford",
 			"lat": 41.7658,
 			"lon": -72.6734,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Washington DC",
 			"lat": 38.9072,
 			"lon": -77.0369,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Orlando",
 			"lat": 28.5383,
 			"lon": -81.3792,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Atlanta",
 			"lat": 33.749,
 			"lon": -84.388,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Boise",
 			"lat": 43.615,
 			"lon": -116.2023,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Lawrence",
 			"lat": 38.9717,
 			"lon": -95.2353,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Boston",
 			"lat": 42.3601,
 			"lon": -71.0589,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Queen Anne's County",
 			"lat": 39.0379,
 			"lon": -75.9577,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Grand Rapids",
 			"lat": 42.9634,
 			"lon": -85.6681,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Washington University (Saint Louis)",
 			"lat": 38.6488,
 			"lon": -90.3108,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Jersey City",
 			"lat": 40.7178,
 			"lon": -74.0431,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Reno",
 			"lat": 39.5296,
 			"lon": -119.8138,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "New York City",
 			"lat": 40.7128,
 			"lon": -74.006,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Columbus",
 			"lat": 39.9612,
 			"lon": -82.9988,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Dayton",
 			"lat": 39.7589,
 			"lon": -84.1916,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Portland",
 			"lat": 45.5051,
 			"lon": -122.675,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Philadelphia",
 			"lat": 39.9526,
 			"lon": -75.1652,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Pittsburgh",
 			"lat": 40.4406,
 			"lon": -79.9959,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Providence",
 			"lat": 41.824,
 			"lon": -71.4128,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Vanderbilt University (Nashville)",
 			"lat": 36.1447,
 			"lon": -86.8027,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Austin",
 			"lat": 30.2672,
 			"lon": -97.7431,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Houston",
 			"lat": 29.7604,
 			"lon": -95.3698,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		},
 		{
 			"name": "Seattle",
 			"lat": 47.6062,
 			"lon": -122.3321,
 			"link": "$$WEBSITE_US$$",
-			"parent_name": "PauseAI US"
+			"parent_name": "United States"
 		}
 	]
 }
diff --git a/src/routes/header.svelte b/src/routes/header.svelte
index 682d81da..67b5e762 100644
--- a/src/routes/header.svelte
+++ b/src/routes/header.svelte
@@ -13,17 +13,12 @@
 </script>
 
 <Navbar {inverted} {moveUp}>
-	<Navlink {inverted} first href="/learn">{m.header_learn()}</Navlink>
+	<Navlink {inverted} first href="/join">{m.header_join()}</Navlink>
+	<Navlink {inverted} href="/about">About Us</Navlink>
+	<Navlink {inverted} href="/learn">{m.header_learn()}</Navlink>
 	<Navlink {inverted} href="/proposal">{m.header_proposal()}</Navlink>
-	<Navlink {inverted} href="/events">{m.header_events()}</Navlink>
-	<Navlink {inverted} href="/faq">{m.header_faq()}</Navlink>
-	<Navlink {inverted} href="/action">{m.header_action()}</Navlink>
-	<Navlink {inverted} href="/donate">{m.header_donate()}</Navlink>
-	{#if enableBot}
-		<Navlink {inverted} href="/chat">{botName}</Navlink>
-	{/if}
-	<!-- <NavLink href="/about">About</NavLink> -->
-	<Navlink {inverted} c2a href="/join">{m.header_join()}</Navlink>
+	<Navlink {inverted} href="/action">Act</Navlink>
+	<Navlink {inverted} href="/communities">Groups</Navlink>
 	<LanguageSwitcher {inverted} />
 	<Navlink {inverted} href="/search" ariaLabel="Search"><SearchIcon size="0.8em" /></Navlink>
 </Navbar>