diff --git a/examples/consentmanager/CHANGELOG.md b/examples/consentmanager/CHANGELOG.md
new file mode 100644
index 0000000..da36e29
--- /dev/null
+++ b/examples/consentmanager/CHANGELOG.md
@@ -0,0 +1,21 @@
+# @contentpass/examples-consentmanager
+
+## 0.0.3
+
+### Patch Changes
+
+- Improve OneTrust integration and handling of first layer links
+
+- Updated dependencies []:
+  - @contentpass/react-native-contentpass-ui@0.6.0
+  - @contentpass/react-native-contentpass-cmp-consentmanager@0.1.1
+  - @contentpass/react-native-contentpass@0.7.1
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @contentpass/react-native-contentpass-cmp-consentmanager@0.1.0
+  - @contentpass/react-native-contentpass-ui@0.5.0
+  - @contentpass/react-native-contentpass@0.7.0
diff --git a/examples/consentmanager/package.json b/examples/consentmanager/package.json
index 253708e..6d67b6a 100644
--- a/examples/consentmanager/package.json
+++ b/examples/consentmanager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentpass/examples-consentmanager",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "index.ts",
   "scripts": {
     "start": "expo start",
diff --git a/examples/onetrust/src/Content.tsx b/examples/onetrust/src/Content.tsx
index 4af1f9a..fc59ece 100644
--- a/examples/onetrust/src/Content.tsx
+++ b/examples/onetrust/src/Content.tsx
@@ -24,10 +24,19 @@ export default function Content({ cmpAdapter }: { cmpAdapter: CmpAdapter }) {
     });
   }, [sdk]);
 
+  async function openOneTrustSettings() {
+    try {
+      await cmpAdapter.showSecondLayer('purpose');
+    } catch (error) {
+      console.error('Failed to open OneTrust settings', error);
+    }
+  }
+
   return (
     <View>
       <Text>Hello World!</Text>
       <Text>Has full consent: {hasFullConsent ? 'Yes' : 'No'}</Text>
+      <Button title="OneTrust Settings" onPress={openOneTrustSettings} />
       {hasFullConsent && (
         <Button
           title="Deny All"
diff --git a/packages/react-native-contentpass-cmp-consentmanager/CHANGELOG.md b/packages/react-native-contentpass-cmp-consentmanager/CHANGELOG.md
index fb0ebe1..d3c1771 100644
--- a/packages/react-native-contentpass-cmp-consentmanager/CHANGELOG.md
+++ b/packages/react-native-contentpass-cmp-consentmanager/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @contentpass/react-native-contentpass-cmp-consentmanager
 
+## 0.1.1
+
+### Patch Changes
+
+- Improve OneTrust integration and handling of first layer links
+
 ## 0.1.0
 
 ### Minor Changes
diff --git a/packages/react-native-contentpass-cmp-consentmanager/package.json b/packages/react-native-contentpass-cmp-consentmanager/package.json
index e580066..7a1edbc 100644
--- a/packages/react-native-contentpass-cmp-consentmanager/package.json
+++ b/packages/react-native-contentpass-cmp-consentmanager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentpass/react-native-contentpass-cmp-consentmanager",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Contentpass Consentmanager CMP adapter",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
diff --git a/packages/react-native-contentpass-cmp-onetrust/CHANGELOG.md b/packages/react-native-contentpass-cmp-onetrust/CHANGELOG.md
index d52f39f..65bcb55 100644
--- a/packages/react-native-contentpass-cmp-onetrust/CHANGELOG.md
+++ b/packages/react-native-contentpass-cmp-onetrust/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @contentpass/react-native-contentpass-cmp-onetrust
 
+## 0.3.1
+
+### Patch Changes
+
+- Improve OneTrust integration and handling of first layer links
+
 ## 0.3.0
 
 ### Minor Changes
diff --git a/packages/react-native-contentpass-cmp-onetrust/package.json b/packages/react-native-contentpass-cmp-onetrust/package.json
index 22012e0..d7cf5e2 100644
--- a/packages/react-native-contentpass-cmp-onetrust/package.json
+++ b/packages/react-native-contentpass-cmp-onetrust/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentpass/react-native-contentpass-cmp-onetrust",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Contentpass OneTrust CMP adapter",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
diff --git a/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.test.ts b/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.test.ts
new file mode 100644
index 0000000..a53bf52
--- /dev/null
+++ b/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.test.ts
@@ -0,0 +1,168 @@
+import type OTPublishersNativeSDK from 'react-native-onetrust-cmp';
+import { OTEventName } from 'react-native-onetrust-cmp';
+import OnetrustCmpAdapter, {
+  createOnetrustCmpAdapter,
+} from './OnetrustCmpAdapter';
+import type { BannerData, PreferenceCenterData } from './types';
+
+jest.mock('react-native-onetrust-cmp', () => ({
+  OTConsentInteraction: {
+    bannerAllowAll: 'bannerAllowAll',
+    bannerRejectAll: 'bannerRejectAll',
+  },
+  OTEventName: {
+    hidePreferenceCenter: 'hidePreferenceCenter',
+    preferenceCenterAcceptAll: 'preferenceCenterAcceptAll',
+    preferenceCenterRejectAll: 'preferenceCenterRejectAll',
+    preferenceCenterConfirmChoices: 'preferenceCenterConfirmChoices',
+    hideVendorList: 'hideVendorList',
+    vendorConfirmChoices: 'vendorConfirmChoices',
+    allSDKViewsDismissed: 'allSDKViewsDismissed',
+  },
+}));
+
+type EventHandler = (data?: any) => void;
+
+function createBannerData(description = 'We use 42 vendors'): BannerData {
+  return {
+    otConsentString: '',
+    bannerUIData: {
+      summary: {
+        description: {
+          text: description,
+          textAlign: '',
+          textColor: '',
+          textColorDark: '',
+          fontSize: '',
+        },
+        dpdTitle: {} as any,
+        title: {} as any,
+        dpdDescription: {} as any,
+      },
+      buttons: {} as any,
+      general: {} as any,
+      logo: {} as any,
+    },
+    appConfig: {},
+    storageKeys: {},
+  };
+}
+
+function createPreferenceCenterData(): PreferenceCenterData {
+  return {
+    purposes: [
+      {
+        groupId: 'C0001',
+        isIabPurpose: true,
+        purposeId: '1',
+      },
+      {
+        groupId: 'C0002',
+        isIabPurpose: true,
+        purposeId: '2',
+      },
+    ] as any,
+    pcUIData: {},
+    appConfig: {},
+    otConsentString: '',
+    storageKeys: {},
+  };
+}
+
+function createMockSdk(overrides: Partial<OTPublishersNativeSDK> = {}): {
+  sdk: OTPublishersNativeSDK;
+  eventHandlers: Map<OTEventName, EventHandler>;
+} {
+  const eventHandlers = new Map<OTEventName, EventHandler>();
+  const sdk = {
+    fetchPreferencesCmpApiData: jest.fn().mockResolvedValue(undefined),
+    getBannerData: jest.fn().mockResolvedValue(createBannerData()),
+    getPreferenceCenterData: jest
+      .fn()
+      .mockResolvedValue(createPreferenceCenterData()),
+    saveConsent: jest.fn().mockResolvedValue(undefined),
+    getConsentStatusForCategory: jest.fn().mockResolvedValue(1),
+    addEventListener: jest.fn(
+      (eventName: OTEventName, handler: EventHandler) => {
+        eventHandlers.set(eventName, handler);
+        return { remove: jest.fn() };
+      }
+    ),
+    showPreferenceCenterUI: jest.fn(),
+    showConsentPurposesUI: jest.fn(),
+    ...overrides,
+  } as OTPublishersNativeSDK;
+
+  return { sdk, eventHandlers };
+}
+
+async function flushPromises(): Promise<void> {
+  await new Promise((resolve) => setTimeout(resolve, 0));
+}
+
+describe('createOnetrustCmpAdapter', () => {
+  it('should create an adapter from the SDK data', async () => {
+    const { sdk } = createMockSdk();
+    const adapter = await createOnetrustCmpAdapter(sdk);
+    expect(adapter).toBeInstanceOf(OnetrustCmpAdapter);
+    expect(sdk.fetchPreferencesCmpApiData).toHaveBeenCalled();
+    expect(sdk.getBannerData).toHaveBeenCalled();
+    expect(sdk.getPreferenceCenterData).toHaveBeenCalled();
+  });
+});
+
+describe('OnetrustCmpAdapter', () => {
+  it('should emit consent status when OneTrust confirms preference-center choices', async () => {
+    const { sdk, eventHandlers } = createMockSdk({
+      getConsentStatusForCategory: jest
+        .fn()
+        .mockResolvedValueOnce(1)
+        .mockResolvedValueOnce(1)
+        .mockResolvedValueOnce(1)
+        .mockResolvedValueOnce(0),
+    });
+    const adapter = await createOnetrustCmpAdapter(sdk);
+    const listener = jest.fn();
+
+    adapter.onConsentStatusChange(listener);
+    await flushPromises();
+    listener.mockClear();
+
+    eventHandlers.get(OTEventName.preferenceCenterConfirmChoices)?.();
+    await flushPromises();
+
+    expect(listener).toHaveBeenCalledWith(false);
+  });
+
+  it('should emit consent status when OneTrust rejects all in the preference center', async () => {
+    const { sdk, eventHandlers } = createMockSdk({
+      getConsentStatusForCategory: jest.fn().mockResolvedValue(0),
+    });
+    const adapter = await createOnetrustCmpAdapter(sdk);
+    const listener = jest.fn();
+
+    adapter.onConsentStatusChange(listener);
+    await flushPromises();
+    listener.mockClear();
+
+    eventHandlers.get(OTEventName.preferenceCenterRejectAll)?.();
+    await flushPromises();
+
+    expect(listener).toHaveBeenCalledWith(false);
+  });
+
+  it('should not emit consent status for close-only OneTrust events', async () => {
+    const { sdk, eventHandlers } = createMockSdk();
+    const adapter = await createOnetrustCmpAdapter(sdk);
+    const listener = jest.fn();
+
+    adapter.onConsentStatusChange(listener);
+    await flushPromises();
+    listener.mockClear();
+
+    eventHandlers.get(OTEventName.hidePreferenceCenter)?.();
+    await flushPromises();
+
+    expect(listener).not.toHaveBeenCalled();
+  });
+});
diff --git a/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.ts b/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.ts
index 6025d0c..ac40eaf 100644
--- a/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.ts
+++ b/packages/react-native-contentpass-cmp-onetrust/src/OnetrustCmpAdapter.ts
@@ -4,6 +4,13 @@ import type { CmpAdapter } from '@contentpass/react-native-contentpass';
 import type { BannerData, PreferenceCenterData } from './types';
 import { getTcfPurposes } from './purposes';
 
+const CONSENT_CHANGE_EVENTS = new Set<OTEventName>([
+  OTEventName.preferenceCenterAcceptAll,
+  OTEventName.preferenceCenterRejectAll,
+  OTEventName.preferenceCenterConfirmChoices,
+  OTEventName.vendorConfirmChoices,
+]);
+
 export async function createOnetrustCmpAdapter(
   sdk: OTPublishersNativeSDK
 ): Promise<OnetrustCmpAdapter> {
@@ -148,6 +155,10 @@ export default class OnetrustCmpAdapter implements CmpAdapter {
   }
 
   private emitEvent(eventName: OTEventName, data?: any): void {
+    if (CONSENT_CHANGE_EVENTS.has(eventName)) {
+      this.emitCurrentConsentStatus();
+    }
+
     this.eventListeners.forEach((listener) => {
       try {
         listener(eventName, data);
@@ -157,6 +168,17 @@ export default class OnetrustCmpAdapter implements CmpAdapter {
     });
   }
 
+  private emitCurrentConsentStatus(): void {
+    this.hasFullConsent()
+      .then((fullConsent) => this.emitConsentStatusChange(fullConsent))
+      .catch((error) => {
+        console.error(
+          '[OnetrustCmpAdapter::emitCurrentConsentStatus] failed',
+          error
+        );
+      });
+  }
+
   private emitConsentStatusChange(fullConsent: boolean): void {
     this.consentStatusChangeListeners.forEach((listener) =>
       this.emitConsentStatusChangeEventSingle(fullConsent, listener)
diff --git a/packages/react-native-contentpass-ui/CHANGELOG.md b/packages/react-native-contentpass-ui/CHANGELOG.md
index b450368..943ec95 100644
--- a/packages/react-native-contentpass-ui/CHANGELOG.md
+++ b/packages/react-native-contentpass-ui/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @contentpass/react-native-contentpass-ui
 
+## 0.6.0
+
+### Minor Changes
+
+- Improve OneTrust integration and handling of first layer links
+
 ## 0.5.0
 
 ### Minor Changes
diff --git a/packages/react-native-contentpass-ui/package.json b/packages/react-native-contentpass-ui/package.json
index 0a23a53..dd5da53 100644
--- a/packages/react-native-contentpass-ui/package.json
+++ b/packages/react-native-contentpass-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentpass/react-native-contentpass-ui",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Contentpass React Native UI Components",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",
diff --git a/packages/react-native-contentpass-ui/src/components/ContentpassLayer.tsx b/packages/react-native-contentpass-ui/src/components/ContentpassLayer.tsx
index 5546bf9..be82c95 100644
--- a/packages/react-native-contentpass-ui/src/components/ContentpassLayer.tsx
+++ b/packages/react-native-contentpass-ui/src/components/ContentpassLayer.tsx
@@ -9,9 +9,24 @@ import {
 import { WebView, type WebViewMessageEvent } from 'react-native-webview';
 import type { ContentpassLayerEvents } from './ContentpassLayerEvents';
 import buildFirstLayerUrl from './buildFirstLayerUrl';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 const MESSAGE_PROTOCOL = 'contentpass-first-layer';
+const POPUP_URL_PROTOCOLS = new Set(['http:', 'https:']);
+
+function normalizePathname(pathname: string): string {
+  return pathname.replace(/\/+$/, '');
+}
+
+function isSameOrNestedPath(pathname: string, basePathname: string): boolean {
+  const normalizedPathname = normalizePathname(pathname);
+  const normalizedBasePathname = normalizePathname(basePathname);
+
+  return (
+    normalizedPathname === normalizedBasePathname ||
+    normalizedPathname.startsWith(`${normalizedBasePathname}/`)
+  );
+}
 
 const EARLY_INJECT_JS = `
   (function () {
@@ -116,10 +131,56 @@ export default function ContentpassLayer({
   }, [baseUrl, planId, propertyId, purposesList, vendorCount, locale]);
 
   const [ready, setReady] = useState(false);
+  const [layerUrl, setLayerUrl] = useState(firstLayerUrl);
   const [popupUrl, setPopupUrl] = useState<string | null>(null);
 
+  useEffect(() => {
+    setLayerUrl(firstLayerUrl);
+    setReady(false);
+  }, [firstLayerUrl]);
+
   const closePopup = useCallback(() => setPopupUrl(null), []);
 
+  const isFirstLayerUrl = useCallback(
+    (url: URL) => {
+      const firstLayer = new URL(firstLayerUrl);
+
+      return (
+        url.origin === firstLayer.origin &&
+        isSameOrNestedPath(url.pathname, firstLayer.pathname)
+      );
+    },
+    [firstLayerUrl]
+  );
+
+  const loadLayerUrl = useCallback((url: URL) => {
+    setReady(false);
+    setLayerUrl(url.toString());
+  }, []);
+
+  const openPopup = useCallback(
+    (url: unknown) => {
+      if (typeof url !== 'string' || url.length === 0) {
+        console.warn('Unable to open popup with unknown URL', url);
+        return;
+      }
+
+      try {
+        const popupUrl = new URL(url, baseUrl);
+
+        if (!POPUP_URL_PROTOCOLS.has(popupUrl.protocol)) {
+          console.warn('Unable to open popup with unsupported URL', url);
+          return;
+        }
+
+        setPopupUrl(popupUrl.toString());
+      } catch (error) {
+        console.warn('Unable to open popup with invalid URL', url, error);
+      }
+    },
+    [baseUrl]
+  );
+
   function buildFaqUrl(): string {
     return `${baseUrl}/auth/login?instanceId=${encodeURIComponent(instanceId)}&propertyId=${encodeURIComponent(propertyId)}&planId=${encodeURIComponent(planId)}&route=faq`;
   }
@@ -162,17 +223,10 @@ export default function ContentpassLayer({
             );
             break;
           case 'faq':
-            setPopupUrl(buildFaqUrl());
+            openPopup(buildFaqUrl());
             break;
           case 'url':
-            if (msg.payload?.options?.url) {
-              setPopupUrl(msg.payload?.options?.url);
-            } else {
-              console.warn(
-                'WebView message with unknown URL',
-                msg.payload?.options?.url
-              );
-            }
+            openPopup(msg.payload?.options?.url);
             break;
           default:
             console.warn(
@@ -212,27 +266,67 @@ export default function ContentpassLayer({
   return (
     <View style={styles.container}>
       <WebView
-        source={{ uri: firstLayerUrl }}
+        source={{ uri: layerUrl }}
         style={[styles.webview, !ready && { opacity: 0 }]}
         originWhitelist={['*']}
         javaScriptEnabled
         domStorageEnabled
         automaticallyAdjustContentInsets={false}
         injectedJavaScriptBeforeContentLoaded={EARLY_INJECT_JS}
+        setSupportMultipleWindows={false}
         onMessage={(event) => {
           handleMessage(event);
         }}
         onShouldStartLoadWithRequest={(request) => {
-          // Prevent accidental redirects to external URLs
-          const firstLayerHostname = new URL(firstLayerUrl).hostname;
-          const requestedHostname = new URL(request.url).hostname;
-          const allowed = requestedHostname === firstLayerHostname;
-          console.debug('WebView request', request.url, {
-            allowed,
-            firstLayerHostname,
-            requestedHostname,
-          });
-          return allowed;
+          if (request.isTopFrame === false) {
+            return true;
+          }
+
+          try {
+            const requested = new URL(request.url, firstLayerUrl);
+            const allowed = isFirstLayerUrl(requested);
+
+            console.debug('WebView request', request.url, {
+              allowed,
+              firstLayerUrl,
+              layerUrl,
+              requestedUrl: requested.toString(),
+            });
+
+            if (!allowed) {
+              openPopup(requested.toString());
+            }
+
+            return allowed;
+          } catch (error) {
+            console.warn(
+              'Unable to handle WebView request',
+              request.url,
+              error
+            );
+            return false;
+          }
+        }}
+        onOpenWindow={(event) => {
+          try {
+            const targetUrl = new URL(
+              event.nativeEvent.targetUrl,
+              firstLayerUrl
+            );
+
+            if (isFirstLayerUrl(targetUrl)) {
+              loadLayerUrl(targetUrl);
+              return;
+            }
+
+            openPopup(targetUrl.toString());
+          } catch (error) {
+            console.warn(
+              'Unable to handle WebView open window request',
+              event.nativeEvent.targetUrl,
+              error
+            );
+          }
         }}
         onLoadStart={() => {
           console.debug('WebView load start');
@@ -280,12 +374,16 @@ export default function ContentpassLayer({
               style={styles.popupWebview}
               javaScriptEnabled
               domStorageEnabled
+              setSupportMultipleWindows={false}
               onShouldStartLoadWithRequest={(request) => {
                 console.debug('WebView popup request', request.url);
                 // Allow any request to load in the popup, otherwise
                 // we would block redirects to external URLs.
                 return true;
               }}
+              onOpenWindow={(event) => {
+                openPopup(event.nativeEvent.targetUrl);
+              }}
             />
           )}
         </View>
diff --git a/packages/react-native-contentpass/CHANGELOG.md b/packages/react-native-contentpass/CHANGELOG.md
index 50f1abe..504fd1f 100644
--- a/packages/react-native-contentpass/CHANGELOG.md
+++ b/packages/react-native-contentpass/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @contentpass/react-native-contentpass
 
+## 0.7.1
+
+### Patch Changes
+
+- Improve OneTrust integration and handling of first layer links
+
 ## 0.7.0
 
 ### Minor Changes
diff --git a/packages/react-native-contentpass/package.json b/packages/react-native-contentpass/package.json
index 89b377d..16d0f10 100644
--- a/packages/react-native-contentpass/package.json
+++ b/packages/react-native-contentpass/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentpass/react-native-contentpass",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Contentpass React Native SDK",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",