diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/HooksTableBlock.js b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/HooksTableBlock.js
index 617ceb535..856f1969d 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/HooksTableBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/HooksTableBlock.js
@@ -1,5 +1,6 @@
 import { __ } from '@wordpress/i18n';
 import { CommonHooks } from '../../../../../../data';
+import { Title } from '../../../../../ReusableComponents/SettingsBlocks';
 
 const HooksTableBlock = () => {
 	const { webhooks } = CommonHooks.useWebhooks();
@@ -10,31 +11,36 @@ const HooksTableBlock = () => {
 	}
 
 	return (
-		<table className="ppcp-r-table">
-			<thead>
-				<tr>
-					<th className="ppcp-r-table__hooks-url">
-						{ __( 'URL', 'woocommerce-paypal-payments' ) }
-					</th>
-					<th className="ppcp-r-table__hooks-events">
-						{ __(
-							'Tracked events',
-							'woocommerce-paypal-payments'
-						) }
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<tr>
-					<td className="ppcp-r-table__hooks-url">{ url }</td>
-					<td className="ppcp-r-table__hooks-events">
-						{ events.map( ( event, index ) => (
-							<div key={ index }>{ event }</div>
-						) ) }
-					</td>
-				</tr>
-			</tbody>
-		</table>
+		<>
+			<WebhookUrl url={ url } />
+			<WebhookEvents events={ events } />
+		</>
+	);
+};
+
+const WebhookUrl = ( { url } ) => {
+	return (
+		<div>
+			<Title>
+				{ __( 'Notification URL', 'woocommerce-paypal-payments' ) }
+			</Title>
+			<p>{ url }</p>
+		</div>
+	);
+};
+
+const WebhookEvents = ( { events } ) => {
+	return (
+		<div>
+			<Title>
+				{ __( 'Subscribed Events', 'woocommerce-paypal-payments' ) }
+			</Title>
+			<ul>
+				{ events.map( ( event, index ) => (
+					<li key={ index }>{ event }</li>
+				) ) }
+			</ul>
+		</div>
 	);
 };
 
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/Troubleshooting.js b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/Troubleshooting.js
index 546659b1f..4dc0d1fc6 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/Troubleshooting.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/Troubleshooting/Troubleshooting.js
@@ -42,10 +42,7 @@ const Troubleshooting = ( { updateFormValue, settings } ) => {
 			<SettingsBlock>
 				<Header>
 					<Title>
-						{ __(
-							'Subscribed PayPal webhooks',
-							'woocommerce-paypal-payments'
-						) }
+						{ __( 'Webhooks', 'woocommerce-paypal-payments' ) }
 					</Title>
 					<Description>
 						{ __(