diff --git a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
index 57ab973..80bde16 100644
--- a/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
+++ b/admin-spa/src/routes/Settings/components/SettingsLayout.tsx
@@ -42,23 +42,27 @@ export function SettingsLayout({
     const titleString = typeof title === 'string' ? title : '';
     
     if (onSave) {
-      setPageHeader(
-        titleString,
-        <Button
-          onClick={handleSave}
-          disabled={isSaving || isLoading}
-          size="sm"
-        >
-          {isSaving ? (
-            <>
-              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
-              Saving...
-            </>
-          ) : (
-            saveLabel
-          )}
-        </Button>
+      // Combine custom action with save button
+      const headerAction = (
+        <div className="flex items-center gap-2">
+          {action}
+          <Button
+            onClick={handleSave}
+            disabled={isSaving || isLoading}
+            size="sm"
+          >
+            {isSaving ? (
+              <>
+                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                Saving...
+              </>
+            ) : (
+              saveLabel
+            )}
+          </Button>
+        </div>
       );
+      setPageHeader(titleString, headerAction);
     } else if (action) {
       // If there's a custom action, use it
       setPageHeader(titleString, action);
diff --git a/includes/Api/NotificationsController.php b/includes/Api/NotificationsController.php
index de43254..91ccfc2 100644
--- a/includes/Api/NotificationsController.php
+++ b/includes/Api/NotificationsController.php
@@ -13,6 +13,8 @@ use WP_REST_Request;
 use WP_REST_Response;
 use WP_Error;
 use WooNooW\Core\Notifications\TemplateProvider;
+use WooNooW\Core\Notifications\EventProvider;
+use WooNooW\Core\Notifications\ChannelProvider;
 use WooNooW\Core\Notifications\PushNotificationHandler;
 
 class NotificationsController {