diff --git a/src/content/ccip/api-reference/ccip-receiver.mdx b/src/content/ccip/api-reference/ccip-receiver.mdx
index e900078dd4f..98afbc33f5f 100644
--- a/src/content/ccip/api-reference/ccip-receiver.mdx
+++ b/src/content/ccip/api-reference/ccip-receiver.mdx
@@ -4,29 +4,9 @@ date: Last Modified
title: "CCIPReceiver API Reference"
---
-import { Aside, CopyText } from "@components"
-import { Tabs } from "@components/Tabs"
-
-
+import CcipCommon from "@features/ccip/CcipCommon.astro"
+
+
CCIP receiver contracts inherit from _CCIPReceiver_.
diff --git a/src/content/ccip/api-reference/client.mdx b/src/content/ccip/api-reference/client.mdx
index cd6b9adb2c2..204e2e2a401 100644
--- a/src/content/ccip/api-reference/client.mdx
+++ b/src/content/ccip/api-reference/client.mdx
@@ -4,29 +4,9 @@ date: Last Modified
title: "Client Library API Reference"
---
-import { Aside, CopyText } from "@components"
-import { Tabs } from "@components/Tabs"
-
-
+import CcipCommon from "@features/ccip/CcipCommon.astro"
+
+
CCIP senders and receivers use the _CCIP Client Library_ to build CCIP messages.
diff --git a/src/content/ccip/api-reference/errors.mdx b/src/content/ccip/api-reference/errors.mdx
index 482f01155d7..4e56e14f8c4 100644
--- a/src/content/ccip/api-reference/errors.mdx
+++ b/src/content/ccip/api-reference/errors.mdx
@@ -4,29 +4,9 @@ date: Last Modified
title: "Errors API Reference"
---
-import { Aside, CopyText } from "@components"
-import { Tabs } from "@components/Tabs"
+import CcipCommon from "@features/ccip/CcipCommon.astro"
-
+
When invoking the `ccipSend` [function](/ccip/api-reference/i-router-client#ccipsend), it is possible to encounter various errors. These might be thrown either by the CCIP router or by one of the downstream contracts called by the CCIP router. Below is a compiled list of potential errors you might encounter. Referencing this list will enable you to capture and handle these exceptions gracefully.
diff --git a/src/content/ccip/api-reference/i-router-client.mdx b/src/content/ccip/api-reference/i-router-client.mdx
index 74dddf0ccd7..452c6451347 100644
--- a/src/content/ccip/api-reference/i-router-client.mdx
+++ b/src/content/ccip/api-reference/i-router-client.mdx
@@ -4,29 +4,10 @@ date: Last Modified
title: "IRouterClient API Reference"
---
-import { Aside, CopyText } from "@components"
-import { Tabs } from "@components/Tabs"
-
-
+import { Aside } from "@components"
+import CcipCommon from "@features/ccip/CcipCommon.astro"
+
+
To send messages through CCIP, users must interact with the `IRouterClient` interface.
After you import `IRouterClient.sol`, you can initialize a router client instance:
@@ -133,7 +114,7 @@ function ccipSend(uint64 destinationChainSelector, struct Client.EVM2AnyMessage
Request a message to be sent to the destination chain.
#### Parameters
diff --git a/src/content/ccip/tutorials/cross-chain-tokens.mdx b/src/content/ccip/tutorials/cross-chain-tokens.mdx
index 69e2d5f95d5..8bc2118bf7c 100644
--- a/src/content/ccip/tutorials/cross-chain-tokens.mdx
+++ b/src/content/ccip/tutorials/cross-chain-tokens.mdx
@@ -190,6 +190,8 @@ You will transfer _0.001 CCIP-BnM_. The CCIP fees for using CCIP will be paid in
## Explanation
+
+
The smart contract featured in this tutorial is designed to interact with CCIP to transfer a supported token to an account on a destination chain. The contract code contains supporting comments clarifying the functions, events, and underlying logic. This section further explains initializing the contract and transferring tokens.
### Initializing of the contract
diff --git a/src/content/ccip/tutorials/manual-execution.mdx b/src/content/ccip/tutorials/manual-execution.mdx
index 2193e5cf26d..85aafef2605 100644
--- a/src/content/ccip/tutorials/manual-execution.mdx
+++ b/src/content/ccip/tutorials/manual-execution.mdx
@@ -12,6 +12,7 @@ whatsnext:
---
import { CodeSample, ClickToZoom, CopyText, Aside } from "@components"
+import CcipCommon from "@features/ccip/CcipCommon.astro"