diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html
index 6128538d4e..9dd89937be 100644
--- a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html
+++ b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html
@@ -1 +1,20 @@
+<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+<div class="wp-block-group"
+	style="padding-top:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+	<!-- wp:paragraph {"style":{"layout":{"selfStretch":"fixed","flexSize":"70%"}},"fontSize":"heading-4"} -->
+	<p class="has-heading-4-font-size">If you can't find a WordPress event around your area, you can become an organizer
+		and start hosting WordPress events.</p>
+	<!-- /wp:paragraph -->
+
+	<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right"},"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->
+	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline"} -->
+		<div class="wp-block-button is-style-outline"><a class="wp-block-button__link wp-element-button"
+				href="/organize-an-event/">Become an
+				organizer</a></div>
+		<!-- /wp:button -->
+	</div>
+	<!-- /wp:buttons -->
+</div>
+<!-- /wp:group -->
+
 <!-- wp:wporg/global-footer {"style":"black-on-white"} /-->
diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html
index 376f531513..9822f4109f 100644
--- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html
+++ b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html
@@ -1,7 +1,7 @@
-<!-- wp:group {"className":"wporg-events__meet-community-map-wrapper","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left"}} -->
-<div class="wp-block-group wporg-events__cover">
-	<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"layout":{"selfStretch":"fixed","flexSize":"50%"},"spacing":{"padding":{"top":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"backgroundColor":"charcoal-2","textColor":"white","layout":{"type":"flex","orientation":"vertical","justifyContent":"left","flexWrap":"wrap"}} -->
-	<div class="wp-block-group has-white-color has-charcoal-2-background-color has-text-color has-background has-link-color"
+<!-- wp:group {"backgroundColor":"charcoal-2","className":"wporg-events__cover","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"left"}} -->
+<div class="wp-block-group wporg-events__cover has-charcoal-2-background-color has-background">
+	<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|white"}}},"layout":{"selfStretch":"fixed","flexSize":"50%"},"spacing":{"padding":{"top":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"textColor":"white","className":"wporg-events__cover-stats","layout":{"type":"flex","orientation":"vertical","justifyContent":"left","flexWrap":"wrap"}} -->
+	<div class="wp-block-group wporg-events__cover-stats has-white-color has-text-color has-link-color"
 		style="padding-top:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
 		<!-- wp:heading {"level":1} -->
 		<h1 class="wp-block-heading">Meet the community behind WordPress</h1>
diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html
index da520e1373..c5451c30fc 100644
--- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html
+++ b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html
@@ -5,12 +5,13 @@
 	<h2 class="wp-block-heading has-medium-font-size" style="font-style:normal;font-weight:700">Upcoming Events</h2>
 	<!-- /wp:heading -->
 
-	<!-- wp:wporg/google-map {"filterSlug":"all-upcoming","id":"all-upcoming-list","apiKey":"WORDCAMP_DEV_GOOGLE_MAPS_API_KEY","showMap":false} /-->
+	<!-- wp:wporg/google-map {"id":"all-upcoming-list","apiKey":"WORDCAMP_DEV_GOOGLE_MAPS_API_KEY","filterSlug":"all-upcoming","showMap":false,"showSearch":false,"listDisplayLimit":10} /-->
 
 	<!-- wp:buttons {"style":{"spacing":{"margin":{"top":"var:preset|spacing|40"}}}} -->
 	<div class="wp-block-buttons" style="margin-top:var(--wp--preset--spacing--40)">
 		<!-- wp:button {"className":"is-style-outline"} -->
-		<div class="wp-block-button is-style-outline"><a class="wp-block-button__link wp-element-button">See all
+		<div class="wp-block-button is-style-outline"><a class="wp-block-button__link wp-element-button"
+				href="/upcoming-events/">See all
 				events</a></div>
 		<!-- /wp:button -->
 	</div>
diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/organize.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/organize.html
deleted file mode 100644
index 5db3048102..0000000000
--- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/organize.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- wp:group {"style":{"spacing":{"padding":{"top":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-<div class="wp-block-group"
-	style="padding-top:var(--wp--preset--spacing--edge-space);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
-	<!-- wp:paragraph {"style":{"layout":{"selfStretch":"fixed","flexSize":"70%"}},"fontSize":"heading-4"} -->
-	<p class="has-heading-4-font-size">If you can't find a WordPress event around your area, you can become an organizer
-		and start hosting WordPress events.</p>
-	<!-- /wp:paragraph -->
-
-	<!-- wp:buttons {"layout":{"type":"flex","justifyContent":"right"},"style":{"layout":{"selfStretch":"fill","flexSize":null}}} -->
-	<div class="wp-block-buttons"><!-- wp:button {"className":"is-style-outline"} -->
-		<div class="wp-block-button is-style-outline"><a class="wp-block-button__link wp-element-button">Become an
-				organizer</a></div>
-		<!-- /wp:button -->
-	</div>
-	<!-- /wp:buttons -->
-</div>
-<!-- /wp:group -->
\ No newline at end of file
diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/front-page/cover.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/front-page/cover.pcss
index 44fe1b16c6..8638abdf11 100644
--- a/public_html/wp-content/themes/wporg-events-2023/postcss/front-page/cover.pcss
+++ b/public_html/wp-content/themes/wporg-events-2023/postcss/front-page/cover.pcss
@@ -1,4 +1,13 @@
 .wporg-events__cover {
+	height: 430px;
+	max-height: 80vh;
 	gap: 0;
-	/* also add gap for other block */
+
+	& .wporg-events__cover-stats {
+		gap: 0;
+	}
+
+	& .wp-block-wporg-google-map .wporg-google-map__container {
+		height: 430px;
+	}
 }
diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html
index 3cfd4e696c..d23498ca59 100644
--- a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html
+++ b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html
@@ -7,8 +7,6 @@
 	<!-- wp:template-part {"slug":"front-page/events","theme":"wporg-events-2023"} /-->
 
 	<!-- wp:template-part {"slug":"front-page/contributors","theme":"wporg-events-2023"} /-->
-
-	<!-- wp:template-part {"slug":"front-page/organize","theme":"wporg-events-2023"} /-->
 </main>
 <!-- /wp:group -->
 
diff --git a/public_html/wp-content/themes/wporg-events-2023/theme.json b/public_html/wp-content/themes/wporg-events-2023/theme.json
index 03b7cbbdf5..0da29ef16f 100644
--- a/public_html/wp-content/themes/wporg-events-2023/theme.json
+++ b/public_html/wp-content/themes/wporg-events-2023/theme.json
@@ -1,5 +1,4 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/theme.json",
-	"version": 2,
-	"settings": {}
+	"version": 2
 }