diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1f6405..43fa75e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## Fixed
+
+* Improved admin UI for event-category mapping
+
 ## [0.2.1] - 2024-11-16
 
 ### Added
diff --git a/assets/css/activitypub-event-bridge-admin.css b/assets/css/activitypub-event-bridge-admin.css
index c89ec6e..0b8c58d 100644
--- a/assets/css/activitypub-event-bridge-admin.css
+++ b/assets/css/activitypub-event-bridge-admin.css
@@ -177,3 +177,9 @@ code.activitypub-event-bridge-settings-example-url {
 	overflow-x: auto;
 	word-break: break-all;
 }
+
+.activitypub-event-bridge-settings .select-cell::before {
+    content: "\21D2";
+    margin-right: 8px;
+    color: inherit;
+}
diff --git a/templates/settings.php b/templates/settings.php
index 309590f..725252c 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -62,13 +62,17 @@ $current_category_mapping        = \get_option( 'activitypub_event_bridge_event_
 			</table>
 
 			<?php if ( ! empty( $event_terms ) ) : ?>
-			<h3> <?php esc_html_e( 'Advanced Event Category Settings', 'activitypub-event-bridge' ); ?> </h3>
-			<p> <?php esc_html_e( 'Take more control by adjusting how your event categories are mapped to the basic category set used in ActivityPub. This option lets you override the default selection above, ensuring more accurate categorization and better visibility for your events.', 'activitypub-event-bridge' ); ?> </p>
+			<h3> <?php esc_html_e( 'Fine-grained Event Category Settings', 'activitypub-event-bridge' ); ?> </h3>
+			<p> <?php esc_html_e( 'For any event category you have created on your WordPress site you can choose an event category which will be used in federation. This option lets you override the default selection above. ', 'activitypub-event-bridge' ); ?> </p>
 			<table class="form-table">
+				<tr>
+					<th> <?php esc_html_e( 'Event category on your site', 'activitypub-event-bridge' ); ?> </th>
+					<th> <?php esc_html_e( 'Fediverse event category', 'activitypub-event-bridge' ); ?> </th>
+				</tr>
 				<?php foreach ( $event_terms as $event_term ) { ?>
 					<tr>
-						<th scope="row"> <?php echo esc_html( $event_term->name ); ?> </th>
-						<td>
+						<td scope="row"> <?php echo esc_html( $event_term->name ); ?> </td>
+						<td class="select-cell">
 							<select name="activitypub_event_bridge_event_category_mappings[<?php echo esc_attr( $event_term->slug ); ?>]">
 								<?php
 								$current_mapping_is_set = false;
diff --git a/templates/welcome.php b/templates/welcome.php
index cb63f5c..328328b 100644
--- a/templates/welcome.php
+++ b/templates/welcome.php
@@ -11,6 +11,7 @@ defined( 'ABSPATH' ) || exit; // @codeCoverageIgnore
 use ActivityPub_Event_Bridge\Setup;
 use ActivityPub_Event_Bridge\Admin\Settings_Page;
 use ActivityPub_Event_Bridge\Admin\Health_Check;
+use ActivityPub_Event_Bridge\Admin\General_Admin_Notices;
 
 \load_template(
 	__DIR__ . '/admin-header.php',
@@ -21,6 +22,11 @@ use ActivityPub_Event_Bridge\Admin\Health_Check;
 );
 
 $active_event_plugins               = Setup::get_instance()->get_active_event_plugins();
+
+if ( empty( $active_event_plugins ) ) {
+	return;
+}
+
 $activitypub_event_bridge_status_ok = true;
 $example_event_post                 = Health_Check::get_most_recent_event_posts();