diff --git a/config/abis/index.ts b/config/abis/index.ts
index 6f35ed50..9456edee 100644
--- a/config/abis/index.ts
+++ b/config/abis/index.ts
@@ -10,4 +10,5 @@ export * from "./tokens";
 export * from "./custom-pools";
 export * from "./ve33";
 export * from "./omegaQuoter";
-export * from "./prediction";
\ No newline at end of file
+export * from "./prediction";
+export * from "./nav-hook";
diff --git a/config/abis/nav-hook/index.ts b/config/abis/nav-hook/index.ts
new file mode 100644
index 00000000..100c5d1e
--- /dev/null
+++ b/config/abis/nav-hook/index.ts
@@ -0,0 +1,2 @@
+export * from "./priceConvergenceVault";
+export * from "./priceConvergenceVaultDepositGuard";
diff --git a/config/abis/nav-hook/priceConvergenceVault.ts b/config/abis/nav-hook/priceConvergenceVault.ts
new file mode 100644
index 00000000..649e09a1
--- /dev/null
+++ b/config/abis/nav-hook/priceConvergenceVault.ts
@@ -0,0 +1,1059 @@
+export const priceConvergenceVaultABI = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_pool",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "_factory",
+                type: "address",
+            },
+            {
+                internalType: "uint128",
+                name: "_fullRangeLiquidity",
+                type: "uint128",
+            },
+            {
+                internalType: "address",
+                name: "_vaultMath",
+                type: "address",
+            },
+            {
+                internalType: "uint32",
+                name: "_twapPeriod",
+                type: "uint32",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "constructor",
+    },
+    {
+        inputs: [],
+        name: "InvalidFactory",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "InvalidPosition",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "InvalidShares",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "InvalidTwapPeriod",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "OnlyPool",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "OnlyRebalanceEntrypoint",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "OnlyVaultManager",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "OracleNotConnected",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "PriceManipulation",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "ZeroAddress",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "ZeroValue",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "tickOutOfRange",
+        type: "error",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "owner",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "spender",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "value",
+                type: "uint256",
+            },
+        ],
+        name: "Approval",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "sender",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        name: "Deposit",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "int24",
+                name: "lower",
+                type: "int24",
+            },
+            {
+                indexed: false,
+                internalType: "int24",
+                name: "upper",
+                type: "int24",
+            },
+            {
+                indexed: false,
+                internalType: "uint128",
+                name: "liquidity",
+                type: "uint128",
+            },
+        ],
+        name: "FullRangeInitialized",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "hysteresis",
+                type: "uint256",
+            },
+        ],
+        name: "Hysteresis",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "Paused",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "int24",
+                name: "lower",
+                type: "int24",
+            },
+            {
+                indexed: false,
+                internalType: "int24",
+                name: "upper",
+                type: "int24",
+            },
+            {
+                indexed: false,
+                internalType: "uint128",
+                name: "liquidity",
+                type: "uint128",
+            },
+            {
+                indexed: false,
+                internalType: "uint160",
+                name: "targetSqrtPriceX96",
+                type: "uint160",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        name: "Rebalance",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "rebalanceEntrypoint",
+                type: "address",
+            },
+        ],
+        name: "RebalanceEntrypoint",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "from",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "to",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "value",
+                type: "uint256",
+            },
+        ],
+        name: "Transfer",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "twapPeriod",
+                type: "uint32",
+            },
+            {
+                indexed: false,
+                internalType: "uint32",
+                name: "auxTwapPeriod",
+                type: "uint32",
+            },
+        ],
+        name: "TwapPeriods",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: false,
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "Unpaused",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "sender",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        name: "Withdraw",
+        type: "event",
+    },
+    {
+        inputs: [],
+        name: "DEFAULT_HYSTERESIS",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "MIN_SHARES",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "PRECISION",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "PRICE_CONVERGENCE_VAULT_MANAGER",
+        outputs: [
+            {
+                internalType: "bytes32",
+                name: "",
+                type: "bytes32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "TICK_SPACING",
+        outputs: [
+            {
+                internalType: "int24",
+                name: "",
+                type: "int24",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "amount0Owed",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1Owed",
+                type: "uint256",
+            },
+            {
+                internalType: "bytes",
+                name: "",
+                type: "bytes",
+            },
+        ],
+        name: "algebraMintCallback",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "int256",
+                name: "amount0Delta",
+                type: "int256",
+            },
+            {
+                internalType: "int256",
+                name: "amount1Delta",
+                type: "int256",
+            },
+            {
+                internalType: "bytes",
+                name: "",
+                type: "bytes",
+            },
+        ],
+        name: "algebraSwapCallback",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "owner",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "spender",
+                type: "address",
+            },
+        ],
+        name: "allowance",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "spender",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "amount",
+                type: "uint256",
+            },
+        ],
+        name: "approve",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "auxTwapPeriod",
+        outputs: [
+            {
+                internalType: "uint32",
+                name: "",
+                type: "uint32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "account",
+                type: "address",
+            },
+        ],
+        name: "balanceOf",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "collectFees",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "fees0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "fees1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "decimals",
+        outputs: [
+            {
+                internalType: "uint8",
+                name: "",
+                type: "uint8",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "spender",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "subtractedValue",
+                type: "uint256",
+            },
+        ],
+        name: "decreaseAllowance",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+            {
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+        ],
+        name: "deposit",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "factory",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "fullRangeLiquidity",
+        outputs: [
+            {
+                internalType: "uint128",
+                name: "",
+                type: "uint128",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "getMainPosition",
+        outputs: [
+            {
+                internalType: "uint128",
+                name: "liquidity",
+                type: "uint128",
+            },
+            {
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "getShareholderAmounts",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "total0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "total1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "getTotalAmounts",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "total0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "total1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "hysteresis",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "spender",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "addedValue",
+                type: "uint256",
+            },
+        ],
+        name: "increaseAllowance",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "mainPosition",
+        outputs: [
+            {
+                internalType: "int24",
+                name: "lower",
+                type: "int24",
+            },
+            {
+                internalType: "int24",
+                name: "upper",
+                type: "int24",
+            },
+            {
+                internalType: "uint128",
+                name: "liquidity",
+                type: "uint128",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "name",
+        outputs: [
+            {
+                internalType: "string",
+                name: "",
+                type: "string",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "pause",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "paused",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "pool",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint160",
+                name: "targetSqrtPriceX96",
+                type: "uint160",
+            },
+        ],
+        name: "rebalance",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "rebalanceEntrypoint",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "_hysteresis",
+                type: "uint256",
+            },
+        ],
+        name: "setHysteresis",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_rebalanceEntrypoint",
+                type: "address",
+            },
+        ],
+        name: "setRebalanceEntrypoint",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint32",
+                name: "_twapPeriod",
+                type: "uint32",
+            },
+            {
+                internalType: "uint32",
+                name: "_auxTwapPeriod",
+                type: "uint32",
+            },
+        ],
+        name: "setTwapPeriods",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "symbol",
+        outputs: [
+            {
+                internalType: "string",
+                name: "",
+                type: "string",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "token0",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "token1",
+        outputs: [
+            {
+                internalType: "address",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "totalSupply",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "to",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "amount",
+                type: "uint256",
+            },
+        ],
+        name: "transfer",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "from",
+                type: "address",
+            },
+            {
+                internalType: "address",
+                name: "to",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "amount",
+                type: "uint256",
+            },
+        ],
+        name: "transferFrom",
+        outputs: [
+            {
+                internalType: "bool",
+                name: "",
+                type: "bool",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "twapPeriod",
+        outputs: [
+            {
+                internalType: "uint32",
+                name: "",
+                type: "uint32",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "unpause",
+        outputs: [],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "vaultMath",
+        outputs: [
+            {
+                internalType: "contract IVaultMath",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+            {
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+        ],
+        name: "withdraw",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+] as const;
diff --git a/config/abis/nav-hook/priceConvergenceVaultDepositGuard.ts b/config/abis/nav-hook/priceConvergenceVaultDepositGuard.ts
new file mode 100644
index 00000000..16e326cb
--- /dev/null
+++ b/config/abis/nav-hook/priceConvergenceVaultDepositGuard.ts
@@ -0,0 +1,219 @@
+export const priceConvergenceVaultDepositGuardABI = [
+    {
+        inputs: [
+            {
+                internalType: "address",
+                name: "_vault",
+                type: "address",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "constructor",
+    },
+    {
+        inputs: [],
+        name: "InsufficientAmounts",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "InsufficientShares",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "InvalidRecipient",
+        type: "error",
+    },
+    {
+        inputs: [],
+        name: "ZeroAddress",
+        type: "error",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "sender",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+        ],
+        name: "DepositForwarded",
+        type: "event",
+    },
+    {
+        anonymous: false,
+        inputs: [
+            {
+                indexed: true,
+                internalType: "address",
+                name: "sender",
+                type: "address",
+            },
+            {
+                indexed: true,
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                indexed: false,
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        name: "WithdrawForwarded",
+        type: "event",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "minimumShares",
+                type: "uint256",
+            },
+            {
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+        ],
+        name: "deposit",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "token0",
+        outputs: [
+            {
+                internalType: "contract IERC20",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "token1",
+        outputs: [
+            {
+                internalType: "contract IERC20",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [],
+        name: "vault",
+        outputs: [
+            {
+                internalType: "contract IPriceConvergenceVault",
+                name: "",
+                type: "address",
+            },
+        ],
+        stateMutability: "view",
+        type: "function",
+    },
+    {
+        inputs: [
+            {
+                internalType: "uint256",
+                name: "shares",
+                type: "uint256",
+            },
+            {
+                internalType: "address",
+                name: "recipient",
+                type: "address",
+            },
+            {
+                internalType: "uint256",
+                name: "minAmount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "minAmount1",
+                type: "uint256",
+            },
+        ],
+        name: "withdraw",
+        outputs: [
+            {
+                internalType: "uint256",
+                name: "amount0",
+                type: "uint256",
+            },
+            {
+                internalType: "uint256",
+                name: "amount1",
+                type: "uint256",
+            },
+        ],
+        stateMutability: "nonpayable",
+        type: "function",
+    },
+] as const;
diff --git a/config/app-modules.ts b/config/app-modules.ts
index f4af23ce..b54208a1 100644
--- a/config/app-modules.ts
+++ b/config/app-modules.ts
@@ -5,6 +5,7 @@ export enum AppFeatureModule {
     Farming = "FarmingModule",
     LimitOrders = "LimitOrdersModule",
     ALM = "ALMModule",
+    NAVHook = "NAVHookModule",
     VE_33 = "Ve33Module",
     BoostedPools = "BoostedPoolsModule",
     Prediction = "PredictionModule",
@@ -18,6 +19,7 @@ export const enabledModules: Record<AppFeatureModule, boolean> = {
     [AppFeatureModule.Farming]: true,
     [AppFeatureModule.LimitOrders]: true,
     [AppFeatureModule.ALM]: true,
+    [AppFeatureModule.NAVHook]: true,
     [AppFeatureModule.VE_33]: true,
     [AppFeatureModule.BoostedPools]: true,
     [AppFeatureModule.Prediction]: true,
diff --git a/config/contract-addresses.ts b/config/contract-addresses.ts
index edb5eafd..f2c4feaf 100644
--- a/config/contract-addresses.ts
+++ b/config/contract-addresses.ts
@@ -17,6 +17,7 @@ export const NONFUNGIBLE_POSITION_MANAGER: Record<number, Address> = {
 export const SECURITY_REGISTRY: Record<number, Address> = {
     [ChainId.BaseSepolia]: "0x6aa9481De990bC12F906C5e8DE70D8556ac5ba2e",
 };
+
 /* Farming */
 export const ALGEBRA_ETERNAL_FARMING: Record<number, Address> = {
     [ChainId.BaseSepolia]: "0xB50E639E23C954546C75d9C15363FC0375E5E95E",
@@ -59,3 +60,21 @@ export const REBASE_REWARD: Record<number, Address> = {
 export const BINARY_LMSR_MARKET_MANAGER: Record<number, Address> = {
     [ChainId.BaseSepolia]: "0xf04604de76eb31004F2331bd0701b6eBF8ffdCB1",
 };
+
+/* NAV Hook */
+export const PRICE_CONVERGENCE_VAULT_BY_POOL: Record<number, Record<Address, Address>> = {
+    [ChainId.BaseSepolia]: {
+        // pool address -> vault address
+        // "0x25827078a91d0875376a8a9f1bcfb35827ce0d4f": "0x1A6EB0846DEaBf20eF5e11F07205D17518Ead9B1",
+        "0xd05e0dc6176f558439184795f6f865719b562720": "0xD936600f96593eA0212e6A13585077C225939b10",
+        "0x4A5856Ea3803aa06FF9d0ba63E18914C05773c94": "0xD0D27ED3b59D0E07A4889D765468a76660dd4dAA",
+    },
+};
+export const PRICE_CONVERGENCE_VAULT_DEPOSIT_GUARD_BY_POOL: Record<number, Record<Address, Address>> = {
+    [ChainId.BaseSepolia]: {
+        // pool address -> vault deposit guard address
+        // "0x25827078a91d0875376a8a9f1bcfb35827ce0d4f": "0xb9aA6adde7319c68D90879855D2bE28D3e235A2E",
+        "0xd05e0dc6176f558439184795f6f865719b562720": "0x2F3737B5b16E6fFEc8f2C805b3283159E7f5e6E3",
+        "0x4A5856Ea3803aa06FF9d0ba63E18914C05773c94": "0xf1f865Ee407Bfe9413e60Ee3a0daa4AAB76B83eC",
+    },
+};
diff --git a/config/custom-pool-deployer.ts b/config/custom-pool-deployer.ts
index 98d0ff9b..458a2e29 100644
--- a/config/custom-pool-deployer.ts
+++ b/config/custom-pool-deployer.ts
@@ -1,7 +1,7 @@
 import { ADDRESS_ZERO, ChainId } from "@cryptoalgebra/integral-sdk";
 import { Address } from "viem";
 
-export type PoolDeployerType = "BASE_DYNAMIC" | "BASE_03" | "BASE_1";
+export type PoolDeployerType = "BASE_DYNAMIC" | "BASE_03" | "BASE_1" | "NAV_HOOK";
 
 export const CUSTOM_POOL_DEPLOYER_ADDRESSES: Record<PoolDeployerType, Record<number, Address | null>> = {
     BASE_DYNAMIC: {
@@ -13,12 +13,16 @@ export const CUSTOM_POOL_DEPLOYER_ADDRESSES: Record<PoolDeployerType, Record<num
     BASE_1: {
         [ChainId.BaseSepolia]: "0x5f3b3cff2dD159c3A28402527cfE72BC175A0bb4",
     },
+    NAV_HOOK: {
+        [ChainId.BaseSepolia]: "0x122a64aE8eb84Ffb754A5B5619F138da7633e5b3",
+    },
 } as const;
 
 export const CUSTOM_POOL_DEPLOYER_TITLES: Record<PoolDeployerType, string> = {
     BASE_DYNAMIC: "Dynamic",
     BASE_03: "0.3%",
     BASE_1: "1%",
+    NAV_HOOK: "NAV Hook",
 } as const;
 
 export const customPoolDeployerTitleByAddress: Record<Address, string> = Object.fromEntries(
diff --git a/config/wagmi.ts b/config/wagmi.ts
index 92dc2a83..e3dc1097 100644
--- a/config/wagmi.ts
+++ b/config/wagmi.ts
@@ -19,6 +19,8 @@ import {
     votingEscrowABI,
     securityRegistryABI,
     binaryLMSRMarketManagerABI,
+    priceConvergenceVaultABI,
+    priceConvergenceVaultDepositGuardABI,
 } from "./abis";
 import {
     ALGEBRA_ETERNAL_FARMING,
@@ -90,6 +92,8 @@ const rawContracts = [
     { name: "VotingEscrow", abi: votingEscrowABI },
     { name: "SecurityRegistry", abi: securityRegistryABI },
     { name: "BinaryLMSRMarketManager", abi: binaryLMSRMarketManagerABI },
+    { name: "PriceConvergenceVault", abi: priceConvergenceVaultABI },
+    { name: "PriceConvergenceVaultDepositGuard", abi: priceConvergenceVaultDepositGuardABI },
 ];
 
 const contractAddresses = {
diff --git a/package.json b/package.json
index 0a2b7e82..9e8e52fb 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "dependencies": {
         "@apollo/client": "^3.8.4",
         "@cryptoalgebra/alm-sdk": "^1.0.16",
-        "@cryptoalgebra/integral-omega-router-sdk": "1.0.1",
-        "@cryptoalgebra/integral-sdk": "1.1.2",
+        "@cryptoalgebra/integral-omega-router-sdk": "1.0.2",
+        "@cryptoalgebra/integral-sdk": "1.1.3",
         "@cryptoalgebra/router-custom-pools-and-sliding-fee": "npm:@cryptoalgebra/router-custom-pools@2.0.5",
         "@radix-ui/react-avatar": "^1.0.4",
         "@radix-ui/react-dialog": "^1.0.5",
diff --git a/src/assets/tokens/m4626.png b/src/assets/tokens/m4626.png
new file mode 100644
index 00000000..f442e11e
Binary files /dev/null and b/src/assets/tokens/m4626.png differ
diff --git a/src/assets/tokens/wtsgov.png b/src/assets/tokens/wtsgov.png
new file mode 100644
index 00000000..7f0d2200
Binary files /dev/null and b/src/assets/tokens/wtsgov.png differ
diff --git a/src/components/common/CurrencyLogo/index.tsx b/src/components/common/CurrencyLogo/index.tsx
index 3a9cba8a..8c1c1dcf 100644
--- a/src/components/common/CurrencyLogo/index.tsx
+++ b/src/components/common/CurrencyLogo/index.tsx
@@ -4,6 +4,8 @@ import BTCLogo from "@/assets/tokens/wbtc.svg";
 import USDCLogo from "@/assets/tokens/usdc.svg";
 import USDCBlackLogo from "@/assets/tokens/usdc-black.png";
 import USDTBlackLogo from "@/assets/tokens/usdt-black.png";
+import m4626Logo from "@/assets/tokens/m4626.png";
+import WTSGOVLogo from "@/assets/tokens/wtsgov.png";
 import EtherLogo from "@/assets/tokens/ether.svg";
 import ProjectXLogo from "@/assets/tokens/project-x.jpg";
 import TOKENLogo from "@/assets/algebra-logo.svg";
@@ -70,6 +72,26 @@ export const specialTokens: { [key: Address]: { symbol: string; logo: string } }
         symbol: "AVETH",
         logo: EtherLogo,
     },
+    ["0x4db3fba9958f7ee9715875e485ceae299714029c"]: {
+        symbol: "m4626",
+        logo: m4626Logo,
+    },
+    ["0x0acae280cc7695e5bbbd6fb4b5b1b39c9594638d"]: {
+        symbol: "USDC",
+        logo: USDCLogo,
+    },
+    ["0xdDC1FD535E7243f43465094f43Ee8a03A5189acd"]: {
+        symbol: "USDC",
+        logo: USDCLogo,
+    },
+    ["0x980447AbF3B26B41c7f1777C2A8dF41cCd62ace6"]: {
+        symbol: "WTSGOV",
+        logo: WTSGOVLogo,
+    },
+};
+
+const getSpecialToken = (address: Address): { symbol: string; logo: string } | undefined => {
+    return Object.entries(specialTokens).find(([key]) => key.toLowerCase() === address.toLowerCase())?.[1];
 };
 
 const CurrencyLogo = ({ currency, size, className, style = {} }: CurrencyLogoProps) => {
@@ -85,17 +107,9 @@ const CurrencyLogo = ({ currency, size, className, style = {} }: CurrencyLogoPro
 
     const classString = cn(`w-[${size}px] h-[${size}px] min-w-[${size}px] min-h-[${size}px] bg-card-dark rounded-full`, className);
 
-    if (address in specialTokens) {
-        return (
-            <img
-                src={specialTokens[address].logo}
-                alt={specialTokens[address].symbol}
-                width={size}
-                height={size}
-                className={classString}
-                style={style}
-            />
-        );
+    const specialToken = getSpecialToken(address);
+    if (specialToken) {
+        return <img src={specialToken.logo} alt={specialToken.symbol} width={size} height={size} className={classString} style={style} />;
     }
 
     if (currency.isNative) {
diff --git a/src/components/common/Header/index.tsx b/src/components/common/Header/index.tsx
index 2c6ff215..8ae146e6 100644
--- a/src/components/common/Header/index.tsx
+++ b/src/components/common/Header/index.tsx
@@ -30,7 +30,7 @@ export const Algebra = () => (
         <NavLink to={"/"}>
             <div className="flex items-center gap-4 md:mr-2 rounded-3xl duration-200">
                 <div className="flex items-center justify-center w-[32px] h-[32px] rounded-lg">
-                    <img src={AlgebraLogo} width={48} height={48} />
+                    <img className="min-w-8 min-h-8" src={AlgebraLogo} width={48} height={48} />
                 </div>
                 <img className="max-lg:hidden" src={AlgebraIntegral} width={140} height={25} />
             </div>
diff --git a/src/components/common/Table/poolsColumns.tsx b/src/components/common/Table/poolsColumns.tsx
index 1fdd7695..7d18b853 100644
--- a/src/components/common/Table/poolsColumns.tsx
+++ b/src/components/common/Table/poolsColumns.tsx
@@ -19,7 +19,10 @@ import BoostedPoolsModule from "@/modules/BoostedPoolsModule";
 const { BoostedTag, BoostedAPR } = BoostedPoolsModule.components;
 const { useBoostedTokenAPR } = BoostedPoolsModule.hooks;
 
-const PoolPair = ({ pair, id, hasALM, hasActiveFarming }: FormattedPool) => {
+import NAVHookModule from "@/modules/NAVHookModule";
+const { NAVHookTag } = NAVHookModule.components;
+
+const PoolPair = ({ pair, id, hasALM, hasActiveFarming, hasNAVHook }: FormattedPool) => {
     const token0 = pair.token0.id as Address;
     const token1 = pair.token1.id as Address;
 
@@ -42,6 +45,7 @@ const PoolPair = ({ pair, id, hasALM, hasActiveFarming }: FormattedPool) => {
             <div className="flex items-center gap-2">
                 {hasActiveFarming && <FarmTag poolAddress={id} />}
                 {hasALM && <ALMTag poolAddress={id} />}
+                {enabledModules.NAVHookModule && hasNAVHook && <NAVHookTag />}
                 <BoostedTag currencyA={currencyA} currencyB={currencyB} />
             </div>
             {/* <div className="bg-muted-primary text-primary-text rounded-xl px-2 py-1">{`${fee}%`}</div> */}
diff --git a/src/components/common/Table/poolsTable.tsx b/src/components/common/Table/poolsTable.tsx
index 949ac43d..ee82b3a3 100644
--- a/src/components/common/Table/poolsTable.tsx
+++ b/src/components/common/Table/poolsTable.tsx
@@ -2,25 +2,27 @@ import { Button } from "@/components/ui/button";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
 import {
     ColumnDef,
-    OnChangeFn,
-    SortingState,
     flexRender,
     getCoreRowModel,
     getFilteredRowModel,
     getPaginationRowModel,
     getSortedRowModel,
+    SortingState,
     useReactTable,
 } from "@tanstack/react-table";
-import { useMemo, useState } from "react";
+import { useState } from "react";
 import { LoadingState } from "./loadingState";
 import { Input } from "@/components/ui/input";
-import { Search, User, X, Zap } from "lucide-react";
+import { Filter, Search, User, X } from "lucide-react";
 import { enabledModules } from "config/app-modules";
 import { useNavigate } from "react-router-dom";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Checkbox } from "@/components/ui/checkbox";
 
 type ActiveFilters = {
     hasActiveFarming?: boolean;
     hasALM?: boolean;
+    hasNAVHook?: boolean;
     isMyPool?: boolean;
     isBoosted?: boolean;
 };
@@ -35,7 +37,7 @@ interface PoolsTableProps<TData, TValue> {
     loading?: boolean;
 }
 
-const SHOWCASE_SORT_ID = "__showcasePriority";
+// const SHOWCASE_SORT_ID = "__showcasePriority";
 
 const PoolsTable = <TData, TValue>({
     columns,
@@ -46,49 +48,46 @@ const PoolsTable = <TData, TValue>({
     showPagination = true,
     loading,
 }: PoolsTableProps<TData, TValue>) => {
-    const [sorting, setSorting] = useState<SortingState>(() => {
-        const defaultSort = defaultSortingID ? [{ id: defaultSortingID, desc: true }] : [];
-        return [{ id: SHOWCASE_SORT_ID, desc: true }, ...defaultSort];
-    });
+    const [sorting, setSorting] = useState<SortingState>(defaultSortingID ? [{ id: defaultSortingID, desc: true }] : []);
 
     const [columnFilters, setColumnFilters] = useState<any[]>([]);
     const [activeFilters, setActiveFilters] = useState<ActiveFilters>({});
-    const columnsWithShowcaseSort = useMemo(
-        () => [
-            ...columns,
-            {
-                id: SHOWCASE_SORT_ID,
-                accessorFn: (row: any) => (row?.isShowcase ? 1 : 0),
-                header: () => null,
-                cell: () => null,
-            } as ColumnDef<TData, TValue>,
-        ],
-        [columns]
-    );
+    // const columnsWithShowcaseSort = useMemo(
+    //     () => [
+    //         ...columns,
+    //         {
+    //             id: SHOWCASE_SORT_ID,
+    //             accessorFn: (row: any) => (row?.isShowcase ? 1 : 0),
+    //             header: () => null,
+    //             cell: () => null,
+    //         } as ColumnDef<TData, TValue>,
+    //     ],
+    //     [columns]
+    // );
 
-    const handleSortingChange: OnChangeFn<SortingState> = (updater) => {
-        setSorting((prev) => {
-            const next = typeof updater === "function" ? updater(prev) : updater;
-            const withoutShowcase = next.filter((s) => s.id !== SHOWCASE_SORT_ID);
-            return [{ id: SHOWCASE_SORT_ID, desc: true }, ...withoutShowcase];
-        });
-    };
+    // const handleSortingChange: OnChangeFn<SortingState> = (updater) => {
+    //     setSorting((prev) => {
+    //         const next = typeof updater === "function" ? updater(prev) : updater;
+    //         const withoutShowcase = next.filter((s) => s.id !== SHOWCASE_SORT_ID);
+    //         return [{ id: SHOWCASE_SORT_ID, desc: true }, ...withoutShowcase];
+    //     });
+    // };
 
     const table = useReactTable({
         data,
-        columns: columnsWithShowcaseSort,
+        columns,
         initialState: {
-            columnVisibility: {
-                [SHOWCASE_SORT_ID]: false,
-            },
+            // columnVisibility: {
+            //     [SHOWCASE_SORT_ID]: false,
+            // },
         },
         state: {
             columnFilters,
             sorting,
             globalFilter: activeFilters,
         },
+        onSortingChange: setSorting,
         onColumnFiltersChange: setColumnFilters,
-        onSortingChange: handleSortingChange,
         onGlobalFilterChange: setActiveFilters,
         getCoreRowModel: getCoreRowModel(),
         getFilteredRowModel: getFilteredRowModel(),
@@ -99,6 +98,7 @@ const PoolsTable = <TData, TValue>({
             const f = filterValue as ActiveFilters;
             if (f.hasActiveFarming && !row.original.hasActiveFarming) return false;
             if (f.hasALM && !row.original.hasALM) return false;
+            if (f.hasNAVHook && !row.original.hasNAVHook) return false;
             if (f.isMyPool && !row.original.isMyPool) return false;
             if (f.isBoosted && !row.original.isBoosted) return false;
             return true;
@@ -124,6 +124,13 @@ const PoolsTable = <TData, TValue>({
         return Boolean(activeFilters[filterId]);
     };
 
+    const activePoolTypeFilters = [
+        activeFilters.hasActiveFarming,
+        activeFilters.hasALM,
+        activeFilters.hasNAVHook,
+        activeFilters.isBoosted,
+    ].filter(Boolean).length;
+
     if (loading) return <LoadingState />;
 
     return (
@@ -135,53 +142,86 @@ const PoolsTable = <TData, TValue>({
                             placeholder="Search pool"
                             value={(table.getColumn(searchID)?.getFilterValue() as string) ?? ""}
                             onChange={(event) => table.getColumn(searchID)?.setFilterValue(event.target.value)}
-                            className="border border-border border-opacity-60 pl-12 h-10 max-w-80 md:w-64 lg:w-80 focus:border-opacity-100 focus:bg-primary-800 rounded-lg"
+                            className="border-none pl-12 h-10 max-w-80 md:w-64 lg:w-80 focus:border-opacity-100 focus:bg-primary-800 rounded-full bg-card-light"
                         />
                         <Search className="absolute left-4 text-border" size={20} />
                     </div>
                     <div className="grid grid-cols-2 gap-3 md:flex w-full sm:w-fit">
-                        {enabledModules.FarmingModule && (
-                            <Button
-                                onClick={() => toggleFilter("hasActiveFarming")}
-                                variant={isFilterActive("hasActiveFarming") ? "iconActive" : "outline"}
-                                size="md"
-                                className="flex h-10 min-w-[130px] items-center gap-2 whitespace-nowrap rounded-lg py-4"
-                            >
-                                <span className="w-2 h-2 bg-yellow-950 border border-yellow-500 rotate-45" />
-                                <span>Farm Pools</span>
-                            </Button>
-                        )}
-                        {enabledModules.ALMModule && (
-                            <Button
-                                onClick={() => toggleFilter("hasALM")}
-                                variant={isFilterActive("hasALM") ? "iconActive" : "outline"}
-                                size="md"
-                                className="flex h-10 min-w-[130px] items-center gap-2 whitespace-nowrap rounded-lg p-4"
-                            >
-                                <span className="w-2 h-2 bg-cyan-950 border border-cyan-500 rotate-45" />
-                                <span>ALM Pools</span>
-                            </Button>
-                        )}
-                        {enabledModules.BoostedPoolsModule && (
-                            <Button
-                                onClick={() => toggleFilter("isBoosted")}
-                                variant={isFilterActive("isBoosted") ? "iconActive" : "outline"}
-                                size="md"
-                                className="flex h-10 min-w-[130px] items-center gap-2 whitespace-nowrap rounded-lg p-4"
-                            >
-                                <Zap className="text-purple-400" size={16} />
-                                <span>Boosted</span>
-                            </Button>
-                        )}
                         <Button
                             onClick={() => toggleFilter("isMyPool")}
                             variant={isFilterActive("isMyPool") ? "iconActive" : "outline"}
                             size="md"
-                            className="flex h-10 min-w-[130px] items-center gap-2 whitespace-nowrap rounded-lg p-4"
+                            className="flex h-10 min-w-[130px] items-center gap-2 whitespace-nowrap rounded-full p-4"
                         >
                             <User className="text-primary-200" size={16} />
                             <span>My Pools</span>
                         </Button>
+                        <Popover>
+                            <PopoverTrigger asChild>
+                                <Button
+                                    variant={activePoolTypeFilters ? "iconActive" : "outline"}
+                                    size="md"
+                                    className="flex h-10 min-w-10 items-center gap-2 whitespace-nowrap rounded-full p-4"
+                                >
+                                    <Filter size={16} />
+                                    <span>Filters</span>
+                                    {activePoolTypeFilters > 0 && (
+                                        <span className="flex h-5 min-w-5 items-center justify-center rounded-full bg-primary-200 px-1.5 text-xs font-semibold text-text-100">
+                                            {activePoolTypeFilters}
+                                        </span>
+                                    )}
+                                </Button>
+                            </PopoverTrigger>
+                            <PopoverContent align="start" sideOffset={8} className="w-56 p-2">
+                                <div className="flex flex-col gap-1">
+                                    {enabledModules.FarmingModule && (
+                                        <label className="flex cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm text-text-200 transition-colors hover:bg-card-hover">
+                                            <span className="flex items-center gap-3">
+                                                <span className="h-2.5 w-2.5 rotate-45 border border-yellow-500 bg-yellow-950" />
+                                                Farm
+                                            </span>
+                                            <Checkbox
+                                                checked={isFilterActive("hasActiveFarming")}
+                                                onCheckedChange={() => toggleFilter("hasActiveFarming")}
+                                            />
+                                        </label>
+                                    )}
+                                    {enabledModules.ALMModule && (
+                                        <label className="flex cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm text-text-200 transition-colors hover:bg-card-hover">
+                                            <span className="flex items-center gap-3">
+                                                <span className="h-2.5 w-2.5 rotate-45 border border-cyan-500 bg-cyan-950" />
+                                                ALM
+                                            </span>
+                                            <Checkbox checked={isFilterActive("hasALM")} onCheckedChange={() => toggleFilter("hasALM")} />
+                                        </label>
+                                    )}
+                                    {enabledModules.NAVHookModule && (
+                                        <label className="flex cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm text-text-200 transition-colors hover:bg-card-hover">
+                                            <span className="flex items-center gap-3">
+                                                <span className="h-2.5 w-2.5 rotate-45 border border-emerald-500 bg-emerald-950" />
+                                                NAV
+                                            </span>
+                                            <Checkbox
+                                                checked={isFilterActive("hasNAVHook")}
+                                                onCheckedChange={() => toggleFilter("hasNAVHook")}
+                                            />
+                                        </label>
+                                    )}
+                                    {enabledModules.BoostedPoolsModule && (
+                                        <label className="flex cursor-pointer items-center justify-between gap-3 rounded-lg px-3 py-2 text-sm text-text-200 transition-colors hover:bg-card-hover">
+                                            <span className="flex items-center gap-3">
+                                                <span className="h-2.5 w-2.5 rotate-45 border border-purple-500 bg-purple-950" />
+                                                Boosted
+                                            </span>
+                                            <Checkbox
+                                                checked={isFilterActive("isBoosted")}
+                                                onCheckedChange={() => toggleFilter("isBoosted")}
+                                            />
+                                        </label>
+                                    )}
+                                </div>
+                            </PopoverContent>
+                        </Popover>
                     </div>
                     <Button
                         hidden={
@@ -189,6 +229,7 @@ const PoolsTable = <TData, TValue>({
                                 isFilterActive("isMyPool") ||
                                 isFilterActive("hasActiveFarming") ||
                                 isFilterActive("hasALM") ||
+                                isFilterActive("hasNAVHook") ||
                                 isFilterActive("isBoosted")
                             )
                         }
@@ -197,7 +238,7 @@ const PoolsTable = <TData, TValue>({
                             setColumnFilters([]);
                             setActiveFilters({});
                         }}
-                        className="flex h-10 w-fit ml-auto items-center gap-2 whitespace-nowrap rounded-lg p-4"
+                        className="flex h-10 w-fit ml-auto items-center gap-2 whitespace-nowrap rounded-full p-4"
                         variant="outline"
                     >
                         <X size={18} />
diff --git a/src/components/create-pool/CreatePoolForm/index.tsx b/src/components/create-pool/CreatePoolForm/index.tsx
index 103442ac..19f172e6 100644
--- a/src/components/create-pool/CreatePoolForm/index.tsx
+++ b/src/components/create-pool/CreatePoolForm/index.tsx
@@ -56,6 +56,7 @@ const CreatePoolForm = () => {
             [CUSTOM_POOL_DEPLOYER_TITLES.BASE_DYNAMIC]: CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_DYNAMIC[chainid],
             [CUSTOM_POOL_DEPLOYER_TITLES.BASE_03]: CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_03[chainid],
             [CUSTOM_POOL_DEPLOYER_TITLES.BASE_1]: CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_1[chainid],
+            [CUSTOM_POOL_DEPLOYER_TITLES.NAV_HOOK]: CUSTOM_POOL_DEPLOYER_ADDRESSES.NAV_HOOK[chainid],
         }),
         [chainid],
     );
@@ -70,14 +71,20 @@ const CreatePoolForm = () => {
 
     const customPoolsAddresses =
         enabledModules.CustomPoolsModule && areCurrenciesSelected && !isSameToken
-            ? [CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_03[chainid], CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_1[chainid]].filter(isDefined).map(
-                  (customPoolDeployer) =>
-                      computeCustomPoolAddress({
-                          tokenA: currencyA.wrapped,
-                          tokenB: currencyB.wrapped,
-                          customPoolDeployer,
-                      }) as Address,
-              )
+            ? [
+                  CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_03[chainid],
+                  CUSTOM_POOL_DEPLOYER_ADDRESSES.BASE_1[chainid],
+                  CUSTOM_POOL_DEPLOYER_ADDRESSES.NAV_HOOK[chainid],
+              ]
+                  .filter(isDefined)
+                  .map(
+                      (customPoolDeployer) =>
+                          computeCustomPoolAddress({
+                              tokenA: currencyA.wrapped,
+                              tokenB: currencyB.wrapped,
+                              customPoolDeployer,
+                          }) as Address,
+                  )
             : [];
 
     const [poolState] = usePool(poolAddress);
@@ -87,12 +94,15 @@ const CreatePoolForm = () => {
     const [poolState1] = usePool(customPoolsAddresses[1]);
     // Base 1%
     const [poolState2] = usePool(customPoolsAddresses[2]);
+    // NAV Hook
+    const [poolState3] = usePool(customPoolsAddresses[3]);
 
     const isPoolExists = poolState === PoolState.EXISTS && poolDeployer === CUSTOM_POOL_DEPLOYER_TITLES.BASE_DYNAMIC;
     const isPool1Exists = poolState1 === PoolState.EXISTS && poolDeployer === CUSTOM_POOL_DEPLOYER_TITLES.BASE_03;
     const isPool2Exists = poolState2 === PoolState.EXISTS && poolDeployer === CUSTOM_POOL_DEPLOYER_TITLES.BASE_1;
+    const isPool3Exists = poolState3 === PoolState.EXISTS && poolDeployer === CUSTOM_POOL_DEPLOYER_TITLES.NAV_HOOK;
 
-    const isSelectedCustomPoolExists = isPoolExists || isPool1Exists || isPool2Exists;
+    const isSelectedCustomPoolExists = isPoolExists || isPool1Exists || isPool2Exists || isPool3Exists;
 
     const mintInfo = useDerivedMintInfo(
         currencyA ?? undefined,
@@ -199,7 +209,7 @@ const CreatePoolForm = () => {
                 {enabledModules.CustomPoolsModule ? (
                     <div className="rounded-xl bg-card-light px-3 py-3">
                         <div className="mb-2 text-xs uppercase tracking-wide text-text-300 text-left">Plugin</div>
-                        <div className="grid w-full grid-cols-3 gap-2">
+                        <div className="grid w-full grid-cols-2 md:grid-cols-4 gap-2">
                             {Object.entries(CUSTOM_POOL_DEPLOYER_TITLES).map(([, v]) => (
                                 <Button
                                     variant={poolDeployer === v ? "iconActive" : "outline"}
diff --git a/src/components/create-position/AmountsSection/index.tsx b/src/components/create-position/AmountsSection/index.tsx
index e8fe7441..9646b113 100644
--- a/src/components/create-position/AmountsSection/index.tsx
+++ b/src/components/create-position/AmountsSection/index.tsx
@@ -68,7 +68,7 @@ const AmountsSection = ({ tokenId, currencyA, currencyB, mintInfo, handleCloseMo
         <>
             <EnterAmounts currencyA={currencyA} currencyB={currencyB} mintInfo={mintInfo} />
             <HoverCard>
-                <HoverCardTrigger className="px-2">
+                <HoverCardTrigger className="px-1 mt-1">
                     <TokenRatio mintInfo={mintInfo} />
                 </HoverCardTrigger>
                 <HoverCardContent className="flex flex-col gap-2 bg-card rounded-xl border border-card-border text-text-100 w-fit">
@@ -77,7 +77,7 @@ const AmountsSection = ({ tokenId, currencyA, currencyB, mintInfo, handleCloseMo
                     </div>
                 </HoverCardContent>
             </HoverCard>
-            <div className="flex justify-between py-3 border-t border-card-border">
+            <div className="flex justify-between py-3 px-1 border-t border-card-border">
                 <div>
                     <div className="text-xs font-bold">ESTIMATED POSITION APR</div>
                     <div className="text-lg font-bold text-green-300">{apr ? `${apr.toFixed(2)}%` : 0}</div>
diff --git a/src/components/create-position/EnterAmounts/index.tsx b/src/components/create-position/EnterAmounts/index.tsx
index d7bc4c69..eea68c18 100644
--- a/src/components/create-position/EnterAmounts/index.tsx
+++ b/src/components/create-position/EnterAmounts/index.tsx
@@ -34,7 +34,7 @@ const EnterAmounts = ({ currencyA, currencyB, mintInfo }: EnterAmountsProps) =>
 
     return (
         <div className="flex flex-col md:flex-row lg:flex-col gap-2">
-            <div className="flex w-full relative border-b border-card-border pb-2">
+            <div className="flex w-full relative">
                 <EnterAmountCard
                     currency={currencyA}
                     value={formattedAmounts[Field.CURRENCY_A]}
diff --git a/src/components/create-position/EnterAmountsCard/index.tsx b/src/components/create-position/EnterAmountsCard/index.tsx
index 3fa0fcee..7fcb464d 100644
--- a/src/components/create-position/EnterAmountsCard/index.tsx
+++ b/src/components/create-position/EnterAmountsCard/index.tsx
@@ -8,6 +8,7 @@ import { useAccount, useBalance } from "wagmi";
 import { useMintState } from "@/state/mintStore";
 import { unwrappedToken } from "@/utils/common/unwrappedToken";
 import BoostedPoolsModule from "@/modules/BoostedPoolsModule";
+import { enabledModules } from "config";
 
 const { BoostedTokenWrapToggle } = BoostedPoolsModule.components;
 
@@ -17,9 +18,17 @@ interface EnterAmountsCardProps {
     handleChange: (value: string) => void;
     valueUsd?: number | null;
     field: Field;
+    showBoostedToggle?: boolean;
 }
 
-const EnterAmountCard = ({ currency, value, handleChange, valueUsd, field }: EnterAmountsCardProps) => {
+const EnterAmountCard = ({
+    currency,
+    value,
+    handleChange,
+    valueUsd,
+    field,
+    showBoostedToggle = enabledModules.ALMModule,
+}: EnterAmountsCardProps) => {
     const { address: account } = useAccount();
     const { token0InputMode, token1InputMode } = useMintState();
 
@@ -49,60 +58,41 @@ const EnterAmountCard = ({ currency, value, handleChange, valueUsd, field }: Ent
             if (value === ".") value = "0.";
             handleChange(value);
         },
-        [handleChange]
+        [handleChange],
     );
 
-    function setMax() {
-        handleChange(balance?.formatted || "0");
-    }
+    // function setMax() {
+    //     handleChange(balance?.formatted || "0");
+    // }
 
     return (
-        <div className="flex w-full bg-card-dark p-3 rounded-lg flex-col gap-3">
-            <div className="flex w-full">
-                <div className="flex flex-col gap-2">
-                    <div className="flex items-center gap-4 min-h-10">
-                        <div className="relative w-12 h-12">
-                            <CurrencyLogo currency={displayCurrency} size={48} />
-                        </div>
-
-                        <div>
-                            <div className="text-sm text-text-200">{displayCurrency ? displayCurrency.name : ""}</div>
-                            <div className="flex items-center gap-2">
-                                <span className="font-bold text-lg">{displayCurrency ? displayCurrency.symbol : "Select a token"}</span>
-                            </div>
-                        </div>
-                    </div>
-                    {displayCurrency && (
-                        <div className={"flex text-sm whitespace-nowrap"}>
-                            <div>
-                                <span className="font-semibold">Balance: </span>
-                                <span>{balanceString}</span>
-                            </div>
-                            <button className="ml-2 text-primary-50 underline underline-offset-4 hover:text-primary-50/70" onClick={setMax}>
-                                Max
-                            </button>
-                        </div>
-                    )}
+        <div className="flex w-full flex-col gap-3 rounded-xl bg-card-light p-3 transition-colors hover:bg-card-light/90">
+            <div className="flex w-full items-center justify-between gap-6">
+                <div className="flex min-w-fit items-center gap-2">
+                    <CurrencyLogo currency={displayCurrency} size={30} />
+                    <span className="max-w-[150px] truncate text-lg font-semibold text-text-100">
+                        {displayCurrency ? displayCurrency.symbol : "Select"}
+                    </span>
                 </div>
 
-                <div className="flex flex-col items-end w-full gap-2">
-                    <Input
-                        value={value}
-                        id={`amount-${displayCurrency?.symbol}`}
-                        onUserInput={(v) => handleInput(v)}
-                        className={`text-right border-none text-xl font-bold w-9/12 p-0 ring-0!`}
-                        placeholder={"0.0"}
-                        maxDecimals={displayCurrency?.decimals}
-                    />
-                    {valueUsd && (
-                        <div className="text-sm">
-                            <div>${formatAmount(valueUsd, 2)}</div>
-                        </div>
-                    )}
-                </div>
+                <Input
+                    value={value}
+                    id={`amount-${displayCurrency?.symbol}`}
+                    onUserInput={(v) => handleInput(v)}
+                    className="w-full border-none bg-transparent p-0 text-right text-2xl font-semibold text-text-100 placeholder:text-text-300 focus:ring-0 focus-visible:ring-0"
+                    placeholder="0.00"
+                    maxDecimals={displayCurrency?.decimals}
+                />
+            </div>
+
+            <div className="flex items-center justify-between gap-3 text-xs text-text-300">
+                {displayCurrency ? <span>Balance: {balanceString}</span> : <span />}
+                {valueUsd !== undefined && valueUsd !== null && <span>${formatAmount(valueUsd, 2)}</span>}
             </div>
 
-            <BoostedTokenWrapToggle currency={currency} field={field} currentValue={value} onAmountChange={handleChange} />
+            {showBoostedToggle && (
+                <BoostedTokenWrapToggle currency={currency} field={field} currentValue={value} onAmountChange={handleChange} />
+            )}
         </div>
     );
 };
diff --git a/src/components/create-position/TokenRatio/index.tsx b/src/components/create-position/TokenRatio/index.tsx
index 990ba444..396b079a 100644
--- a/src/components/create-position/TokenRatio/index.tsx
+++ b/src/components/create-position/TokenRatio/index.tsx
@@ -13,38 +13,42 @@ const TokenRatio = ({ mintInfo }: TokenRatioProps) => {
     } = mintInfo;
 
     const [token0Ratio, token1Ratio] = useMemo(() => {
-        const tickUpperAtLimit =
-            mintInfo.upperPrice && nearestUsableTick(TickMath.MAX_TICK, mintInfo.tickSpacing) === priceToClosestTick(mintInfo.upperPrice);
-        const currentPrice = mintInfo.price?.toSignificant(5);
+        try {
+            const tickUpperAtLimit =
+                mintInfo.upperPrice &&
+                nearestUsableTick(TickMath.MAX_TICK, mintInfo.tickSpacing) === priceToClosestTick(mintInfo.upperPrice);
+            const currentPrice = mintInfo.price?.toSignificant(5);
 
-        const left = mintInfo.lowerPrice?.toSignificant(5);
-        const right = mintInfo.upperPrice?.toSignificant(5);
+            const left = mintInfo.lowerPrice?.toSignificant(5);
+            const right = mintInfo.upperPrice?.toSignificant(5);
 
-        if (tickUpperAtLimit) return ["50", "50"];
+            if (tickUpperAtLimit) return ["50", "50"];
 
-        if (!currentPrice) return ["0", "0"];
+            if (!currentPrice) return ["0", "0"];
 
-        if (!left && !right) return ["0", "0"];
+            if (!left && !right) return ["0", "0"];
 
-        if (!left && right) return ["0", "100"];
+            if (!left && right) return ["0", "100"];
 
-        if (!right && left) return ["100", "0"];
+            if (!right && left) return ["100", "0"];
 
-        if (left && right && currentPrice) {
-            const leftRange = +currentPrice - +left;
-            const rightRange = +right - +currentPrice;
+            if (left && right && currentPrice) {
+                const leftRange = +currentPrice - +left;
+                const rightRange = +right - +currentPrice;
 
-            const totalSum = +leftRange + +rightRange;
+                const totalSum = +leftRange + +rightRange;
 
-            const leftRate = (+leftRange * 100) / totalSum;
-            const rightRate = (+rightRange * 100) / totalSum;
+                const leftRate = (+leftRange * 100) / totalSum;
+                const rightRate = (+rightRange * 100) / totalSum;
 
-            if (!mintInfo.invertPrice) {
-                return [String(rightRate >= 100 ? 100 : rightRate), String(leftRate >= 100 ? 100 : leftRate)];
+                if (!mintInfo.invertPrice) {
+                    return [String(rightRate >= 100 ? 100 : rightRate), String(leftRate >= 100 ? 100 : leftRate)];
+                }
+                return [String(leftRate >= 100 ? 100 : leftRate), String(rightRate >= 100 ? 100 : rightRate)];
             }
-            return [String(leftRate >= 100 ? 100 : leftRate), String(rightRate >= 100 ? 100 : rightRate)];
+        } catch (error) {
+            console.error(error);
         }
-
         return [null, null];
     }, [mintInfo.invertPrice, mintInfo.lowerPrice, mintInfo.price, mintInfo.tickSpacing, mintInfo.upperPrice]);
 
diff --git a/src/components/modals/IncreaseLiquidityModal/index.tsx b/src/components/modals/IncreaseLiquidityModal/index.tsx
index 0006928d..a9b2c0a4 100644
--- a/src/components/modals/IncreaseLiquidityModal/index.tsx
+++ b/src/components/modals/IncreaseLiquidityModal/index.tsx
@@ -26,7 +26,7 @@ export function IncreaseLiquidityModal({ tokenId, currencyA, currencyB, mintInfo
                     Add Liquidity
                 </Button>
             </DialogTrigger>
-            <DialogContent className="max-w-[500px] rounded-xl! bg-card">
+            <DialogContent className="max-w-[500px] rounded-2xl bg-card">
                 <DialogHeader>
                     <DialogTitle className="font-bold select-none mt-2 max-md:mx-auto">Enter Amounts</DialogTitle>
                 </DialogHeader>
diff --git a/src/components/pool/MyPositionsToolbar/index.tsx b/src/components/pool/MyPositionsToolbar/index.tsx
index cbafd694..be34497d 100644
--- a/src/components/pool/MyPositionsToolbar/index.tsx
+++ b/src/components/pool/MyPositionsToolbar/index.tsx
@@ -1,55 +1,60 @@
 import { FormattedPosition } from "@/types/formatted-position";
-import { formatPlural } from "@/utils/common/formatPlural";
 import { formatAmount } from "@/utils/common/formatAmount";
-import { Currency } from "@cryptoalgebra/integral-sdk";
-import CurrencyLogo from "@/components/common/CurrencyLogo";
 import FilterPopover from "../FilterPopover";
-import { Settings2 } from "lucide-react";
-import SecurityStatusTag from "@/components/pools/SecurityStatusTag";
+import { ListFilter } from "lucide-react";
 
 interface MyPositionsToolbar {
     positionsData: FormattedPosition[];
-    currencyA: Currency | undefined | null;
-    currencyB: Currency | undefined | null;
-    poolStatus: number | undefined | null;
 }
 
-const MyPositionsToolbar = ({ positionsData, currencyA, currencyB, poolStatus }: MyPositionsToolbar) => {
+const MyPositionsToolbar = ({ positionsData }: MyPositionsToolbar) => {
     const [myLiquidityUSD, myFeesUSD] = positionsData
         ? positionsData.reduce((acc, { liquidityUSD, feesUSD }) => [acc[0] + liquidityUSD, acc[1] + Number(feesUSD)], [0, 0])
         : [];
 
+    const activePositions = positionsData.filter(({ isALM, isClosed, onFarming }) => !isALM && !isClosed && !onFarming).length;
+    const farmingPositions = positionsData.filter(({ isClosed, onFarming }) => !isClosed && onFarming).length;
+    const almPositions = positionsData.filter(({ isALM, isClosed, onFarming }) => isALM && !isClosed && !onFarming).length;
+
+    const summaryItems = [
+        {
+            label: "Positions",
+            value: (activePositions + farmingPositions + almPositions).toString(),
+        },
+        {
+            label: "Liquidity",
+            value: `$${formatAmount(myLiquidityUSD || 0, 2)}`,
+        },
+        {
+            label: "Fees",
+            value: `$${formatAmount(myFeesUSD || 0, 2)}`,
+        },
+    ];
+
+    if (!positionsData.length) {
+        return null;
+    }
+
     return (
-        <div className="flex gap-3 md:flex-row pb-3 items-center min-h-16 justify-between mb-3 w-full">
-            <div className="flex w-full col-span-3 items-start gap-4 flex-col">
-                <div className="flex items-center gap-4 justify-between w-full">
-                    <CurrencyLogo currency={currencyA} size={40} />
-                    <CurrencyLogo currency={currencyB} size={40} className="-ml-6" />
-                    <h1 className="scroll-m-20 font-bold tracking-tight lg:text-2xl">
-                        {currencyA?.symbol} / {currencyB?.symbol}
-                    </h1>
-
-                    <SecurityStatusTag status={poolStatus} />
-
-                    <div className="ml-auto">
-                        <FilterPopover>
-                            <Settings2 className="w-fit h-fit" />
-                        </FilterPopover>
-                    </div>
-                </div>
-                {myLiquidityUSD ? (
-                    <div className="flex items-center gap-4">
-                        <div className="font-semibold">{`${positionsData?.length} ${formatPlural(
-                            positionsData.length,
-                            "position",
-                            "positions"
-                        )}`}</div>
-                        <div className="w-1.5 h-1.5 bg-white/5 border border-white/25 rotate-45" />
-                        <div className="text-cyan-200 font-semibold">{`$${formatAmount(myLiquidityUSD || 0, 2)} TVL`}</div>
-                        <div className="w-1.5 h-1.5 bg-white/5 border border-white/25 rotate-45" />
-                        <div className="text-green-300 font-semibold">{`$${formatAmount(myFeesUSD || 0, 2)} Fees`}</div>
+        <div className="flex w-full flex-col gap-3 pb-3">
+            <div className="flex items-center justify-between gap-3">
+                <h2 className="text-2xl font-bold leading-tight text-text-100">My Positions</h2>
+
+                <FilterPopover>
+                    <ListFilter size={18} />
+                </FilterPopover>
+            </div>
+
+            <div className="grid grid-cols-2 gap-3 md:grid-cols-3">
+                {summaryItems.map(({ label, value }) => (
+                    <div
+                        key={label}
+                        className="flex min-h-20 flex-col items-start justify-center rounded-2xl border border-card-border bg-card/70 px-5 py-4 text-left"
+                    >
+                        <span className="text-sm font-semibold text-text-300">{label}</span>
+                        <span className="text-lg font-semibold text-text-100">{value}</span>
                     </div>
-                ) : null}
+                ))}
             </div>
         </div>
     );
diff --git a/src/components/pool/PoolHeader/index.tsx b/src/components/pool/PoolHeader/index.tsx
index 950bf9bf..dcffcc49 100644
--- a/src/components/pool/PoolHeader/index.tsx
+++ b/src/components/pool/PoolHeader/index.tsx
@@ -1,26 +1,117 @@
-import PageTitle from "@/components/common/PageTitle";
+import CurrencyLogo from "@/components/common/CurrencyLogo";
+import SecurityStatusTag from "@/components/pools/SecurityStatusTag";
 import { Button } from "@/components/ui/button";
-import { Plus } from "lucide-react";
+import { useBlockExplorerURL } from "@/hooks/common/useBlockExplorer";
+import { PoolStats } from "@/hooks/pools/usePoolStats";
+import NAVHookModule from "@/modules/NAVHookModule";
+import { formatAmount } from "@/utils/common/formatAmount";
+import { Currency } from "@cryptoalgebra/integral-sdk";
+import { enabledModules } from "config";
+import { ChevronLeft, ExternalLink, Plus } from "lucide-react";
 import { Link } from "react-router-dom";
+import { Address } from "viem";
+
+const { NAVHookHeaderInfo } = NAVHookModule.components;
+const { useNAVHookPool } = NAVHookModule.hooks;
+
+interface PoolHeaderProps {
+    currencyA: Currency | undefined | null;
+    currencyB: Currency | undefined | null;
+    poolId: Address;
+    poolStatus: number | undefined | null;
+    stats: PoolStats;
+    showCreatePosition?: boolean;
+}
+
+const PoolHeader = ({ currencyA, currencyB, poolId, poolStatus, stats, showCreatePosition = true }: PoolHeaderProps) => {
+    const blockExplorerURL = useBlockExplorerURL();
+    const { isNAVHookPool } = useNAVHookPool(poolId);
+    const showNAVHookInfo = enabledModules.NAVHookModule && isNAVHookPool;
+
+    const headerStats = [
+        {
+            label: "TVL",
+            value: `$${formatAmount(stats.tvlUSD, 2)}`,
+        },
+        {
+            label: "Volume 24h",
+            value: `$${formatAmount(stats.volume24USD, 2)}`,
+        },
+        {
+            label: "Fees 24h",
+            value: `$${formatAmount(stats.fees24USD, 2)}`,
+        },
+        {
+            label: "APR",
+            value: `${formatAmount(stats.avgApr, 2)}%`,
+        },
+    ];
 
-const PoolHeader = ({ showCreatePosition = true }: { showCreatePosition?: boolean }) => {
     return (
-        <div className="flex items-center justify-between w-full mb-8">
-            <div className="w-full">
-                <PageTitle title="My positions" showSettings={false}></PageTitle>
+        <header className="flex w-full flex-col gap-5 mb-3 animate-fade-in">
+            <Link
+                to="/pools"
+                className="inline-flex w-fit items-center gap-2 text-sm font-semibold text-text-300 transition-colors hover:text-text-100"
+            >
+                <ChevronLeft size={18} />
+                Pools
+            </Link>
+
+            <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+                <div className="flex items-center gap-4 text-left">
+                    <div className="flex items-center">
+                        <CurrencyLogo currency={currencyA} size={48} />
+                        <CurrencyLogo currency={currencyB} size={48} className="-ml-4 ring-4 ring-card" />
+                    </div>
+                    <div className="flex min-w-0 flex-col gap-1">
+                        <div className="flex flex-wrap items-center gap-3">
+                            <h1 className="text-2xl font-bold leading-tight text-text-100 md:text-3xl">
+                                {currencyA?.symbol || "..."} - {currencyB?.symbol || "..."}
+                            </h1>
+                            <SecurityStatusTag status={poolStatus} />
+                        </div>
+
+                        {showNAVHookInfo ? (
+                            <NAVHookHeaderInfo />
+                        ) : (
+                            <p className="text-base font-semibold text-text-300">Fee: {formatAmount(stats.fee, 4)}%</p>
+                        )}
+                    </div>
+                </div>
+
+                <div className="flex items-center gap-3 md:justify-end">
+                    <Link to={`${blockExplorerURL}/address/${poolId}`} target="_blank">
+                        <Button
+                            variant={"icon"}
+                            size={"sm"}
+                            className="flex gap-2 min-h-12 min-w-12 rounded-full border border-card-border"
+                            aria-label="Transaction history"
+                        >
+                            <ExternalLink size={20} />
+                            Explorer
+                        </Button>
+                    </Link>
+
+                    {showCreatePosition && (
+                        <Button variant="primaryLink" size="md" className="whitespace-nowrap rounded-full gap-2" asChild>
+                            <Link to="new-position">
+                                <Plus size={18} className="text-text-100" />
+                                Create Position
+                            </Link>
+                        </Button>
+                    )}
+                </div>
             </div>
 
-            { showCreatePosition && <Link to={"new-position"}>
-                <Button
-                    variant={'primaryLink'}
-                    size={'md'}
-                    className="whitespace-nowrap rounded-full gap-2 ml-auto"
-                >
-                    <Plus size={20} className="text-text-100" />
-                    Create Position
-                </Button>
-            </Link> }
-        </div>
+            <div className="grid grid-cols-2 gap-2 rounded-2xl border border-card-border bg-bg-100/60 p-3 md:grid-cols-4 md:gap-3">
+                {headerStats.map(({ label, value }) => (
+                    <div key={label} className="flex min-h-16 flex-col items-start justify-center rounded-xl px-2 py-1 text-left">
+                        <span className="text-sm font-semibold text-text-300">{label}</span>
+                        <span className="text-xl font-semibold text-text-100">{stats.isLoading ? "..." : value}</span>
+                    </div>
+                ))}
+            </div>
+        </header>
     );
 };
 
diff --git a/src/components/position/PositionCard/index.tsx b/src/components/position/PositionCard/index.tsx
index ace54bdd..1ff5c373 100644
--- a/src/components/position/PositionCard/index.tsx
+++ b/src/components/position/PositionCard/index.tsx
@@ -54,10 +54,10 @@ const PositionCard = ({ pool, selectedPosition, farming, closedFarmings, poolSta
     if (!selectedPosition) return;
 
     return (
-        <div className="flex flex-col gap-6 bg-card border border-card-border rounded-xl p-4 animate-fade-in w-full">
+        <div className="flex flex-col gap-6 bg-card border border-card-border rounded-2xl p-4 animate-fade-in w-full">
             <div className="relative flex w-full justify-start text-left">
                 <div className="flex flex-col gap-4 w-full">
-                    <h2 className="scroll-m-20 text-2xl font-bold tracking-tight bg-card-hover -mx-4 px-4 -mt-4 py-4 rounded-t-xl border-b border-card-border lg:text-2xl">{`Position #${selectedPosition?.id}`}</h2>
+                    <h2 className="scroll-m-20 text-2xl font-bold tracking-tight bg-card-hover -mx-4 px-4 -mt-4 py-4 rounded-t-2xl border-b border-card-border lg:text-2xl">{`Position #${selectedPosition?.id}`}</h2>
 
                     <div className="flex gap-8 -mx-4 px-4 pb-4 border-b border-card-border">
                         <div>
diff --git a/src/components/swap/SwapButton/index.tsx b/src/components/swap/SwapButton/index.tsx
index dac94746..84f3b397 100644
--- a/src/components/swap/SwapButton/index.tsx
+++ b/src/components/swap/SwapButton/index.tsx
@@ -8,7 +8,7 @@ import { warningSeverity } from "@/utils/swap/prices";
 import { useCallback, useMemo } from "react";
 import { useAccount, useChainId } from "wagmi";
 import { SmartRouter } from "@cryptoalgebra/router-custom-pools-and-sliding-fee";
-import { tryParseAmount, BoostedRouteStepType } from "@cryptoalgebra/integral-sdk";
+import { tryParseAmount, BoostedRouteStepType, Currency } from "@cryptoalgebra/integral-sdk";
 import { useAppKit, useAppKitNetwork } from "@reown/appkit/react";
 import { useApproveCallbackFromTrade } from "@/hooks/common/useApprove";
 import { ApprovalState } from "@/types/approve-state";
@@ -65,15 +65,14 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
         return null;
     }, [trade, isSmartTrade]);
 
+    const tradeInputCurrency = trade?.inputAmount?.currency as Currency | undefined;
+    const tradeOutputCurrency = trade?.outputAmount?.currency as Currency | undefined;
+
     const parsedAmountA =
-        independentField === SwapField.INPUT
-            ? parsedAmount
-            : tryParseAmount(trade?.inputAmount?.toSignificant(), trade?.inputAmount?.currency);
+        independentField === SwapField.INPUT ? parsedAmount : tryParseAmount(trade?.inputAmount?.toSignificant(), tradeInputCurrency);
 
     const parsedAmountB =
-        independentField === SwapField.OUTPUT
-            ? parsedAmount
-            : tryParseAmount(trade?.outputAmount?.toSignificant(), trade?.outputAmount?.currency);
+        independentField === SwapField.OUTPUT ? parsedAmount : tryParseAmount(trade?.outputAmount?.toSignificant(), tradeOutputCurrency);
 
     const parsedAmounts = useMemo(
         () => ({
@@ -160,8 +159,8 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
     const showWrap = wrapType !== WrapType.NOT_APPLICABLE;
 
     const { callback: smartSwapCallback, isLoading: smartSwapLoading } = useSmartRouterCallback(
-        trade?.inputAmount?.currency,
-        trade?.outputAmount?.currency,
+        tradeInputCurrency,
+        tradeOutputCurrency,
         trade?.inputAmount?.toFixed(),
         smartTradeCallOptions.calldata,
         smartTradeCallOptions.value,
@@ -170,7 +169,7 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
 
     // Use OmegaRouter callback for boosted routes and Permit2-signed swaps
     const { callback: omegaSwapCallback, isLoading: omegaSwapLoading, error: omegaSwapError } = useOmegaSwapCallback(
-        shouldUseOmegaRouter && !isSmartTrade ? trade : null,
+        shouldUseOmegaRouter && !isSmartTrade ? (!needsApprovalOrPermit ? trade : null) : null,
         allowedSlippage,
         permitSignature,
         onTransactionSuccess,
@@ -181,6 +180,7 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
         !isSmartTrade && !shouldUseOmegaRouter ? trade : null,
         allowedSlippage,
         onTransactionSuccess,
+        approvalState !== ApprovalState.APPROVED,
     );
 
     const isSwapLoading = swapLoading || smartSwapLoading || omegaSwapLoading;
@@ -198,7 +198,6 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
                     permit2Allowance.removePermitSign();
                 }
             } else {
-                console.log("Executing regular swap callback", { swapCallback });
                 await swapCallback?.();
             }
         } catch (error) {
@@ -209,6 +208,7 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
     const isValid = !swapInputError && !activeSwapError;
 
     const hasLargePriceDifference = priceImpactSeverity > 2;
+    const approvalTokenSymbol = trade?.inputAmount.currency.symbol ?? "token";
 
     const largePriceDifferencePercent = useMemo(() => {
         if (!priceImpact) return "0.00";
@@ -220,7 +220,9 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
     }, [priceImpact]);
 
     // Check if we need standard ERC20 approval (for native/smart router)
-    const needsClassicApproval = !shouldUseOmegaRouter && approvalState === ApprovalState.NOT_APPROVED;
+    const isResetApprovalRequired = approvalState === ApprovalState.RESET_REQUIRED;
+    const needsClassicApproval =
+        !shouldUseOmegaRouter && (approvalState === ApprovalState.NOT_APPROVED || approvalState === ApprovalState.RESET_REQUIRED);
     const isApproving = approvalState === ApprovalState.PENDING;
 
     const isWrongChain = !userChainId || appChainId !== userChainId;
@@ -263,7 +265,13 @@ const SwapButton = ({ derivedSwap }: { derivedSwap: IDerivedSwapInfo }) => {
     if (needsClassicApproval || isApproving) {
         return (
             <Button variant={"primary"} onClick={approvalCallback} disabled={isApproving}>
-                {isApproving ? <Loader /> : `Approve ${trade?.inputAmount.currency.symbol}`}
+                {isApproving ? (
+                    <Loader />
+                ) : isResetApprovalRequired ? (
+                    `Reset ${approvalTokenSymbol} approval`
+                ) : (
+                    `Approve ${approvalTokenSymbol}`
+                )}
             </Button>
         );
     }
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 5197db31..a70e76a1 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -26,7 +26,7 @@ const buttonVariants = cva(
             size: {
                 default: "h-10 px-4 py-2 ",
                 sm: "h-9 rounded-lg px-3",
-                md: "h-6 rounded-lg p-4 py-6 rounded-full",
+                md: "h-12 rounded-lg p-4 rounded-full",
                 lg: "text-md p-5 rounded-full",
                 icon: "h-10 w-10 rounded-xl",
             },
diff --git a/src/graphql/queries/pools.ts b/src/graphql/queries/pools.ts
index 184992e0..4e654148 100644
--- a/src/graphql/queries/pools.ts
+++ b/src/graphql/queries/pools.ts
@@ -24,6 +24,8 @@ export const POOL_FRAGMENT = gql`
         feesToken0
         feesToken1
         deployer
+        txCount
+        createdAtTimestamp
     }
 `;
 export const TICK_FRAGMENT = gql`
@@ -149,4 +151,4 @@ export const POOLS_HOUR_DATAS = gql`
             ...PoolHourDataFields
         }
     }
-`;
\ No newline at end of file
+`;
diff --git a/src/hooks/common/useApprove.ts b/src/hooks/common/useApprove.ts
index d4b1fd33..c598d7a1 100644
--- a/src/hooks/common/useApprove.ts
+++ b/src/hooks/common/useApprove.ts
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from "react";
 import { Currency, CurrencyAmount, Percent, Trade, TradeType } from "@cryptoalgebra/integral-sdk";
 import { SmartRouter, SmartRouterTrade } from "@cryptoalgebra/router-custom-pools-and-sliding-fee";
 
-import { DEFAULT_CHAIN_ID, SWAP_ROUTER } from "config";
+import { DEFAULT_CHAIN_ID, SWAP_ROUTER, TOKENS } from "config";
 import { ApprovalState, ApprovalStateType } from "@/types/approve-state";
 
 import { useNeedAllowance } from "./useNeedAllowance";
@@ -12,32 +12,52 @@ import { Address, erc20Abi } from "viem";
 import { useWriteContract } from "wagmi";
 import { formatAmount } from "@/utils";
 
+const TOKENS_REQUIRING_APPROVAL_RESET = new Set<string>([TOKENS[DEFAULT_CHAIN_ID].USDT.address.toLowerCase()]);
+
 export function useApprove(amountToApprove: CurrencyAmount<Currency> | undefined, spender: Address) {
     const token = amountToApprove?.currency?.isToken ? amountToApprove.currency : undefined;
     const [shouldPolling, setShouldPolling] = useState(false);
+    const [pendingApprovalTitle, setPendingApprovalTitle] = useState<string>();
+    const amountToApproveValue = amountToApprove?.quotient.toString();
+
+    const { needAllowance, allowance, refetchAllowance } = useNeedAllowance(token, amountToApprove, spender, true);
 
-    const { needAllowance, refetchAllowance } = useNeedAllowance(token, amountToApprove, spender, true);
+    const targetApprovalAmount = amountToApprove ? BigInt(amountToApprove.quotient.toString()) : undefined;
+
+    const shouldResetApprovalBeforeIncrease = Boolean(
+        token &&
+            typeof allowance === "bigint" &&
+            allowance > 0n &&
+            targetApprovalAmount &&
+            targetApprovalAmount > allowance &&
+            TOKENS_REQUIRING_APPROVAL_RESET.has(token.address.toLowerCase()),
+    );
 
     const approvalState: ApprovalStateType = useMemo(() => {
         if (!amountToApprove || !spender) return ApprovalState.UNKNOWN;
         if (amountToApprove.currency.isNative) return ApprovalState.APPROVED;
+        if (shouldResetApprovalBeforeIncrease) return ApprovalState.RESET_REQUIRED;
 
         return needAllowance ? ApprovalState.NOT_APPROVED : ApprovalState.APPROVED;
-    }, [amountToApprove?.quotient.toString(), needAllowance, spender]);
+    }, [amountToApprove, needAllowance, shouldResetApprovalBeforeIncrease, spender]);
 
     const config = amountToApprove
         ? {
               address: amountToApprove.currency.wrapped.address as Address,
               abi: erc20Abi,
               functionName: "approve" as const,
-              args: [spender, BigInt(amountToApprove.quotient.toString())] as [Address, bigint],
+              args: [spender, targetApprovalAmount as bigint] as [Address, bigint],
           }
         : undefined;
 
     const { data: approvalData, writeContract: approve, isPending } = useWriteContract();
 
+    const currentApprovalTitle = shouldResetApprovalBeforeIncrease
+        ? `Reset ${amountToApprove?.currency.symbol} approval`
+        : `Approve ${formatAmount(amountToApprove?.toSignificant(24) as string)} ${amountToApprove?.currency.symbol}`;
+
     const { isLoading, isSuccess } = useTransactionAwait(approvalData, {
-        title: `Approve ${formatAmount(amountToApprove?.toSignificant() as string)} ${amountToApprove?.currency.symbol}`,
+        title: pendingApprovalTitle ?? currentApprovalTitle,
         tokenA: token?.address as Address,
         type: TransactionType.SWAP,
         callback: refetchAllowance,
@@ -45,7 +65,7 @@ export function useApprove(amountToApprove: CurrencyAmount<Currency> | undefined
 
     useEffect(() => {
         setShouldPolling(true);
-    }, [amountToApprove?.quotient.toString()]);
+    }, [amountToApproveValue]);
 
     useEffect(() => {
         if (!needAllowance && shouldPolling) {
@@ -56,6 +76,16 @@ export function useApprove(amountToApprove: CurrencyAmount<Currency> | undefined
     const approvalCallback = () => {
         if (config) {
             setShouldPolling(true);
+            setPendingApprovalTitle(currentApprovalTitle);
+
+            if (shouldResetApprovalBeforeIncrease) {
+                approve({
+                    ...config,
+                    args: [spender, 0n],
+                });
+                return;
+            }
+
             approve(config);
         }
     };
@@ -87,7 +117,10 @@ export function useApproveCallbackFromTrade(
         [trade, allowedSlippage, isSmartTrade],
     );
 
-    return useApprove(amountToApprove, SWAP_ROUTER[amountToApprove?.currency.chainId || DEFAULT_CHAIN_ID]);
+    return useApprove(
+        amountToApprove as CurrencyAmount<Currency> | undefined,
+        SWAP_ROUTER[amountToApprove?.currency.chainId || DEFAULT_CHAIN_ID],
+    );
 }
 
 export function useRevokeApprove(token: Currency | undefined, spender: Address) {
diff --git a/src/hooks/common/useNeedAllowance.ts b/src/hooks/common/useNeedAllowance.ts
index 4dee42f5..a161dde1 100644
--- a/src/hooks/common/useNeedAllowance.ts
+++ b/src/hooks/common/useNeedAllowance.ts
@@ -24,5 +24,5 @@ export function useNeedAllowance(
         !currency?.isNative && typeof allowance === "bigint" && amount && amount.greaterThan(allowance.toString())
     );
 
-    return { needAllowance, refetchAllowance: refetch };
+    return { needAllowance, allowance, refetchAllowance: refetch };
 }
diff --git a/src/hooks/common/useTransactionAwait.tsx b/src/hooks/common/useTransactionAwait.tsx
index f334d4cb..2440c64d 100644
--- a/src/hooks/common/useTransactionAwait.tsx
+++ b/src/hooks/common/useTransactionAwait.tsx
@@ -3,7 +3,7 @@ import { useToast } from "@/components/ui/use-toast";
 import { TransactionInfo, usePendingTransactionsStore } from "@/state/pendingTransactionsStore";
 import { useAppKitNetwork } from "@reown/appkit/react";
 import { ExternalLinkIcon } from "lucide-react";
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import { Address } from "viem";
 import { useAccount, useWaitForTransactionReceipt } from "wagmi";
@@ -29,6 +29,7 @@ export const ViewTxOnExplorer = ({ hash }: { hash: Address | undefined }) => {
 
 export function useTransactionAwait(hash: Address | undefined, transactionInfo: TransactionInfo, redirectPath?: string) {
     const { toast } = useToast();
+    const transactionInfoRef = useRef<{ hash?: Address; info: TransactionInfo }>({ info: transactionInfo });
 
     const navigate = useNavigate();
 
@@ -42,8 +43,11 @@ export function useTransactionAwait(hash: Address | undefined, transactionInfo:
         hash,
     });
 
+    const currentTransactionInfo = hash && transactionInfoRef.current.hash === hash ? transactionInfoRef.current.info : transactionInfo;
+
     useEffect(() => {
         if (isLoading && hash && account) {
+            transactionInfoRef.current = { hash, info: transactionInfo };
             toast({
                 title: transactionInfo.title,
                 description: transactionInfo.description || "Transaction was sent",
@@ -57,8 +61,8 @@ export function useTransactionAwait(hash: Address | undefined, transactionInfo:
     useEffect(() => {
         if (isError && hash) {
             toast({
-                title: transactionInfo.title,
-                description: transactionInfo.description || "Transaction failed",
+                title: currentTransactionInfo.title,
+                description: currentTransactionInfo.description || "Transaction failed",
                 action: <ViewTxOnExplorer hash={hash} />,
             });
         }
@@ -67,12 +71,12 @@ export function useTransactionAwait(hash: Address | undefined, transactionInfo:
     useEffect(() => {
         if (isSuccess && hash) {
             toast({
-                title: transactionInfo.title,
-                description: transactionInfo.description || "Transaction confirmed",
+                title: currentTransactionInfo.title,
+                description: currentTransactionInfo.description || "Transaction confirmed",
                 action: <ViewTxOnExplorer hash={hash} />,
             });
-            if (transactionInfo.callback) {
-                transactionInfo.callback();
+            if (currentTransactionInfo.callback) {
+                currentTransactionInfo.callback();
             }
             if (redirectPath) {
                 navigate(redirectPath);
diff --git a/src/hooks/pools/useFormattedPools.ts b/src/hooks/pools/useFormattedPools.ts
index a0af769e..4993b1c3 100644
--- a/src/hooks/pools/useFormattedPools.ts
+++ b/src/hooks/pools/useFormattedPools.ts
@@ -9,7 +9,8 @@ import { usePositions } from "../positions/usePositions";
 import ALMModule from "@/modules/ALMModule";
 import { Address } from "viem";
 import { BOOSTED_TOKENS } from "config/tokens";
-import { DEFAULT_CHAIN_ID } from "config";
+import { DEFAULT_CHAIN_ID, PRICE_CONVERGENCE_VAULT_BY_POOL, PRICE_CONVERGENCE_VAULT_DEPOSIT_GUARD_BY_POOL } from "config";
+import { enabledModules } from "config/app-modules";
 const { useAllUserALMAmounts, useAllALMVaults } = ALMModule.hooks;
 
 interface Pair {
@@ -30,11 +31,18 @@ export interface FormattedPool {
     isMyPool: boolean;
     hasActiveFarming: boolean;
     hasALM: boolean;
+    hasNAVHook: boolean;
     deployer: string;
     isBoostedPool: boolean;
     isBoostedToken0: boolean;
     isBoostedToken1: boolean;
-    isShowcase: boolean;
+    // isShowcase: boolean;
+}
+
+function hasPoolMapping(mapping: Record<Address, Address> | undefined, poolId: string): boolean {
+    if (!mapping) return false;
+
+    return Object.keys(mapping).some((address) => address.toLowerCase() === poolId.toLowerCase());
 }
 
 export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPool[]; isLoading: boolean } {
@@ -79,7 +87,7 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
                 }
                 return true;
             })
-            .map(({ id, token0, token1, overrideFee, totalValueLockedUSD, deployer, poolDayData }) => {
+            .map(({ id, token0, token1, fee: baseFee, overrideFee, totalValueLockedUSD, deployer, poolDayData }) => {
                 const currentPool = poolDayData[0];
                 const lastDate = currentPool ? currentPool.date * 1000 : 0;
                 const currentDate = new Date().getTime();
@@ -89,7 +97,7 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
                 const msIn24Hours = 24 * 60 * 60 * 1000;
 
                 const openPositions = positions?.filter(
-                    (position) => position.pool.toLowerCase() === id.toLowerCase() && position.liquidity > 0n
+                    (position) => position.pool.toLowerCase() === id.toLowerCase() && position.liquidity > 0n,
                 );
                 const activeFarming = activeFarmings?.eternalFarmings.find((farming) => farming.pool === id);
 
@@ -102,13 +110,20 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
 
                 const avgApr = farmApr + poolAvgApr;
 
-                const isBoostedToken0 = Object.values(BOOSTED_TOKENS[chainId || DEFAULT_CHAIN_ID]).find(
-                    (bt) => bt.address.toLowerCase() === token0.id.toLowerCase()
+                const activeChainId = chainId || DEFAULT_CHAIN_ID;
+                const isBoostedToken0 = Object.values(BOOSTED_TOKENS[activeChainId]).find(
+                    (bt) => bt.address.toLowerCase() === token0.id.toLowerCase(),
                 );
-                const isBoostedToken1 = Object.values(BOOSTED_TOKENS[chainId || DEFAULT_CHAIN_ID]).find(
-                    (bt) => bt.address.toLowerCase() === token1.id.toLowerCase()
+                const isBoostedToken1 = Object.values(BOOSTED_TOKENS[activeChainId]).find(
+                    (bt) => bt.address.toLowerCase() === token1.id.toLowerCase(),
                 );
                 const isBoosted = isBoostedToken0 || isBoostedToken1;
+                const hasNAVHook =
+                    enabledModules.NAVHookModule &&
+                    hasPoolMapping(PRICE_CONVERGENCE_VAULT_BY_POOL[activeChainId], id) &&
+                    hasPoolMapping(PRICE_CONVERGENCE_VAULT_DEPOSIT_GUARD_BY_POOL[activeChainId], id);
+
+                const fee = (Number(overrideFee) || Number(baseFee)) / 10_000;
 
                 return {
                     id: id as Address,
@@ -116,7 +131,7 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
                         token0,
                         token1,
                     },
-                    fee: Number(overrideFee) / 10_000,
+                    fee,
                     tvlUSD: Number(totalValueLockedUSD),
                     volume24USD: timeDifference <= msIn24Hours ? Number(currentPool.volumeUSD) : 0,
                     fees24USD: timeDifference <= msIn24Hours ? Number(currentPool.feesUSD) : 0,
@@ -126,12 +141,13 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
                     avgApr,
                     isMyPool: Boolean(openPositions?.length || openAlmPositions?.length),
                     hasALM: Boolean(openVaults?.length),
+                    hasNAVHook,
                     hasActiveFarming: Boolean(activeFarming),
                     isBoostedPool: Boolean(isBoosted),
                     isBoostedToken0: Boolean(isBoostedToken0),
                     isBoostedToken1: Boolean(isBoostedToken1),
                     deployer: deployer.toLowerCase(),
-                    isShowcase: token0.id === '0x4200000000000000000000000000000000000006' && token1.id === '0xabac6f23fdf1313fc2e9c9244f666157ccd32990'
+                    // isShowcase: token0.id === '0x4200000000000000000000000000000000000006' && token1.id === '0xabac6f23fdf1313fc2e9c9244f666157ccd32990'
                 };
             });
     }, [
@@ -145,6 +161,7 @@ export function useFormattedPools(tokenAddress?: Address): { pools: FormattedPoo
         poolsMaxApr,
         poolsAvgApr,
         farmingsAPR,
+        chainId,
     ]);
 
     return { pools: formattedPools, isLoading };
diff --git a/src/hooks/pools/usePoolStats.ts b/src/hooks/pools/usePoolStats.ts
new file mode 100644
index 00000000..dd27763a
--- /dev/null
+++ b/src/hooks/pools/usePoolStats.ts
@@ -0,0 +1,63 @@
+import { usePoolDayDatasQuery, useSinglePoolQuery } from "@/graphql/generated/graphql";
+import { useClients } from "@/hooks/graphql/useClients";
+import { getPoolAPR } from "@/utils/pool/getPoolAPR";
+import { useMemo } from "react";
+import useSWR from "swr";
+import { Address } from "viem";
+
+export interface PoolStats {
+    fee: number;
+    tvlUSD: number;
+    volume24USD: number;
+    fees24USD: number;
+    avgApr: number;
+    txCount: string;
+    createdAtTimestamp: string | undefined;
+    isLoading: boolean;
+}
+
+export function usePoolStats(poolId: Address): PoolStats {
+    const { infoClient } = useClients();
+
+    const poolDayDataRange = useMemo(() => {
+        const to = Math.floor(Date.now() / 1000);
+        const from = to - 3 * 24 * 60 * 60;
+
+        return { from, to };
+    }, []);
+
+    const { data: poolInfoData, loading: isPoolInfoLoading } = useSinglePoolQuery({
+        client: infoClient,
+        variables: { poolId: poolId.toLowerCase() },
+    });
+
+    const { data: poolDayData, loading: isPoolDayDataLoading } = usePoolDayDatasQuery({
+        client: infoClient,
+        variables: {
+            poolId: poolId.toLowerCase(),
+            from: poolDayDataRange.from,
+            to: poolDayDataRange.to,
+        },
+    });
+
+    const { data: poolAvgApr, isLoading: isPoolAprLoading } = useSWR(["poolAPR", poolId], () => getPoolAPR(poolId));
+
+    return useMemo(() => {
+        const latestDayData = poolDayData?.poolDayDatas?.at(-1);
+        const latestDayDataDate = latestDayData ? latestDayData.date * 1000 : 0;
+        const isLatestDayDataFresh = Date.now() - latestDayDataDate <= 24 * 60 * 60 * 1000;
+
+        const fee = (Number(poolInfoData?.pool?.overrideFee || 0) || Number(poolInfoData?.pool?.fee || 0)) / 10_000;
+
+        return {
+            fee,
+            tvlUSD: Number(poolInfoData?.pool?.totalValueLockedUSD || 0),
+            volume24USD: isLatestDayDataFresh ? Number(latestDayData?.volumeUSD || 0) : 0,
+            fees24USD: isLatestDayDataFresh ? Number(latestDayData?.feesUSD || 0) : 0,
+            avgApr: Number(poolAvgApr || 0),
+            txCount: poolInfoData?.pool?.txCount || "0",
+            createdAtTimestamp: poolInfoData?.pool?.createdAtTimestamp,
+            isLoading: isPoolInfoLoading || isPoolDayDataLoading || isPoolAprLoading,
+        };
+    }, [isPoolAprLoading, isPoolDayDataLoading, isPoolInfoLoading, poolAvgApr, poolDayData?.poolDayDatas, poolInfoData?.pool]);
+}
diff --git a/src/hooks/swap/useAllRoutes.ts b/src/hooks/swap/useAllRoutes.ts
index 7f9c402c..9610551f 100644
--- a/src/hooks/swap/useAllRoutes.ts
+++ b/src/hooks/swap/useAllRoutes.ts
@@ -6,7 +6,7 @@ import { computeRegularRoutes } from "@/utils/swap/computeRegularRoutes";
 
 export function useAllRoutes(
     currencyIn?: Currency,
-    currencyOut?: Currency
+    currencyOut?: Currency,
 ): {
     loading: boolean;
     boostedRoutes: BoostedRoute<Currency, Currency>[];
diff --git a/src/hooks/swap/useBestTrade.ts b/src/hooks/swap/useBestTrade.ts
index fe55a740..051a035b 100644
--- a/src/hooks/swap/useBestTrade.ts
+++ b/src/hooks/swap/useBestTrade.ts
@@ -116,7 +116,7 @@ export function useBestTradeExactIn(amountIn?: CurrencyAmount<Currency>, currenc
                 amountOut: null,
                 fee: null,
                 priceAfterSwap: null,
-            }
+            },
         );
 
         if (!bestRoute || !amountOut) {
@@ -250,7 +250,7 @@ export function useBestTradeExactOut(currencyIn?: Currency, amountOut?: Currency
                 amountIn: null,
                 fee: null,
                 priceAfterSwap: null,
-            }
+            },
         );
 
         if (!bestRoute || !amountIn) {
diff --git a/src/hooks/swap/useOverrideFee.ts b/src/hooks/swap/useOverrideFee.ts
index c1cfe392..b76f993f 100644
--- a/src/hooks/swap/useOverrideFee.ts
+++ b/src/hooks/swap/useOverrideFee.ts
@@ -7,6 +7,42 @@ import { useEffect, useState } from "react";
 import { useChainId } from "wagmi";
 import { Address, maxUint128 } from "viem";
 
+type PoolFeeParams = {
+    chainId: number;
+    poolAddress: Address;
+    isZeroToOne: boolean;
+    amount: bigint;
+    baseFee: number;
+};
+
+const getPoolFee = (overrideFee: number, baseFee: number, pluginFee: number) => {
+    return (overrideFee === 0 ? baseFee : overrideFee) + pluginFee;
+};
+
+const getSimulatedPoolFee = async ({ chainId, poolAddress, isZeroToOne, amount, baseFee }: PoolFeeParams) => {
+    const plugin = await readAlgebraPoolPlugin(wagmiConfig, {
+        address: poolAddress,
+    });
+
+    let beforeSwap: [string, number, number];
+
+    try {
+        const { result } = await simulateAlgebraBasePluginV1BeforeSwap(wagmiConfig, {
+            address: plugin,
+            args: [SWAP_ROUTER[chainId], ADDRESS_ZERO, isZeroToOne, amount, maxUint128, false, "0x"] as const,
+            account: poolAddress,
+        });
+
+        beforeSwap = result as [string, number, number];
+    } catch (error) {
+        beforeSwap = ["", 0, 0];
+    }
+
+    const [, overrideFee, pluginFee] = beforeSwap;
+
+    return getPoolFee(overrideFee, baseFee, pluginFee);
+};
+
 export function useOverrideFee(trade: SmartRouterTrade<TradeType> | Trade<Currency, Currency, TradeType> | null | undefined) {
     const [overrideFees, setOverrideFees] = useState<{
         fee: number | undefined;
@@ -34,48 +70,21 @@ export function useOverrideFee(trade: SmartRouterTrade<TradeType> | Trade<Curren
                     for (let idx = 0; idx < route.pools.length; idx++) {
                         const pool = route.pools[idx];
                         const split = splits[idx];
-                        const amountIn = route.amountInList?.[idx] || 0n;
-                        const amountOut = route.amountOutList?.[idx] || 0n;
-
                         if (pool.type !== 1) continue;
 
                         const isZeroToOne = split[0].wrapped.sortsBefore(split[1].wrapped);
-
-                        const plugin = await readAlgebraPoolPlugin(wagmiConfig, {
-                            address: pool.address,
+                        const amount =
+                            trade.tradeType === TradeType.EXACT_INPUT ? route.amountInList?.[idx] || 0n : route.amountOutList?.[idx] || 0n;
+
+                        const poolFee = await getSimulatedPoolFee({
+                            chainId,
+                            poolAddress: pool.address,
+                            isZeroToOne,
+                            amount,
+                            baseFee: Number(route.feeList?.[idx] || 0),
                         });
 
-                        let beforeSwap: [string, number, number];
-
-                        try {
-                            const { result } = await simulateAlgebraBasePluginV1BeforeSwap(wagmiConfig, {
-                                address: plugin,
-                                args: [
-                                    SWAP_ROUTER[chainId],
-                                    ADDRESS_ZERO,
-                                    isZeroToOne,
-                                    trade.tradeType === TradeType.EXACT_INPUT ? amountIn : amountOut,
-                                    maxUint128,
-                                    false,
-                                    "0x",
-                                ] as const,
-                                account: pool.address,
-                            });
-
-                            beforeSwap = result as [string, number, number];
-                        } catch (error) {
-                            beforeSwap = ["", 0, 0];
-                        }
-
-                        const [, overrideFee, pluginFee] = beforeSwap || ["", 0, 0];
-
-                        if (overrideFee) {
-                            splitFees.push(overrideFee + pluginFee);
-                        } else {
-                            splitFees.push(Number(route.feeList?.[idx] || 0) + pluginFee);
-                        }
-
-                        splitFees[splitFees.length - 1] = (splitFees[splitFees.length - 1] * route.percent) / 100;
+                        splitFees.push((poolFee * route.percent) / 100);
 
                         fees.push(splitFees);
                     }
@@ -98,42 +107,22 @@ export function useOverrideFee(trade: SmartRouterTrade<TradeType> | Trade<Curren
 
                         const isZeroToOne = route.inputAmount.currency.wrapped.sortsBefore(route.outputAmount.currency.wrapped);
 
-                        const amountIn = BigInt(route.inputAmount.quotient.toString());
-                        const amountOut = BigInt(route.outputAmount.quotient.toString());
-
-                        const plugin = await readAlgebraPoolPlugin(wagmiConfig, {
-                            address: poolAddress,
-                        });
-
-                        let beforeSwap: [string, number, number];
-
-                        try {
-                            const { result } = await simulateAlgebraBasePluginV1BeforeSwap(wagmiConfig, {
-                                address: plugin,
-                                args: [
-                                    SWAP_ROUTER[chainId],
-                                    ADDRESS_ZERO,
-                                    isZeroToOne,
-                                    trade.tradeType === TradeType.EXACT_INPUT ? amountIn : amountOut,
-                                    maxUint128,
-                                    false,
-                                    "0x",
-                                ] as const,
-                                account: poolAddress,
-                            });
-
-                            beforeSwap = result as [string, number, number];
-                        } catch (error) {
-                            beforeSwap = ["", 0, 0];
-                        }
-
-                        const [, overrideFee, pluginFee] = beforeSwap || ["", 0, 0];
-
-                        if (overrideFee) {
-                            splitFees.push(overrideFee + pluginFee);
-                        } else {
-                            splitFees.push(pluginFee);
-                        }
+                        const amount = BigInt(
+                            (trade.tradeType === TradeType.EXACT_INPUT
+                                ? route.inputAmount.quotient
+                                : route.outputAmount.quotient
+                            ).toString(),
+                        );
+
+                        splitFees.push(
+                            await getSimulatedPoolFee({
+                                chainId,
+                                poolAddress,
+                                isZeroToOne,
+                                amount,
+                                baseFee: route.route.pools[idx].fee,
+                            }),
+                        );
                     }
 
                     if (splitFees.length > 0) {
diff --git a/src/hooks/swap/useSwapCallback.ts b/src/hooks/swap/useSwapCallback.ts
index 3869bbe7..8f9a8b02 100644
--- a/src/hooks/swap/useSwapCallback.ts
+++ b/src/hooks/swap/useSwapCallback.ts
@@ -33,6 +33,7 @@ export function useSwapCallback(
     trade: Trade<Currency, Currency, TradeType> | null | undefined,
     allowedSlippage: Percent,
     onTransactionSuccess?: () => void,
+    disabled?: boolean,
 ) {
     const { address: account } = useAccount();
 
@@ -46,6 +47,7 @@ export function useSwapCallback(
 
     useEffect(() => {
         async function findBestCall() {
+            if (disabled) return;
             if (!swapCalldata || swapCalldata.length === 0 || swapCalldata.every((call) => call.calldata.length === 0)) return;
             if (!account || !client) return;
 
@@ -88,7 +90,7 @@ export function useSwapCallback(
         }
 
         findBestCall();
-    }, [swapCalldata, account, chainId, client]);
+    }, [swapCalldata, account, chainId, client, disabled]);
 
     const swapConfig = useMemo(
         () =>
diff --git a/src/hooks/swap/useSwapPools.ts b/src/hooks/swap/useSwapPools.ts
index 913b2f53..1cc2cb4d 100644
--- a/src/hooks/swap/useSwapPools.ts
+++ b/src/hooks/swap/useSwapPools.ts
@@ -16,7 +16,7 @@ import { isDefined } from "@/utils";
  */
 export function useSwapPools(
     currencyIn?: Currency,
-    currencyOut?: Currency
+    currencyOut?: Currency,
 ): {
     pools: Pool[];
     isLoading: boolean;
@@ -40,8 +40,8 @@ export function useSwapPools(
                     tokenA,
                     tokenB,
                     customPoolDeployer,
-                })
-            )
+                }),
+            ),
         );
 
         return [...basePoolAddresses, ...customPoolAddresses];
@@ -66,14 +66,14 @@ export function useSwapPools(
                     pool.token0.id,
                     Number(pool.token0.decimals),
                     pool.token0.symbol,
-                    pool.token0.name
+                    pool.token0.name,
                 );
                 const token1 = tryCreateBoostedToken(
                     chainId,
                     pool.token1.id,
                     Number(pool.token1.decimals),
                     pool.token1.symbol,
-                    pool.token1.name
+                    pool.token1.name,
                 );
 
                 return new Pool(
@@ -84,7 +84,7 @@ export function useSwapPools(
                     pool.deployer,
                     pool.liquidity,
                     Number(pool.tick),
-                    Number(pool.tickSpacing)
+                    Number(pool.tickSpacing),
                 );
             })
             .filter(isDefined);
diff --git a/src/modules/ALMModule/components/CreateAutomatedPosition/index.tsx b/src/modules/ALMModule/components/CreateAutomatedPosition/index.tsx
index 883d92d0..ae18d02e 100644
--- a/src/modules/ALMModule/components/CreateAutomatedPosition/index.tsx
+++ b/src/modules/ALMModule/components/CreateAutomatedPosition/index.tsx
@@ -3,16 +3,17 @@ import EnterAmountCard from "@/components/create-position/EnterAmountsCard";
 import { useMintActionHandlers, useMintState } from "@/state/mintStore";
 import { formatAmount } from "@/utils/common/formatAmount";
 import { tryParseAmount } from "@cryptoalgebra/integral-sdk";
-import { useState, useEffect } from "react";
+import { ReactNode, useState, useEffect } from "react";
 import { ExtendedVault } from "../../hooks";
 import AddAutomatedLiquidityButton from "../AddAutomatedLiquidityButton";
 
 interface CreateAutomatedPositionProps {
     vaults?: ExtendedVault[];
     poolId?: string;
+    modeSwitch?: ReactNode;
 }
 
-export function CreateAutomatedPosition({ vaults, poolId }: CreateAutomatedPositionProps) {
+export function CreateAutomatedPosition({ vaults, poolId, modeSwitch }: CreateAutomatedPositionProps) {
     const [selectedVault, setSelectedVault] = useState<ExtendedVault>();
     const { typedValue } = useMintState();
 
@@ -78,6 +79,7 @@ export function CreateAutomatedPosition({ vaults, poolId }: CreateAutomatedPosit
 
             <div className="flex flex-col">
                 <div className="flex flex-col w-full h-fit gap-2 bg-card border border-card-border rounded-xl p-2">
+                    {modeSwitch}
                     <EnterAmountCard
                         currency={selectedVault.depositToken}
                         value={typedValue}
diff --git a/src/modules/AnalyticsModule/components/AnalyticsPoolPage/index.tsx b/src/modules/AnalyticsModule/components/AnalyticsPoolPage/index.tsx
index c267f172..c93af397 100644
--- a/src/modules/AnalyticsModule/components/AnalyticsPoolPage/index.tsx
+++ b/src/modules/AnalyticsModule/components/AnalyticsPoolPage/index.tsx
@@ -42,17 +42,17 @@ const LiquidityStats = ({
     const { formatted: tvlToken0USD } = useUSDCValue(
         token0 && statistics?.tvlToken0
             ? CurrencyAmount.fromRawAmount(token0, parseUnits(statistics.tvlToken0, token0.decimals).toString())
-            : undefined
+            : undefined,
     );
     const { formatted: tvlToken1USD } = useUSDCValue(
         token1 && statistics?.tvlToken1
             ? CurrencyAmount.fromRawAmount(token1.wrapped, parseUnits(statistics.tvlToken1, token1.decimals).toString())
-            : undefined
+            : undefined,
     );
 
     return (
         <div className="flex flex-col gap-3 h-fit">
-            <div className="flex flex-col w-full items-start bg-card rounded-xl border border-card-border p-4 h-fit">
+            <div className="flex flex-col w-full items-start bg-card rounded-2xl border border-card-border p-4 h-fit">
                 <h2 className="font-semibold mb-2">Pool Liquidity</h2>
                 <p className="text-2xl font-bold mb-3">${formatAmount(statistics?.tvlUSD || 0, 4)}</p>
                 <div className="flex flex-col gap-3 items-start w-full">
@@ -80,7 +80,7 @@ const LiquidityStats = ({
                 </div>
             </div>
 
-            <div className="flex flex-col w-full items-start bg-card border border-card-border rounded-xl p-4 h-fit">
+            <div className="flex flex-col w-full items-start bg-card border border-card-border rounded-2xl p-4 h-fit">
                 <h2 className="font-semibold mb-4">Statistics</h2>
                 <div className="flex flex-col gap-3 w-full">
                     <div className="flex justify-between">
@@ -193,7 +193,7 @@ export function AnalyticsPoolPage() {
                 <PageTitle title="Explore pool" showSettings={false} />
             </div>
             <div className="grid grid-cols-1 gap-3 w-full md:grid-cols-3">
-                <div className="md:col-span-2 bg-card border border-card-border rounded-xl p-3">
+                <div className="md:col-span-2 bg-card border border-card-border rounded-2xl p-3">
                     <div className="flex flex-col p-3 gap-6 border-b border-card-border mb-4">
                         <CurrenciesInfoHeader tokenA={token0} tokenB={token1} />
                     </div>
@@ -214,25 +214,27 @@ export function AnalyticsPoolPage() {
                     />
                 </div>
                 <div className="flex flex-col gap-3">
-                    { enableActions && <div className="grid grid-cols-2 gap-3">
-                        <Link className="col-span-1 w-full " to={"/swap"}>
-                            <Button variant={"primary"} size={"lg"} className="gap-2 rounded-xl w-full h-full max-md:text-sm">
-                                <ArrowDownUp size={20} />
-                                Trade
-                            </Button>
-                        </Link>
-                        <Link className="col-span-1 w-full" to={`/pool/${poolId}/new-position`}>
-                            <Button variant={"primaryLink"} size={"lg"} className="gap-2 rounded-xl">
-                                <Plus size={20} />
-                                Create Position
-                            </Button>
-                        </Link>
-                    </div> }
+                    {enableActions && (
+                        <div className="grid grid-cols-2 gap-3">
+                            <Link className="col-span-1 w-full " to={"/swap"}>
+                                <Button variant={"primary"} size={"lg"} className="gap-2 rounded-full w-full h-full max-md:text-sm">
+                                    <ArrowDownUp size={20} />
+                                    Trade
+                                </Button>
+                            </Link>
+                            <Link className="col-span-1 w-full" to={`/pool/${poolId}/new-position`}>
+                                <Button variant={"primaryLink"} size={"lg"} className="gap-2 w-full rounded-full">
+                                    <Plus size={20} />
+                                    Create Position
+                                </Button>
+                            </Link>
+                        </div>
+                    )}
                     <LiquidityStats token0={token0} token1={token1} statistics={statistics} />
                 </div>
             </div>
 
-            <div className="pb-5 bg-card border border-card-border/60 rounded-xl w-full mt-4">
+            <div className="pb-5 bg-card border border-card-border/60 rounded-2xl w-full mt-4">
                 <TransactionsList poolId={poolId} />
             </div>
         </PageContainer>
diff --git a/src/modules/AnalyticsModule/components/AnalyticsTokenPage/index.tsx b/src/modules/AnalyticsModule/components/AnalyticsTokenPage/index.tsx
index 6d31ce90..0288eedd 100644
--- a/src/modules/AnalyticsModule/components/AnalyticsTokenPage/index.tsx
+++ b/src/modules/AnalyticsModule/components/AnalyticsTokenPage/index.tsx
@@ -38,7 +38,7 @@ const LiquidityStats = ({
 }) => {
     return (
         <div className="flex flex-col gap-3 h-fit">
-            <div className="flex flex-col w-full items-start bg-card rounded-xl border border-card-border p-4 h-fit">
+            <div className="flex flex-col w-full items-start bg-card rounded-2xl border border-card-border p-4 h-fit">
                 <h2 className="font-semibold mb-2">Price</h2>
                 <p className="text-2xl font-bold mb-3">${formatAmount(statistics?.priceUSD || 0, 4)}</p>
                 <h2 className="font-semibold mb-2">Liquidity</h2>
@@ -55,7 +55,7 @@ const LiquidityStats = ({
                 </div>
             </div>
 
-            <div className="flex flex-col w-full items-start bg-card border border-card-border rounded-xl p-4 h-fit">
+            <div className="flex flex-col w-full items-start bg-card border border-card-border rounded-2xl p-4 h-fit">
                 <h2 className="font-semibold mb-4">Statistics</h2>
                 <div className="flex flex-col gap-3 w-full">
                     <div className="flex justify-between">
@@ -161,7 +161,7 @@ export function AnalyticsTokenPage() {
                 <PageTitle title="Explore token" showSettings={false} />
             </div>
             <div className="grid grid-cols-1 gap-3 md:grid-cols-3 w-full">
-                <div className="md:col-span-2 bg-card border border-card-border rounded-xl p-3">
+                <div className="md:col-span-2 bg-card border border-card-border rounded-2xl p-3">
                     <div className="flex flex-col p-3 gap-6 border-b border-card-border mb-4">
                         <CurrenciesInfoHeader tokenA={currency} tokenB={null} />
                     </div>
@@ -182,13 +182,13 @@ export function AnalyticsTokenPage() {
                 <div className="flex flex-col gap-3">
                     <div className="grid grid-cols-2 gap-3">
                         <Link className="col-span-1 w-full" to={"/swap"}>
-                            <Button variant={"primary"} size={"lg"} className="gap-2 rounded-xl w-full h-full max-md:text-sm">
+                            <Button variant={"primary"} size={"lg"} className="gap-2 rounded-full w-full h-full max-md:text-sm">
                                 <ArrowDownUp size={20} />
                                 Trade
                             </Button>
                         </Link>
                         <Link className="col-span-1 w-full" to={"/pools"}>
-                            <Button variant={"primaryLink"} size={"lg"} className="gap-2 rounded-xl">
+                            <Button variant={"primaryLink"} size={"lg"} className="gap-2 w-full rounded-full">
                                 <Plus size={20} />
                                 Create Position
                             </Button>
diff --git a/src/modules/BoostedPoolsModule/hooks/usePermit.ts b/src/modules/BoostedPoolsModule/hooks/usePermit.ts
index ba420596..1d2db047 100644
--- a/src/modules/BoostedPoolsModule/hooks/usePermit.ts
+++ b/src/modules/BoostedPoolsModule/hooks/usePermit.ts
@@ -17,13 +17,20 @@ function toDeadline(expiration: number): number {
 
 export type PermitStateType = PermitState.LOADING | PermitState.NOT_PERMITTED | PermitState.PERMITTED;
 
+type SignedPermitState = {
+    signature: PermitSignature;
+    address: Address;
+    chainId: number;
+};
+
 export function usePermit(amount: CurrencyAmount<Currency> | undefined, spender: string | undefined) {
     const { address, chainId } = useAccount();
     const token = amount?.currency.wrapped;
+    const tokenAddress = token?.address;
     const permit2Address = chainId ? (PERMIT2[chainId] as Address) : undefined;
 
     // Signature state
-    const [signature, setSignature] = useState<PermitSignature>();
+    const [signedPermit, setSignedPermit] = useState<SignedPermitState>();
 
     // Check Permit2 allowance
     const queryEnabled = !!address && !!token?.address && !!spender && !!permit2Address;
@@ -50,11 +57,21 @@ export function usePermit(amount: CurrencyAmount<Currency> | undefined, spender:
     }, [permitData, token]);
 
     // Check if signature is valid
-    const now = useMemo(() => Math.floor(Date.now() / 1000), []);
+    const now = Math.floor(Date.now() / 1000);
     const isSigned = useMemo(() => {
-        if (!amount || !signature) return false;
-        return signature.details.token === token?.address && signature.spender === spender && signature.sigDeadline >= now;
-    }, [amount, now, signature, spender, token?.address]);
+        if (!amount || !signedPermit) return false;
+
+        const { signature, address: signedAddress, chainId: signedChainId } = signedPermit;
+
+        return (
+            signedAddress === address &&
+            signedChainId === chainId &&
+            signature.details.token.toLowerCase() === tokenAddress?.toLowerCase() &&
+            signature.spender === spender &&
+            BigInt(signature.details.amount.toString()) >= BigInt(amount.quotient.toString()) &&
+            signature.sigDeadline >= now
+        );
+    }, [address, amount, chainId, now, signedPermit, spender, tokenAddress]);
 
     // Check if permit is valid
     const isPermitted = useMemo(() => {
@@ -86,6 +103,9 @@ export function usePermit(amount: CurrencyAmount<Currency> | undefined, spender:
             if (!token) {
                 throw new Error("missing token");
             }
+            if (!amount) {
+                throw new Error("missing amount");
+            }
             if (!spender) {
                 throw new Error("missing spender");
             }
@@ -125,7 +145,7 @@ export function usePermit(amount: CurrencyAmount<Currency> | undefined, spender:
             });
 
             const permitSignature = { ...permit, signature: signatureResult };
-            setSignature(permitSignature);
+            setSignedPermit({ signature: permitSignature, address, chainId });
 
             // Show success toast
             toast({
@@ -148,21 +168,43 @@ export function usePermit(amount: CurrencyAmount<Currency> | undefined, spender:
             });
             throw error;
         }
-    }, [address, chainId, nonce, signTypedDataAsync, spender, token, toast, permit2Address]);
+    }, [address, amount, chainId, nonce, signTypedDataAsync, spender, token, toast, permit2Address]);
+
+    const removePermitSign = useCallback(() => {
+        setSignedPermit(undefined);
+    }, []);
+
+    useEffect(() => {
+        if (!signedPermit) return;
+
+        const signatureExpiredIn = signedPermit.signature.sigDeadline * 1000 - Date.now();
+        if (signatureExpiredIn <= 0) {
+            removePermitSign();
+            return;
+        }
 
-    const removePermitSign = () => {
-        setSignature(undefined)
-    }
+        const timeout = setTimeout(removePermitSign, signatureExpiredIn);
+        return () => clearTimeout(timeout);
+    }, [removePermitSign, signedPermit]);
 
     useEffect(() => {
-        removePermitSign()
-    }, [amount?.quotient.toString(), spender])
+        if (!signedPermit) return;
+
+        const { signature, address: signedAddress, chainId: signedChainId } = signedPermit;
+        const contextChanged = signedAddress !== address || signedChainId !== chainId;
+        const tokenChanged = !!tokenAddress && signature.details.token.toLowerCase() !== tokenAddress.toLowerCase();
+        const spenderChanged = !!spender && signature.spender.toLowerCase() !== spender.toLowerCase();
+
+        if (contextChanged || tokenChanged || spenderChanged) {
+            removePermitSign();
+        }
+    }, [address, chainId, removePermitSign, signedPermit, spender, tokenAddress]);
 
     return {
         permitState,
         permitCallback,
-        permitSignature: isSigned ? signature : undefined,
+        permitSignature: isSigned ? signedPermit?.signature : undefined,
         refetchPermit,
-        removePermitSign
+        removePermitSign,
     };
 }
diff --git a/src/modules/BoostedPoolsModule/hooks/usePermit2.ts b/src/modules/BoostedPoolsModule/hooks/usePermit2.ts
index fce9d896..428db4a2 100644
--- a/src/modules/BoostedPoolsModule/hooks/usePermit2.ts
+++ b/src/modules/BoostedPoolsModule/hooks/usePermit2.ts
@@ -129,5 +129,6 @@ export function usePermit2({ amount, spender }: { amount?: CurrencyAmount<Curren
         isLoading,
         permitSignature,
         refetchPermit2Data,
+        removePermitSign,
     ]);
 }
diff --git a/src/modules/FarmingModule/components/ActiveFarming/index.tsx b/src/modules/FarmingModule/components/ActiveFarming/index.tsx
index 3a02cf88..010b2933 100644
--- a/src/modules/FarmingModule/components/ActiveFarming/index.tsx
+++ b/src/modules/FarmingModule/components/ActiveFarming/index.tsx
@@ -58,7 +58,7 @@ export const ActiveFarming = ({ farming, deposits, positionsData }: ActiveFarmin
             nonce: BigInt(farming.farming.nonce),
             account: account ?? ADDRESS_ZERO,
         },
-        depositsForActiveFarming
+        depositsForActiveFarming,
     );
 
     const handleHarvestAll = async () => {
@@ -67,7 +67,7 @@ export const ActiveFarming = ({ farming, deposits, positionsData }: ActiveFarmin
     };
 
     return (
-        <div className="flex items-center flex-col justify-center bg-card border border-card-border/60 rounded-xl mt-3 md:p-6 md:gap-6 gap-3 p-3">
+        <div className="flex items-center flex-col justify-center bg-card border border-card-border rounded-2xl mt-3 md:p-6 md:gap-6 gap-3 p-3">
             <div className="flex flex-col gap-3 w-full">
                 <h3 className="md:text-2xl text-xl font-bold text-left">Active Farming</h3>
             </div>
@@ -88,7 +88,7 @@ export const ActiveFarming = ({ farming, deposits, positionsData }: ActiveFarmin
                                 ? `${formatAmount(formattedRewardEarned + formattedBonusRewardEarned, 2)} ${farming.rewardToken.symbol}`
                                 : `${formatAmount(formattedRewardEarned, 2)} ${farming.rewardToken.symbol} + ${formatAmount(
                                       formattedBonusRewardEarned,
-                                      2
+                                      2,
                                   )} ${farming.bonusRewardToken?.symbol}`
                         }
                         className="w-full"
@@ -126,12 +126,12 @@ export const ActiveFarming = ({ farming, deposits, positionsData }: ActiveFarmin
                     </div>
                 </CardInfo>
 
-                <div className="w-full flex gap-3">
+                <div className="w-full flex gap-3 max-md:flex-col">
                     <Button
                         variant={"primary"}
                         disabled={(!rewardEarnedUSD && !bonusRewardEarnedUSD) || isLoading}
                         onClick={handleHarvestAll}
-                        className="w-1/2"
+                        className="md:w-1/2"
                     >
                         {isLoading ? <Loader /> : "Collect Rewards"}
                     </Button>
diff --git a/src/modules/FarmingModule/components/CardInfo/index.tsx b/src/modules/FarmingModule/components/CardInfo/index.tsx
index ec500408..eb284886 100644
--- a/src/modules/FarmingModule/components/CardInfo/index.tsx
+++ b/src/modules/FarmingModule/components/CardInfo/index.tsx
@@ -10,7 +10,7 @@ interface CardInfoProps {
 
 export const CardInfo: FC<CardInfoProps> = ({ title, children, additional, className }) => {
     return (
-        <div className={cn("flex items-start flex-col gap-2 rounded-lg border-card-border border bg-card-dark p-4", className)}>
+        <div className={cn("flex items-start flex-col gap-2 rounded-xl bg-card-light p-4", className)}>
             <h3 className="font-bold text-xs text-text-100/75">{title}</h3>
             <div className="flex justify-between w-full items-end">
                 <div className="flex items-center mr-auto text-lg font-bold">{children}</div>
diff --git a/src/modules/FarmingModule/components/SelectPositionFarmModal/index.tsx b/src/modules/FarmingModule/components/SelectPositionFarmModal/index.tsx
index 8d932389..7bb61738 100644
--- a/src/modules/FarmingModule/components/SelectPositionFarmModal/index.tsx
+++ b/src/modules/FarmingModule/components/SelectPositionFarmModal/index.tsx
@@ -47,7 +47,7 @@ export function SelectPositionFarmModal({ farming, positionsData, isHarvestLoadi
 
     const availablePositions = positionsData.filter(
         (position) =>
-            !position.onFarming && (Number(position.almShares || 0) > 0 || BigInt(position.position?.liquidity.toString() || 0) > 0n)
+            !position.onFarming && (Number(position.almShares || 0) > 0 || BigInt(position.position?.liquidity.toString() || 0) > 0n),
     );
 
     const handleApprove = async () => {
@@ -78,7 +78,7 @@ export function SelectPositionFarmModal({ farming, positionsData, isHarvestLoadi
     return (
         <Dialog>
             <DialogTrigger asChild>
-                <Button variant={'primary'} disabled={isHarvestLoading} className="whitespace-nowrap w-1/2">
+                <Button variant={"primary"} disabled={isHarvestLoading} className="whitespace-nowrap md:w-1/2">
                     Deposit
                 </Button>
             </DialogTrigger>
@@ -97,7 +97,7 @@ export function SelectPositionFarmModal({ farming, positionsData, isHarvestLoadi
                                         key={position.id}
                                         className={cn(
                                             "w-full row-span-1 col-span-1",
-                                            selectedPosition?.id === position.id ? "border-primary-button hover:border-primary-button" : ""
+                                            selectedPosition?.id === position.id ? "border-primary-button hover:border-primary-button" : "",
                                         )}
                                         onClick={() => handleSelectPosition(position)}
                                         positionId={position.id}
@@ -114,20 +114,20 @@ export function SelectPositionFarmModal({ farming, positionsData, isHarvestLoadi
                 </div>
                 <div className="w-full flex gap-3 mt-2">
                     {isApproveVerifying ? (
-                        <Button variant={'primary'} disabled className="w-full">
+                        <Button variant={"primary"} disabled className="w-full">
                             Checking Approval...
                         </Button>
                     ) : selectedPosition && availablePositions.length > 0 ? (
                         <>
-                            <Button variant={'primary'} disabled={isApproved || isApproving} className="w-1/2" onClick={handleApprove}>
+                            <Button variant={"primary"} disabled={isApproved || isApproving} className="w-1/2" onClick={handleApprove}>
                                 {isApproved ? <span>1. Approved</span> : isApproving ? <Loader /> : <span>1. Approve</span>}
                             </Button>
-                            <Button variant={'primary'} disabled={!isApproved || isStaking} className="w-1/2" onClick={handleStake}>
+                            <Button variant={"primary"} disabled={!isApproved || isStaking} className="w-1/2" onClick={handleStake}>
                                 {isStaking ? <Loader /> : "2. Deposit"}
                             </Button>
                         </>
                     ) : (
-                        <Button variant={'primary'} disabled className="w-full">
+                        <Button variant={"primary"} disabled className="w-full">
                             Select Position
                         </Button>
                     )}
diff --git a/src/modules/NAVHookModule/components/NAVHookAddLiquidityModal.tsx b/src/modules/NAVHookModule/components/NAVHookAddLiquidityModal.tsx
new file mode 100644
index 00000000..7dba9a56
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookAddLiquidityModal.tsx
@@ -0,0 +1,143 @@
+import Loader from "@/components/common/Loader";
+import EnterAmountCard from "@/components/create-position/EnterAmountsCard";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
+import { DEFAULT_CHAIN_NAME } from "config";
+import { ApprovalState } from "@/types/approve-state";
+import { Field } from "@cryptoalgebra/integral-sdk";
+import { useAppKit, useAppKitNetwork } from "@reown/appkit/react";
+import { useState } from "react";
+import { Address } from "viem";
+import { useAccount, useChainId } from "wagmi";
+import { useNAVHookDeposit, useNAVHookDepositForm, useNAVHookPool } from "../hooks";
+
+interface NAVHookAddLiquidityModalProps {
+    poolId: Address | undefined;
+    onSuccess?: () => void;
+    triggerClassName?: string;
+}
+
+export function NAVHookAddLiquidityModal({ poolId, onSuccess, triggerClassName }: NAVHookAddLiquidityModalProps) {
+    const [isOpen, setIsOpen] = useState(false);
+    const { address: account } = useAccount();
+    const appChainId = useChainId();
+    const { chainId: userChainId } = useAppKitNetwork();
+    const { open } = useAppKit();
+    const { token0, token1 } = useNAVHookPool(poolId);
+    const depositForm = useNAVHookDepositForm(poolId);
+
+    const {
+        deposit,
+        approveToken0,
+        approveToken1,
+        token0ApprovalState,
+        token1ApprovalState,
+        isToken0Approved,
+        isToken1Approved,
+        isPending,
+        error,
+    } = useNAVHookDeposit({
+        poolId,
+        amount0: depositForm.amount0,
+        amount1: depositForm.amount1,
+        onSuccess: () => {
+            setIsOpen(false);
+            depositForm.reset();
+            onSuccess?.();
+        },
+    });
+
+    const isWrongChain = !userChainId || appChainId !== userChainId;
+
+    const actionButton = () => {
+        if (!account) {
+            return (
+                <Button variant="primary" onClick={() => open()}>
+                    Connect Wallet
+                </Button>
+            );
+        }
+
+        if (isWrongChain) {
+            return (
+                <Button variant="destructive" onClick={() => open({ view: "Networks" })}>
+                    {`Connect to ${DEFAULT_CHAIN_NAME}`}
+                </Button>
+            );
+        }
+
+        if (!depositForm.hasAmounts) {
+            return (
+                <Button variant="primary" disabled>
+                    Enter amounts
+                </Button>
+            );
+        }
+
+        if (depositForm.errorMessage) {
+            return (
+                <Button variant="primary" disabled>
+                    {depositForm.errorMessage}
+                </Button>
+            );
+        }
+
+        if (!isToken0Approved) {
+            return (
+                <Button variant="primary" disabled={token0ApprovalState === ApprovalState.PENDING} onClick={approveToken0}>
+                    {token0ApprovalState === ApprovalState.PENDING ? <Loader /> : `Approve ${token0?.symbol}`}
+                </Button>
+            );
+        }
+
+        if (!isToken1Approved) {
+            return (
+                <Button variant="primary" disabled={token1ApprovalState === ApprovalState.PENDING} onClick={approveToken1}>
+                    {token1ApprovalState === ApprovalState.PENDING ? <Loader /> : `Approve ${token1?.symbol}`}
+                </Button>
+            );
+        }
+
+        return (
+            <Button variant="primary" disabled={isPending} onClick={deposit}>
+                {isPending ? <Loader /> : "Add Liquidity"}
+            </Button>
+        );
+    };
+
+    return (
+        <Dialog open={isOpen} onOpenChange={setIsOpen}>
+            <DialogTrigger asChild>
+                <Button variant="primary" className={triggerClassName}>
+                    Add Liquidity
+                </Button>
+            </DialogTrigger>
+            <DialogContent className="max-w-[520px] rounded-xl! bg-card">
+                <DialogHeader>
+                    <DialogTitle className="text-lg font-semibold select-none">Add NAV Liquidity</DialogTitle>
+                </DialogHeader>
+
+                <div className="flex flex-col gap-4">
+                    <EnterAmountCard
+                        currency={token0}
+                        value={depositForm.amount0Value}
+                        handleChange={depositForm.onAmount0Change}
+                        valueUsd={depositForm.amount0Usd}
+                        field={Field.CURRENCY_A}
+                        showBoostedToggle={false}
+                    />
+                    <EnterAmountCard
+                        currency={token1}
+                        value={depositForm.amount1Value}
+                        handleChange={depositForm.onAmount1Change}
+                        valueUsd={depositForm.amount1Usd}
+                        field={Field.CURRENCY_B}
+                        showBoostedToggle={false}
+                    />
+                    {error && <div className="rounded-lg  bg-red-500/20 px-3 py-2 text-sm text-red-300">{error}</div>}
+                    {actionButton()}
+                </div>
+            </DialogContent>
+        </Dialog>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookHeaderInfo.tsx b/src/modules/NAVHookModule/components/NAVHookHeaderInfo.tsx
new file mode 100644
index 00000000..023dca55
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookHeaderInfo.tsx
@@ -0,0 +1,22 @@
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
+
+export function NAVHookHeaderInfo() {
+    return (
+        <HoverCard openDelay={100} closeDelay={100}>
+            <HoverCardTrigger asChild>
+                <div className="flex flex-wrap items-center gap-2">
+                    <span className="inline-flex h-7 items-center text-sm font-semibold text-text-200">
+                        <div className="animate-pulse w-2 h-2 rounded-full bg-emerald-300 mr-2" /> Managed by Price Convergence
+                    </span>
+                </div>
+            </HoverCardTrigger>
+            <HoverCardContent side="bottom" className="w-[320px] p-3 text-sm">
+                <p className="text-left text-sm font-semibold">Price Convergence plugin</p>
+                <p className="mt-1 text-left text-xs leading-relaxed text-text-300">
+                    This pool does not use manual LP ranges. You deposit into a vault, receive share tokens, and the plugin manages liquidity
+                    around the oracle price.
+                </p>
+            </HoverCardContent>
+        </HoverCard>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookMyLiquidity.tsx b/src/modules/NAVHookModule/components/NAVHookMyLiquidity.tsx
new file mode 100644
index 00000000..f6590f62
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookMyLiquidity.tsx
@@ -0,0 +1,108 @@
+import LiquidityChart from "@/components/create-position/LiquidityChart";
+import { Button } from "@/components/ui/button";
+import { Skeleton } from "@/components/ui/skeleton";
+import { SecurityState } from "@/hooks/pools/usePool";
+import { Currency, CurrencyAmount, Pool } from "@cryptoalgebra/integral-sdk";
+import { useAppKit } from "@reown/appkit/react";
+import { Address } from "viem";
+import { NAVHookVaultState } from "../types";
+import { NAVHookAddLiquidityModal } from "./NAVHookAddLiquidityModal";
+import { NAVHookTokenValueCard } from "./NAVHookTokenValueCard";
+import { NAVHookWithdrawLiquidityModal } from "./NAVHookWithdrawLiquidityModal";
+import { useUSDCValue } from "@/hooks/common/useUSDCValue";
+import { formatAmount } from "@/utils/common/formatAmount";
+
+interface NAVHookMyLiquidityProps {
+    poolId: Address | undefined;
+    pool: Pool | null;
+    token0: Currency | undefined;
+    token1: Currency | undefined;
+    vaultState: NAVHookVaultState;
+    account: Address | undefined;
+    poolStatus: number | undefined | null;
+}
+
+export function NAVHookMyLiquidity({ poolId, pool, token0, token1, vaultState, account, poolStatus }: NAVHookMyLiquidityProps) {
+    const { open } = useAppKit();
+    const currentPrice = pool ? Number(pool.token0Price.toSignificant(8)) : undefined;
+    const enableActions = poolStatus === SecurityState.ENABLED;
+
+    const { userAmount0, userAmount1 } = vaultState;
+    const { formatted: amount0Usd } = useUSDCValue(token0 && CurrencyAmount.fromRawAmount(token0, userAmount0.toString()));
+    const { formatted: amount1Usd } = useUSDCValue(token1 && CurrencyAmount.fromRawAmount(token1, userAmount1.toString()));
+    const depositAmounUsd = Number(amount0Usd || 0) + Number(amount1Usd || 0);
+
+    const renderActions = () => {
+        if (!account) {
+            return (
+                <Button variant="primary" className="w-full" onClick={() => open()}>
+                    Connect Wallet
+                </Button>
+            );
+        }
+
+        if (!enableActions) {
+            return (
+                <Button variant="primary" className="w-full" disabled>
+                    Pool actions disabled
+                </Button>
+            );
+        }
+
+        if (!vaultState.hasPosition) {
+            return <NAVHookAddLiquidityModal poolId={poolId} onSuccess={vaultState.refetch} triggerClassName="w-full" />;
+        }
+
+        return (
+            <div className="grid w-full grid-cols-1 gap-3 sm:grid-cols-2">
+                <NAVHookAddLiquidityModal poolId={poolId} onSuccess={vaultState.refetch} triggerClassName="w-full" />
+                <NAVHookWithdrawLiquidityModal poolId={poolId} onSuccess={vaultState.refetch} triggerClassName="w-full" />
+            </div>
+        );
+    };
+
+    return (
+        <section className="flex min-h-[520px] flex-col overflow-hidden rounded-xl border border-card-border bg-card text-left">
+            <div className="flex flex-col gap-4 p-5">
+                <h2 className="text-lg font-semibold text-text-100">Pool Liquidity</h2>
+
+                <div className="flex min-h-[260px] items-center justify-center rounded-xl bg-card-dark/40 p-3">
+                    {pool && token0 && token1 ? (
+                        <LiquidityChart
+                            currencyA={token0}
+                            currencyB={token1}
+                            pool={pool}
+                            currentPrice={currentPrice}
+                            priceLower={undefined}
+                            priceUpper={undefined}
+                        />
+                    ) : (
+                        <Skeleton className="h-[240px] w-full rounded-xl bg-card-light" />
+                    )}
+                </div>
+            </div>
+
+            <div className="mt-auto flex flex-col gap-6 border-t border-card-border p-5">
+                <div className="flex items-center justify-between gap-4">
+                    <h3 className="text-lg font-semibold text-text-100">Deposit Balance</h3>
+
+                    <div className="text-xs font-semibold text-text-300 py-2 px-3 bg-card-light rounded-full">
+                        ${formatAmount(depositAmounUsd, 2)}
+                    </div>
+                </div>
+                {vaultState.hasPosition ? (
+                    <div className="grid grid-cols-1 gap-3 xl:grid-cols-[minmax(0,1fr)_auto_minmax(0,1fr)] xl:items-center">
+                        <NAVHookTokenValueCard currency={token0} amountRaw={vaultState.userAmount0} />
+                        <span className="hidden text-xl font-semibold text-text-300 xl:block">+</span>
+                        <NAVHookTokenValueCard currency={token1} amountRaw={vaultState.userAmount1} />
+                    </div>
+                ) : (
+                    <div className="flex items-center justify-center p-4 py-5 bg-card-light rounded-xl text-sm text-text-300">
+                        You have no liquidity in this pool
+                    </div>
+                )}
+                {renderActions()}
+            </div>
+        </section>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookPoolAttributesPanel.tsx b/src/modules/NAVHookModule/components/NAVHookPoolAttributesPanel.tsx
new file mode 100644
index 00000000..dce40b67
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookPoolAttributesPanel.tsx
@@ -0,0 +1,146 @@
+import CurrencyLogo from "@/components/common/CurrencyLogo";
+import { Button } from "@/components/ui/button";
+import { useToast } from "@/components/ui/use-toast";
+import { useBlockExplorerURL } from "@/hooks/common/useBlockExplorer";
+import { PoolStats } from "@/hooks/pools/usePoolStats";
+import { formatAmount } from "@/utils";
+import { truncateHash } from "@/utils/common/truncateHash";
+import { Currency, Pool } from "@cryptoalgebra/integral-sdk";
+import { ArrowUpDown, Copy, ExternalLink } from "lucide-react";
+import { ReactNode, useMemo, useState } from "react";
+import { Link } from "react-router-dom";
+import { Address } from "viem";
+
+interface NAVHookPoolAttributesPanelProps {
+    pool: Pool | null;
+    token0: Currency | undefined;
+    token1: Currency | undefined;
+    poolStats: PoolStats;
+}
+
+interface PoolPriceDetails {
+    direct: {
+        baseSymbol: string;
+        quoteSymbol: string;
+        value: string;
+    };
+    inverse: {
+        baseSymbol: string;
+        quoteSymbol: string;
+        value: string;
+    };
+}
+
+function OverviewAttribute({ label, value }: { label: string; value: ReactNode }) {
+    return (
+        <div className="grid grid-cols-1 gap-2 border-b border-card-border py-3 text-sm sm:grid-cols-[minmax(0,1fr)_auto] sm:items-center sm:gap-4">
+            <span className="text-text-300">{label}</span>
+            <div className="min-w-0 font-medium text-text-100 sm:text-right">{value}</div>
+        </div>
+    );
+}
+
+function AssetValue({ token }: { token: Currency | undefined }) {
+    const { toast } = useToast();
+    const blockExplorerUrl = useBlockExplorerURL();
+
+    if (!token) return <span>-</span>;
+
+    const address = token.wrapped.address as Address;
+    const tokenExplorePath = `/analytics/tokens/${address}`;
+    const explorerUrl = blockExplorerUrl ? `${blockExplorerUrl}/address/${address}` : undefined;
+
+    const handleCopy = () => {
+        navigator.clipboard.writeText(address);
+        toast({
+            title: "Copied",
+            description: "Address copied to clipboard",
+        });
+    };
+
+    return (
+        <div className="flex flex-wrap items-center justify-end gap-2">
+            <span className="inline-flex min-w-0 items-center gap-2">
+                <CurrencyLogo currency={token} size={18} />
+                <Link className="truncate transition-colors hover:text-primary" to={tokenExplorePath}>
+                    {token.symbol}
+                </Link>
+                <span className="text-xs text-text-300">{truncateHash(address)}</span>
+            </span>
+            <Button type="button" variant="icon" size="icon" className="h-6 w-6 rounded-md" onClick={handleCopy}>
+                <Copy size={12} />
+            </Button>
+            {explorerUrl && (
+                <a
+                    href={explorerUrl}
+                    target="_blank"
+                    rel="noreferrer"
+                    className="inline-flex h-6 w-6 items-center justify-center rounded-md text-text-100 transition-colors hover:bg-card-light"
+                >
+                    <ExternalLink size={12} />
+                </a>
+            )}
+        </div>
+    );
+}
+
+function CurrentPriceValue({ priceDetails }: { priceDetails: PoolPriceDetails | null }) {
+    const [isInverted, setIsInverted] = useState(false);
+
+    if (!priceDetails) return <span>-</span>;
+
+    const activePrice = isInverted ? priceDetails.inverse : priceDetails.direct;
+
+    return (
+        <div className="flex flex-wrap items-center justify-end gap-2">
+            <span className="whitespace-nowrap">
+                1 {activePrice.baseSymbol} = {activePrice.value} {activePrice.quoteSymbol}
+            </span>
+            <Button variant="icon" size="icon" className="h-6 w-6 rounded-md" onClick={() => setIsInverted((value) => !value)}>
+                <ArrowUpDown size={12} />
+            </Button>
+        </div>
+    );
+}
+
+function formatCreatedOn(createdAtTimestamp: string | undefined) {
+    if (!createdAtTimestamp) return "-";
+
+    return new Intl.DateTimeFormat(undefined, {
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+    }).format(new Date(Number(createdAtTimestamp) * 1000));
+}
+
+export function NAVHookPoolAttributesPanel({ pool, token0, token1, poolStats }: NAVHookPoolAttributesPanelProps) {
+    const priceDetails = useMemo<PoolPriceDetails | null>(() => {
+        if (!pool || !token0 || !token1) return null;
+
+        return {
+            direct: {
+                baseSymbol: token0.symbol || "Token",
+                quoteSymbol: token1.symbol || "Token",
+                value: pool.token0Price.toSignificant(8),
+            },
+            inverse: {
+                baseSymbol: token1.symbol || "Token",
+                quoteSymbol: token0.symbol || "Token",
+                value: pool.token1Price.toSignificant(8),
+            },
+        };
+    }, [pool, token0, token1]);
+
+    return (
+        <section className="flex h-fit flex-col gap-4 rounded-xl border border-card-border bg-card p-5 text-left">
+            <p className="text-lg font-semibold text-text-100">Pool Attributes</p>
+            <div className="[&>*:first-child]:pt-0 [&>*:last-child]:border-b-0 [&>*:last-child]:pb-0">
+                <OverviewAttribute label="Base asset" value={<AssetValue token={token0} />} />
+                <OverviewAttribute label="Quote asset" value={<AssetValue token={token1} />} />
+                <OverviewAttribute label="Current price" value={<CurrentPriceValue priceDetails={priceDetails} />} />
+                <OverviewAttribute label="Transactions" value={formatAmount(poolStats.txCount, 0)} />
+                <OverviewAttribute label="Created on" value={formatCreatedOn(poolStats.createdAtTimestamp)} />
+            </div>
+        </section>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookPoolLayout.tsx b/src/modules/NAVHookModule/components/NAVHookPoolLayout.tsx
new file mode 100644
index 00000000..17192dc7
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookPoolLayout.tsx
@@ -0,0 +1,39 @@
+import { Pool } from "@cryptoalgebra/integral-sdk";
+import { PoolStats } from "@/hooks/pools/usePoolStats";
+import { Address } from "viem";
+import { useAccount } from "wagmi";
+import { useNAVHookPool, useNAVHookVaultState } from "../hooks";
+import { NAVHookMyLiquidity } from "./NAVHookMyLiquidity";
+import { NAVHookPoolAttributesPanel } from "./NAVHookPoolAttributesPanel";
+import { NAVHookReservesPanel } from "./NAVHookReservesPanel";
+
+interface NAVHookPoolLayoutProps {
+    poolId: Address | undefined;
+    pool: Pool | null;
+    poolStatus: number | undefined | null;
+    poolStats: PoolStats;
+}
+
+export function NAVHookPoolLayout({ poolId, pool, poolStatus, poolStats }: NAVHookPoolLayoutProps) {
+    const { address: account } = useAccount();
+    const { token0, token1 } = useNAVHookPool(poolId);
+    const vaultState = useNAVHookVaultState(poolId, account);
+
+    return (
+        <div className="grid w-full grid-cols-1 gap-3 lg:grid-cols-[minmax(0,1.55fr)_minmax(320px,0.9fr)]">
+            <NAVHookMyLiquidity
+                poolId={poolId}
+                pool={pool}
+                token0={token0}
+                token1={token1}
+                vaultState={vaultState}
+                account={account}
+                poolStatus={poolStatus}
+            />
+            <div className="flex flex-col gap-3">
+                <NAVHookReservesPanel token0={token0} token1={token1} vaultState={vaultState} />
+                <NAVHookPoolAttributesPanel pool={pool} token0={token0} token1={token1} poolStats={poolStats} />
+            </div>
+        </div>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookReservesPanel.tsx b/src/modules/NAVHookModule/components/NAVHookReservesPanel.tsx
new file mode 100644
index 00000000..c8526607
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookReservesPanel.tsx
@@ -0,0 +1,136 @@
+import CurrencyLogo from "@/components/common/CurrencyLogo";
+import { Skeleton } from "@/components/ui/skeleton";
+import { useUSDCValue } from "@/hooks/common/useUSDCValue";
+import { formatAmount } from "@/utils";
+import { Currency, CurrencyAmount } from "@cryptoalgebra/integral-sdk";
+import { useMemo } from "react";
+import { Link } from "react-router-dom";
+import { formatUnits } from "viem";
+import { NAVHookVaultState } from "../types";
+
+interface NAVHookReservesPanelProps {
+    token0: Currency | undefined;
+    token1: Currency | undefined;
+    vaultState: NAVHookVaultState;
+}
+
+function ReserveRatioBar({
+    token0,
+    token1,
+    token0Share,
+    token1Share,
+}: {
+    token0: Currency | undefined;
+    token1: Currency | undefined;
+    token0Share: number;
+    token1Share: number;
+}) {
+    return (
+        <div className="flex flex-col gap-3">
+            <div className="flex h-2 overflow-hidden rounded-full bg-card-dark">
+                <div className="bg-primary transition-all duration-300" style={{ width: `${token0Share}%` }} />
+                <div className="bg-accent transition-all duration-300" style={{ width: `${token1Share}%` }} />
+            </div>
+            <div className="flex justify-between gap-2 text-xs text-text-300">
+                <div className="flex items-center gap-2">
+                    <CurrencyLogo currency={token0} size={20} />
+                    <span className="font-medium text-text-100">{formatAmount(token0Share, 2)}%</span>
+                </div>
+                <div className="flex items-center gap-2">
+                    <CurrencyLogo currency={token1} size={20} />
+                    <span className="font-medium text-text-100">{formatAmount(token1Share, 2)}%</span>
+                </div>
+            </div>
+        </div>
+    );
+}
+
+function ReserveRow({ token, amountRaw }: { token: Currency | undefined; amountRaw: bigint }) {
+    const amount = useMemo(() => (token ? CurrencyAmount.fromRawAmount(token, amountRaw.toString()) : undefined), [amountRaw, token]);
+    const { formatted: amountUSD } = useUSDCValue(amount);
+    const tokenExplorePath = token?.wrapped.address ? `/analytics/tokens/${token.wrapped.address}` : undefined;
+
+    return (
+        <div className="flex items-center justify-between gap-3 rounded-full bg-card-light px-3 py-3">
+            <div className="flex min-w-0 items-center gap-2.5">
+                <CurrencyLogo currency={token} size={26} />
+                {tokenExplorePath ? (
+                    <Link
+                        className="truncate text-sm font-semibold text-text-100 transition-colors hover:text-primary"
+                        to={tokenExplorePath}
+                    >
+                        {token?.symbol}
+                    </Link>
+                ) : (
+                    <span className="truncate text-sm font-semibold text-text-100">{token?.symbol || "Token"}</span>
+                )}
+            </div>
+            <span className="text-right text-sm font-semibold text-text-100">
+                {token ? formatAmount(formatUnits(amountRaw, token.decimals), 4) : <Skeleton className="h-5 w-20 bg-card-light" />}{" "}
+                <span className="text-xs font-medium text-text-300">${formatAmount(amountUSD || 0, 2)}</span>
+            </span>
+        </div>
+    );
+}
+
+export function NAVHookReservesPanel({ token0, token1, vaultState }: NAVHookReservesPanelProps) {
+    const amount0 = useMemo(() => (token0 ? CurrencyAmount.fromRawAmount(token0, vaultState.total0.toString()) : undefined), [
+        token0,
+        vaultState.total0,
+    ]);
+    const amount1 = useMemo(() => (token1 ? CurrencyAmount.fromRawAmount(token1, vaultState.total1.toString()) : undefined), [
+        token1,
+        vaultState.total1,
+    ]);
+    const { formatted: amount0USD } = useUSDCValue(amount0);
+    const { formatted: amount1USD } = useUSDCValue(amount1);
+
+    const { token0Share, token1Share, totalUSD } = useMemo(() => {
+        const reserve0USD = Number(amount0USD || 0);
+        const reserve1USD = Number(amount1USD || 0);
+        const totalReserveUSD = reserve0USD + reserve1USD;
+
+        if (totalReserveUSD > 0) {
+            const nextToken0Share = (reserve0USD / totalReserveUSD) * 100;
+            return {
+                token0Share: nextToken0Share,
+                token1Share: 100 - nextToken0Share,
+                totalUSD: totalReserveUSD,
+            };
+        }
+
+        const reserve0Amount = token0 ? Number(formatUnits(vaultState.total0, token0.decimals)) : 0;
+        const reserve1Amount = token1 ? Number(formatUnits(vaultState.total1, token1.decimals)) : 0;
+        const totalReserveAmount = reserve0Amount + reserve1Amount;
+
+        if (!Number.isFinite(totalReserveAmount) || totalReserveAmount <= 0) {
+            return { token0Share: 0, token1Share: 0, totalUSD: 0 };
+        }
+
+        const nextToken0Share = (reserve0Amount / totalReserveAmount) * 100;
+        return {
+            token0Share: nextToken0Share,
+            token1Share: 100 - nextToken0Share,
+            totalUSD: 0,
+        };
+    }, [amount0USD, amount1USD, token0, token1, vaultState.total0, vaultState.total1]);
+
+    return (
+        <section className="flex h-fit flex-col gap-4 rounded-xl border border-card-border bg-card p-5 text-left">
+            <div className="flex items-end justify-between gap-4">
+                <p className="text-lg font-semibold text-text-100">Vault Reserves</p>
+                <div className="text-xs font-semibold text-text-300 py-2 px-3 bg-card-light rounded-full">${formatAmount(totalUSD, 2)}</div>
+            </div>
+
+            <div className="flex flex-col gap-2">
+                <ReserveRow token={token0} amountRaw={vaultState.total0} />
+                <ReserveRow token={token1} amountRaw={vaultState.total1} />
+            </div>
+
+            <div className="flex flex-col gap-3 p-1">
+                <p className="text-sm font-semibold text-text-300">Token Ratio</p>
+                <ReserveRatioBar token0={token0} token1={token1} token0Share={token0Share} token1Share={token1Share} />
+            </div>
+        </section>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookTag.tsx b/src/modules/NAVHookModule/components/NAVHookTag.tsx
new file mode 100644
index 00000000..b3026bcf
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookTag.tsx
@@ -0,0 +1,19 @@
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
+
+export function NAVHookTag() {
+    return (
+        <HoverCard openDelay={100} closeDelay={100}>
+            <HoverCardTrigger asChild>
+                <div className="flex h-[26px] w-fit cursor-pointer items-center justify-center rounded-full border border-emerald-700 bg-emerald-500/20 px-3 py-1 text-xs font-bold text-emerald-300 duration-200 hover:opacity-80 max-md:text-xs">
+                    NAV
+                </div>
+            </HoverCardTrigger>
+            <HoverCardContent side="top" className="w-[300px] p-3 text-sm">
+                <p className="text-left text-sm font-semibold">Price Convergence plugin</p>
+                <p className="mt-1 text-left text-xs leading-relaxed text-text-300">
+                    This pool uses the Price Convergence Plugin which enhances AMM price discovery by applying external price data.
+                </p>
+            </HoverCardContent>
+        </HoverCard>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookTokenValueCard.tsx b/src/modules/NAVHookModule/components/NAVHookTokenValueCard.tsx
new file mode 100644
index 00000000..880776d9
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookTokenValueCard.tsx
@@ -0,0 +1,41 @@
+import CurrencyLogo from "@/components/common/CurrencyLogo";
+import { Skeleton } from "@/components/ui/skeleton";
+import { useUSDCValue } from "@/hooks/common/useUSDCValue";
+import { formatAmount } from "@/utils";
+import { Currency, CurrencyAmount } from "@cryptoalgebra/integral-sdk";
+import { useMemo } from "react";
+import { formatUnits } from "viem";
+
+interface NAVHookTokenValueCardProps {
+    currency: Currency | undefined;
+    amountRaw: bigint;
+}
+
+export function NAVHookTokenValueCard({ currency, amountRaw }: NAVHookTokenValueCardProps) {
+    const amount = useMemo(() => (currency ? CurrencyAmount.fromRawAmount(currency, amountRaw.toString()) : undefined), [
+        amountRaw,
+        currency,
+    ]);
+    const { formatted: amountUSD } = useUSDCValue(amount);
+
+    return (
+        <div className="flex min-h-12 flex-1 items-center gap-3 rounded-full bg-card-light px-4 py-2">
+            <CurrencyLogo currency={currency} size={34} />
+            <div className="min-w-0 text-left">
+                <div className="flex min-w-0 items-baseline gap-1">
+                    {currency ? (
+                        <>
+                            <span className="truncate font-semibold text-text-100">
+                                {formatAmount(formatUnits(amountRaw, currency.decimals), 6)}
+                            </span>
+                            <span className="text-text-300">{currency.symbol}</span>
+                        </>
+                    ) : (
+                        <Skeleton className="h-5 w-28 bg-card-light" />
+                    )}
+                </div>
+                <div className="text-sm text-text-300">${formatAmount(amountUSD || 0, 2)}</div>
+            </div>
+        </div>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/NAVHookWithdrawLiquidityModal.tsx b/src/modules/NAVHookModule/components/NAVHookWithdrawLiquidityModal.tsx
new file mode 100644
index 00000000..7306e270
--- /dev/null
+++ b/src/modules/NAVHookModule/components/NAVHookWithdrawLiquidityModal.tsx
@@ -0,0 +1,131 @@
+import { NAVHookTokenValueCard } from "./NAVHookTokenValueCard";
+import Loader from "@/components/common/Loader";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
+import { Slider } from "@/components/ui/slider";
+import { DEFAULT_CHAIN_NAME } from "config";
+import { ApprovalState } from "@/types/approve-state";
+import { useAppKit, useAppKitNetwork } from "@reown/appkit/react";
+import { useState } from "react";
+import { Address } from "viem";
+import { useAccount, useChainId } from "wagmi";
+import { useNAVHookPool, useNAVHookVaultState, useNAVHookWithdraw } from "../hooks";
+import { getPercentAmount } from "../utils";
+
+interface NAVHookWithdrawLiquidityModalProps {
+    poolId: Address | undefined;
+    onSuccess?: () => void;
+    triggerClassName?: string;
+}
+
+export function NAVHookWithdrawLiquidityModal({ poolId, onSuccess, triggerClassName }: NAVHookWithdrawLiquidityModalProps) {
+    const [isOpen, setIsOpen] = useState(false);
+    const [sliderValue, setSliderValue] = useState([50]);
+    const percent = sliderValue[0] ?? 0;
+    const { address: account } = useAccount();
+    const appChainId = useChainId();
+    const { chainId: userChainId } = useAppKitNetwork();
+    const { open } = useAppKit();
+    const { token0, token1 } = useNAVHookPool(poolId);
+    const vaultState = useNAVHookVaultState(poolId, account);
+
+    const { withdraw, approveShares, approvalState, isApproved, isPending, error, sharesToWithdrawRaw } = useNAVHookWithdraw({
+        poolId,
+        percent,
+        onSuccess: () => {
+            setIsOpen(false);
+            onSuccess?.();
+        },
+    });
+
+    const isWrongChain = !userChainId || appChainId !== userChainId;
+    const amount0Raw = getPercentAmount(vaultState.userAmount0, percent);
+    const amount1Raw = getPercentAmount(vaultState.userAmount1, percent);
+
+    const actionButton = () => {
+        if (!account) {
+            return (
+                <Button variant="primary" onClick={() => open()}>
+                    Connect Wallet
+                </Button>
+            );
+        }
+
+        if (isWrongChain) {
+            return (
+                <Button variant="destructive" onClick={() => open({ view: "Networks" })}>
+                    {`Connect to ${DEFAULT_CHAIN_NAME}`}
+                </Button>
+            );
+        }
+
+        if (sharesToWithdrawRaw === 0n) {
+            return (
+                <Button variant="primary" disabled>
+                    Select amount
+                </Button>
+            );
+        }
+
+        if (!isApproved) {
+            return (
+                <Button variant="primary" disabled={approvalState === ApprovalState.PENDING} onClick={approveShares}>
+                    {approvalState === ApprovalState.PENDING ? <Loader /> : "Approve Vault Shares"}
+                </Button>
+            );
+        }
+
+        return (
+            <Button variant="primary" disabled={isPending} onClick={withdraw}>
+                {isPending ? <Loader /> : "Withdraw Liquidity"}
+            </Button>
+        );
+    };
+
+    return (
+        <Dialog open={isOpen} onOpenChange={setIsOpen}>
+            <DialogTrigger asChild>
+                <Button variant="outline" className={triggerClassName}>
+                    Withdraw Liquidity
+                </Button>
+            </DialogTrigger>
+            <DialogContent className="max-w-[520px] rounded-xl! bg-card">
+                <DialogHeader>
+                    <DialogTitle className="text-lg font-semibold select-none">Withdraw NAV Liquidity</DialogTitle>
+                </DialogHeader>
+
+                <div className="flex flex-col gap-5">
+                    <h2 className="text-2xl font-semibold select-none">{percent}%</h2>
+                    <div className="grid grid-cols-4 gap-2">
+                        {[25, 50, 75, 100].map((value) => (
+                            <Button
+                                key={`nav-withdraw-percent-${value}`}
+                                variant={percent === value ? "iconHover" : "icon"}
+                                size="sm"
+                                className="border border-card-border"
+                                onClick={() => setSliderValue([value])}
+                            >
+                                {value}%
+                            </Button>
+                        ))}
+                    </div>
+                    <Slider
+                        value={sliderValue}
+                        max={100}
+                        step={1}
+                        onValueChange={setSliderValue}
+                        className="[&_[role=slider]]:h-4 [&_[role=slider]]:w-4"
+                        aria-label="Liquidity Percent"
+                        disabled={isPending}
+                    />
+                    <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+                        <NAVHookTokenValueCard currency={token0} amountRaw={amount0Raw} />
+                        <NAVHookTokenValueCard currency={token1} amountRaw={amount1Raw} />
+                    </div>
+                    {error && <div className="rounded-lg border border-red-500 bg-red-950/40 px-3 py-2 text-sm text-red-200">{error}</div>}
+                    {actionButton()}
+                </div>
+            </DialogContent>
+        </Dialog>
+    );
+}
diff --git a/src/modules/NAVHookModule/components/index.ts b/src/modules/NAVHookModule/components/index.ts
new file mode 100644
index 00000000..5be74777
--- /dev/null
+++ b/src/modules/NAVHookModule/components/index.ts
@@ -0,0 +1,8 @@
+export * from "./NAVHookAddLiquidityModal";
+export * from "./NAVHookHeaderInfo";
+export * from "./NAVHookMyLiquidity";
+export * from "./NAVHookPoolAttributesPanel";
+export * from "./NAVHookPoolLayout";
+export * from "./NAVHookReservesPanel";
+export * from "./NAVHookTag";
+export * from "./NAVHookWithdrawLiquidityModal";
diff --git a/src/modules/NAVHookModule/hooks/index.ts b/src/modules/NAVHookModule/hooks/index.ts
new file mode 100644
index 00000000..309a4869
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/index.ts
@@ -0,0 +1,5 @@
+export * from "./useNAVHookDeposit";
+export * from "./useNAVHookDepositForm";
+export * from "./useNAVHookPool";
+export * from "./useNAVHookVaultState";
+export * from "./useNAVHookWithdraw";
diff --git a/src/modules/NAVHookModule/hooks/useNAVHookDeposit.ts b/src/modules/NAVHookModule/hooks/useNAVHookDeposit.ts
new file mode 100644
index 00000000..4514e6ca
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/useNAVHookDeposit.ts
@@ -0,0 +1,85 @@
+import { priceConvergenceVaultDepositGuardAbi } from "@/generated";
+import { useApprove } from "@/hooks/common/useApprove";
+import { useTransactionAwait } from "@/hooks/common/useTransactionAwait";
+import { TransactionType } from "@/state/pendingTransactionsStore";
+import { useUserSlippageToleranceWithDefault } from "@/state/userStore";
+import { ApprovalState } from "@/types/approve-state";
+import { Currency, CurrencyAmount } from "@cryptoalgebra/integral-sdk";
+import { useCallback, useMemo, useState } from "react";
+import { Address, zeroAddress } from "viem";
+import { useAccount, usePublicClient, useWriteContract } from "wagmi";
+import { applySlippage, DEFAULT_NAV_HOOK_SLIPPAGE } from "../utils";
+import { useNAVHookPool } from "./useNAVHookPool";
+
+interface UseNAVHookDepositArgs {
+    poolId: Address | undefined;
+    amount0: CurrencyAmount<Currency> | undefined;
+    amount1: CurrencyAmount<Currency> | undefined;
+    onSuccess?: () => void;
+}
+
+export function useNAVHookDeposit({ poolId, amount0, amount1, onSuccess }: UseNAVHookDepositArgs) {
+    const { address: account } = useAccount();
+    const { guardAddress, token0, token1 } = useNAVHookPool(poolId);
+    const publicClient = usePublicClient();
+    const slippage = useUserSlippageToleranceWithDefault(DEFAULT_NAV_HOOK_SLIPPAGE);
+    const [error, setError] = useState<string | null>(null);
+    const amount0Key = amount0?.quotient.toString();
+    const amount1Key = amount1?.quotient.toString();
+    const amount0Raw = useMemo(() => (amount0Key ? BigInt(amount0Key) : 0n), [amount0Key]);
+    const amount1Raw = useMemo(() => (amount1Key ? BigInt(amount1Key) : 0n), [amount1Key]);
+
+    const { approvalState: token0ApprovalState, approvalCallback: approveToken0 } = useApprove(amount0, guardAddress ?? zeroAddress);
+    const { approvalState: token1ApprovalState, approvalCallback: approveToken1 } = useApprove(amount1, guardAddress ?? zeroAddress);
+
+    const { data: hash, writeContractAsync, isPending } = useWriteContract();
+
+    const { isLoading: isConfirming, isSuccess } = useTransactionAwait(hash, {
+        title: "Add NAV liquidity",
+        tokenA: token0?.wrapped.address as Address,
+        tokenB: token1?.wrapped.address as Address,
+        type: TransactionType.POOL,
+        callback: onSuccess,
+    });
+
+    const deposit = useCallback(async () => {
+        if (!guardAddress || !account || !publicClient) return;
+        if (amount0Raw + amount1Raw === 0n) return;
+
+        setError(null);
+
+        try {
+            const simulation = await publicClient.simulateContract({
+                account,
+                address: guardAddress,
+                abi: priceConvergenceVaultDepositGuardAbi,
+                functionName: "deposit",
+                args: [amount0Raw, amount1Raw, 0n, account],
+            });
+            const minimumShares = applySlippage(simulation.result, slippage);
+
+            await writeContractAsync({
+                address: guardAddress,
+                abi: priceConvergenceVaultDepositGuardAbi,
+                functionName: "deposit",
+                args: [amount0Raw, amount1Raw, minimumShares, account],
+            });
+        } catch (depositError) {
+            console.error("NAV Hook deposit failed", depositError);
+            setError("Deposit failed. Please check the entered amounts and try again.");
+        }
+    }, [account, amount0Raw, amount1Raw, guardAddress, publicClient, slippage, writeContractAsync]);
+
+    return {
+        deposit,
+        approveToken0,
+        approveToken1,
+        token0ApprovalState,
+        token1ApprovalState,
+        isToken0Approved: amount0Raw === 0n || token0ApprovalState === ApprovalState.APPROVED,
+        isToken1Approved: amount1Raw === 0n || token1ApprovalState === ApprovalState.APPROVED,
+        isPending: isPending || isConfirming,
+        isSuccess,
+        error,
+    };
+}
diff --git a/src/modules/NAVHookModule/hooks/useNAVHookDepositForm.ts b/src/modules/NAVHookModule/hooks/useNAVHookDepositForm.ts
new file mode 100644
index 00000000..db7a2185
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/useNAVHookDepositForm.ts
@@ -0,0 +1,85 @@
+import { useUSDCValue } from "@/hooks/common/useUSDCValue";
+import { Currency, CurrencyAmount, tryParseAmount } from "@cryptoalgebra/integral-sdk";
+import { useCallback, useMemo, useState } from "react";
+import { Address } from "viem";
+import { useAccount, useBalance } from "wagmi";
+import { useNAVHookPool } from "./useNAVHookPool";
+
+interface UseNAVHookDepositFormResult {
+    amount0Value: string;
+    amount1Value: string;
+    amount0: CurrencyAmount<Currency> | undefined;
+    amount1: CurrencyAmount<Currency> | undefined;
+    amount0Usd: number | null;
+    amount1Usd: number | null;
+    hasAmounts: boolean;
+    errorMessage: string | undefined;
+    onAmount0Change: (value: string) => void;
+    onAmount1Change: (value: string) => void;
+    reset: () => void;
+}
+
+function currencyBalance(currency: Currency | undefined, balance: { value: bigint } | undefined) {
+    if (!currency || !balance) return undefined;
+
+    return CurrencyAmount.fromRawAmount(currency, balance.value.toString());
+}
+
+export function useNAVHookDepositForm(poolId: Address | undefined): UseNAVHookDepositFormResult {
+    const { address: account } = useAccount();
+    const { token0, token1 } = useNAVHookPool(poolId);
+    const [amount0Value, setAmount0Value] = useState("");
+    const [amount1Value, setAmount1Value] = useState("");
+
+    const amount0 = useMemo(() => tryParseAmount(amount0Value, token0), [amount0Value, token0]);
+    const amount1 = useMemo(() => tryParseAmount(amount1Value, token1), [amount1Value, token1]);
+    const { formatted: amount0Usd } = useUSDCValue(amount0);
+    const { formatted: amount1Usd } = useUSDCValue(amount1);
+
+    const { data: token0Balance } = useBalance({
+        address: account,
+        token: token0?.isNative ? undefined : (token0?.wrapped.address as Address | undefined),
+    });
+    const { data: token1Balance } = useBalance({
+        address: account,
+        token: token1?.isNative ? undefined : (token1?.wrapped.address as Address | undefined),
+    });
+
+    const parsedToken0Balance = useMemo(() => currencyBalance(token0, token0Balance), [token0, token0Balance]);
+    const parsedToken1Balance = useMemo(() => currencyBalance(token1, token1Balance), [token1, token1Balance]);
+
+    const amount0Raw = amount0 ? BigInt(amount0.quotient.toString()) : 0n;
+    const amount1Raw = amount1 ? BigInt(amount1.quotient.toString()) : 0n;
+    const hasAmounts = amount0Raw + amount1Raw > 0n;
+
+    const errorMessage = useMemo(() => {
+        if (amount0 && parsedToken0Balance && parsedToken0Balance.lessThan(amount0)) {
+            return `Insufficient ${token0?.symbol} balance`;
+        }
+
+        if (amount1 && parsedToken1Balance && parsedToken1Balance.lessThan(amount1)) {
+            return `Insufficient ${token1?.symbol} balance`;
+        }
+
+        return undefined;
+    }, [amount0, amount1, parsedToken0Balance, parsedToken1Balance, token0?.symbol, token1?.symbol]);
+
+    const reset = useCallback(() => {
+        setAmount0Value("");
+        setAmount1Value("");
+    }, []);
+
+    return {
+        amount0Value,
+        amount1Value,
+        amount0,
+        amount1,
+        amount0Usd,
+        amount1Usd,
+        hasAmounts,
+        errorMessage,
+        onAmount0Change: setAmount0Value,
+        onAmount1Change: setAmount1Value,
+        reset,
+    };
+}
diff --git a/src/modules/NAVHookModule/hooks/useNAVHookPool.ts b/src/modules/NAVHookModule/hooks/useNAVHookPool.ts
new file mode 100644
index 00000000..021cbf25
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/useNAVHookPool.ts
@@ -0,0 +1,50 @@
+import { useCurrency } from "@/hooks/common/useCurrency";
+import { priceConvergenceVaultAbi } from "@/generated";
+import { PRICE_CONVERGENCE_VAULT_BY_POOL, PRICE_CONVERGENCE_VAULT_DEPOSIT_GUARD_BY_POOL } from "config";
+import { useMemo } from "react";
+import { Address } from "viem";
+import { useChainId, useReadContract } from "wagmi";
+import { NAVHookPoolInfo } from "../types";
+import { getAddressByPool } from "../utils";
+
+export function useNAVHookPool(poolId: Address | undefined): NAVHookPoolInfo {
+    const chainId = useChainId();
+
+    const vaultAddress = useMemo(
+        () => getAddressByPool(PRICE_CONVERGENCE_VAULT_BY_POOL[chainId], poolId),
+        [chainId, poolId],
+    );
+    const guardAddress = useMemo(
+        () => getAddressByPool(PRICE_CONVERGENCE_VAULT_DEPOSIT_GUARD_BY_POOL[chainId], poolId),
+        [chainId, poolId],
+    );
+
+    const { data: token0Address } = useReadContract({
+        address: vaultAddress,
+        abi: priceConvergenceVaultAbi,
+        functionName: "token0",
+        query: {
+            enabled: Boolean(vaultAddress),
+        },
+    });
+
+    const { data: token1Address } = useReadContract({
+        address: vaultAddress,
+        abi: priceConvergenceVaultAbi,
+        functionName: "token1",
+        query: {
+            enabled: Boolean(vaultAddress),
+        },
+    });
+
+    const token0 = useCurrency(token0Address, true);
+    const token1 = useCurrency(token1Address, true);
+
+    return {
+        isNAVHookPool: Boolean(vaultAddress && guardAddress),
+        vaultAddress,
+        guardAddress,
+        token0,
+        token1,
+    };
+}
diff --git a/src/modules/NAVHookModule/hooks/useNAVHookVaultState.ts b/src/modules/NAVHookModule/hooks/useNAVHookVaultState.ts
new file mode 100644
index 00000000..30a71154
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/useNAVHookVaultState.ts
@@ -0,0 +1,62 @@
+import { priceConvergenceVaultAbi } from "@/generated";
+import { Address } from "viem";
+import { useReadContracts } from "wagmi";
+import { NAVHookVaultState } from "../types";
+import { getProportionalAmount } from "../utils";
+import { useNAVHookPool } from "./useNAVHookPool";
+
+export function useNAVHookVaultState(poolId: Address | undefined, account: Address | undefined): NAVHookVaultState {
+    const { vaultAddress } = useNAVHookPool(poolId);
+
+    const { data: vaultData, isLoading: isVaultDataLoading, refetch: refetchVaultData } = useReadContracts({
+        allowFailure: false,
+        contracts: vaultAddress
+            ? [
+                  { address: vaultAddress, abi: priceConvergenceVaultAbi, functionName: "totalSupply" },
+                  { address: vaultAddress, abi: priceConvergenceVaultAbi, functionName: "getTotalAmounts" },
+                  { address: vaultAddress, abi: priceConvergenceVaultAbi, functionName: "decimals" },
+              ]
+            : [],
+        query: {
+            enabled: Boolean(vaultAddress),
+            refetchInterval: 15_000,
+        },
+    });
+
+    const { data: userData, isLoading: isUserDataLoading, refetch: refetchUserData } = useReadContracts({
+        allowFailure: false,
+        contracts:
+            vaultAddress && account
+                ? [{ address: vaultAddress, abi: priceConvergenceVaultAbi, functionName: "balanceOf", args: [account] }]
+                : [],
+        query: {
+            enabled: Boolean(vaultAddress && account),
+            refetchInterval: 15_000,
+        },
+    });
+
+    const totalSupply = vaultData?.[0] ?? 0n;
+    const totalAmounts = vaultData?.[1] ?? [0n, 0n];
+    const shareDecimals = vaultData?.[2] ?? 18;
+    const userShares = userData?.[0] ?? 0n;
+    const total0 = totalAmounts[0] ?? 0n;
+    const total1 = totalAmounts[1] ?? 0n;
+    const userAmount0 = getProportionalAmount(total0, userShares, totalSupply);
+    const userAmount1 = getProportionalAmount(total1, userShares, totalSupply);
+
+    return {
+        userShares,
+        totalSupply,
+        total0,
+        total1,
+        userAmount0,
+        userAmount1,
+        shareDecimals: Number(shareDecimals),
+        isLoading: isVaultDataLoading || isUserDataLoading,
+        hasPosition: userShares > 0n,
+        refetch: () => {
+            refetchVaultData();
+            refetchUserData();
+        },
+    };
+}
diff --git a/src/modules/NAVHookModule/hooks/useNAVHookWithdraw.ts b/src/modules/NAVHookModule/hooks/useNAVHookWithdraw.ts
new file mode 100644
index 00000000..ddfc7fc4
--- /dev/null
+++ b/src/modules/NAVHookModule/hooks/useNAVHookWithdraw.ts
@@ -0,0 +1,89 @@
+import { priceConvergenceVaultDepositGuardAbi } from "@/generated";
+import { useApprove } from "@/hooks/common/useApprove";
+import { useCurrency } from "@/hooks/common/useCurrency";
+import { useTransactionAwait } from "@/hooks/common/useTransactionAwait";
+import { TransactionType } from "@/state/pendingTransactionsStore";
+import { useUserSlippageToleranceWithDefault } from "@/state/userStore";
+import { ApprovalState } from "@/types/approve-state";
+import { CurrencyAmount } from "@cryptoalgebra/integral-sdk";
+import { useCallback, useMemo, useState } from "react";
+import { Address, zeroAddress } from "viem";
+import { useAccount, usePublicClient, useWriteContract } from "wagmi";
+import { applySlippage, DEFAULT_NAV_HOOK_SLIPPAGE, getPercentAmount } from "../utils";
+import { useNAVHookPool } from "./useNAVHookPool";
+import { useNAVHookVaultState } from "./useNAVHookVaultState";
+
+interface UseNAVHookWithdrawArgs {
+    poolId: Address | undefined;
+    percent: number;
+    onSuccess?: () => void;
+}
+
+export function useNAVHookWithdraw({ poolId, percent, onSuccess }: UseNAVHookWithdrawArgs) {
+    const { address: account } = useAccount();
+    const { vaultAddress, guardAddress, token0, token1 } = useNAVHookPool(poolId);
+    const vaultState = useNAVHookVaultState(poolId, account);
+    const vaultShareToken = useCurrency(vaultAddress, false);
+    const publicClient = usePublicClient();
+    const slippage = useUserSlippageToleranceWithDefault(DEFAULT_NAV_HOOK_SLIPPAGE);
+    const [error, setError] = useState<string | null>(null);
+
+    const sharesToWithdrawRaw = useMemo(() => getPercentAmount(vaultState.userShares, percent), [percent, vaultState.userShares]);
+    const sharesToApprove = useMemo(
+        () => (vaultShareToken ? CurrencyAmount.fromRawAmount(vaultShareToken, sharesToWithdrawRaw.toString()) : undefined),
+        [sharesToWithdrawRaw, vaultShareToken],
+    );
+
+    const { approvalState, approvalCallback } = useApprove(sharesToApprove, guardAddress ?? zeroAddress);
+    const { data: hash, writeContractAsync, isPending } = useWriteContract();
+
+    const { isLoading: isConfirming, isSuccess } = useTransactionAwait(hash, {
+        title: "Withdraw NAV liquidity",
+        tokenA: token0?.wrapped.address as Address,
+        tokenB: token1?.wrapped.address as Address,
+        type: TransactionType.POOL,
+        callback: onSuccess,
+    });
+
+    const withdraw = useCallback(async () => {
+        if (!guardAddress || !account || !publicClient || sharesToWithdrawRaw === 0n) return;
+
+        setError(null);
+
+        try {
+            const simulation = await publicClient.simulateContract({
+                account,
+                address: guardAddress,
+                abi: priceConvergenceVaultDepositGuardAbi,
+                functionName: "withdraw",
+                args: [sharesToWithdrawRaw, account, 0n, 0n],
+            });
+
+            await writeContractAsync({
+                address: guardAddress,
+                abi: priceConvergenceVaultDepositGuardAbi,
+                functionName: "withdraw",
+                args: [
+                    sharesToWithdrawRaw,
+                    account,
+                    applySlippage(simulation.result[0], slippage),
+                    applySlippage(simulation.result[1], slippage),
+                ],
+            });
+        } catch (withdrawError) {
+            console.error("NAV Hook withdraw failed", withdrawError);
+            setError("Withdrawal failed. Please check the selected amount and try again.");
+        }
+    }, [account, guardAddress, publicClient, sharesToWithdrawRaw, slippage, writeContractAsync]);
+
+    return {
+        withdraw,
+        approveShares: approvalCallback,
+        approvalState,
+        isApproved: approvalState === ApprovalState.APPROVED,
+        isPending: isPending || isConfirming,
+        isSuccess,
+        error,
+        sharesToWithdrawRaw,
+    };
+}
diff --git a/src/modules/NAVHookModule/index.ts b/src/modules/NAVHookModule/index.ts
new file mode 100644
index 00000000..16216ff8
--- /dev/null
+++ b/src/modules/NAVHookModule/index.ts
@@ -0,0 +1,9 @@
+import * as NAVHookComponents from "./components";
+import * as NAVHookHooks from "./hooks";
+
+const NAVHookModule = {
+    hooks: NAVHookHooks,
+    components: NAVHookComponents,
+};
+
+export default NAVHookModule;
diff --git a/src/modules/NAVHookModule/types/index.ts b/src/modules/NAVHookModule/types/index.ts
new file mode 100644
index 00000000..3eae3fc6
--- /dev/null
+++ b/src/modules/NAVHookModule/types/index.ts
@@ -0,0 +1,23 @@
+import { Currency } from "@cryptoalgebra/integral-sdk";
+import { Address } from "viem";
+
+export interface NAVHookPoolInfo {
+    isNAVHookPool: boolean;
+    vaultAddress?: Address;
+    guardAddress?: Address;
+    token0?: Currency;
+    token1?: Currency;
+}
+
+export interface NAVHookVaultState {
+    userShares: bigint;
+    totalSupply: bigint;
+    total0: bigint;
+    total1: bigint;
+    userAmount0: bigint;
+    userAmount1: bigint;
+    shareDecimals: number;
+    isLoading: boolean;
+    hasPosition: boolean;
+    refetch: () => void;
+}
diff --git a/src/modules/NAVHookModule/utils/index.ts b/src/modules/NAVHookModule/utils/index.ts
new file mode 100644
index 00000000..db87847b
--- /dev/null
+++ b/src/modules/NAVHookModule/utils/index.ts
@@ -0,0 +1,31 @@
+import { Percent } from "@cryptoalgebra/integral-sdk";
+import { Address } from "viem";
+
+export const DEFAULT_NAV_HOOK_SLIPPAGE = new Percent(10, 10_000);
+
+export function getAddressByPool(mapping: Record<Address, Address> | undefined, poolId: Address | undefined): Address | undefined {
+    if (!mapping || !poolId) return undefined;
+
+    const matched = Object.entries(mapping).find(([address]) => address.toLowerCase() === poolId.toLowerCase());
+    return matched?.[1];
+}
+
+export function getProportionalAmount(total: bigint, shares: bigint, totalSupply: bigint): bigint {
+    if (totalSupply === 0n || shares === 0n) return 0n;
+    return (total * shares) / totalSupply;
+}
+
+export function applySlippage(amount: bigint, slippage: Percent): bigint {
+    if (amount === 0n) return 0n;
+
+    const numerator = BigInt(slippage.numerator.toString());
+    const denominator = BigInt(slippage.denominator.toString());
+
+    if (denominator === 0n || numerator >= denominator) return 0n;
+    return (amount * (denominator - numerator)) / denominator;
+}
+
+export function getPercentAmount(amount: bigint, percent: number): bigint {
+    if (amount === 0n || percent <= 0) return 0n;
+    return (amount * BigInt(percent)) / 100n;
+}
diff --git a/src/modules/__empty_module.ts b/src/modules/__empty_module.ts
index 898355c3..3a14ab72 100644
--- a/src/modules/__empty_module.ts
+++ b/src/modules/__empty_module.ts
@@ -36,9 +36,13 @@ export default {
     usePositionInFarming: () => ({}),
     useUnclaimedRewards: () => ({}),
     useLimitOrderInfo: () => ({}),
+    useNAVHookDeposit: () => ({}),
+    useNAVHookDepositForm: () => ({}),
+    useNAVHookPool: () => ({}),
+    useNAVHookVaultState: () => ({}),
+    useNAVHookWithdraw: () => ({}),
     useAllOpenMarkets: () => ({}),
     useCountdown: () => ({}),
-    useLivePoolPrice: () => ({}),
     useMarketFiveMinuteData: () => ({}),
     useMarketStats: () => ({}),
     useMarketsByTokens: () => ({}),
@@ -100,14 +104,31 @@ export default {
     LimitPriceCard: () => null,
     limitOrderColumns: () => null,
     LimitOrdersTable: () => null,
-    LiveChip: () => null,
+    NAVHookAddLiquidityModal: () => null,
+    NAVHookHeaderInfo: () => null,
+    NAVHookMyLiquidity: () => null,
+    NAVHookPoolAttributesPanel: () => null,
+    NAVHookPoolLayout: () => null,
+    NAVHookReservesPanel: () => null,
+    NAVHookTag: () => null,
+    NAVHookTokenValueCard: () => null,
+    NAVHookWithdrawLiquidityModal: () => null,
+    FeaturedMarketCard: () => null,
+    LivePriceChart: () => null,
+    MarketLadder: () => null,
+    OpportunityStage: () => null,
     PredictionButton: () => null,
     PredictionChart: () => null,
-    PredictionInfo: () => null,
+    PredictionForm: () => null,
     PredictionMarketCard: () => null,
+    PredictionMarketDetails: () => null,
     PredictionMarkets: () => null,
+    PredictionParams: () => null,
+    PredictionQuestion: () => null,
     PredictionSideSelector: () => null,
     PredictionTradesTable: () => null,
+    UserActivitySection: () => null,
+    UserMarkets: () => null,
     ClaimRebaseRewardsButton: () => null,
     ClaimVotingRewardsModal: () => null,
     CreateLockModal: () => null,
@@ -129,6 +150,11 @@ export default {
     getRewardsCalldata: () => undefined,
     getUnclaimedRewardsCalldata: () => undefined,
     isSameRewards: () => undefined,
+    DEFAULT_NAV_HOOK_SLIPPAGE: () => undefined,
+    getAddressByPool: () => undefined,
+    getProportionalAmount: () => undefined,
+    applySlippage: () => undefined,
+    getPercentAmount: () => undefined,
     getTimeUntilTimestamp: () => undefined,
     optimizeVotes: () => undefined,
   },
diff --git a/src/pages/NewPosition/CreateManualPosition.tsx b/src/pages/NewPosition/CreateManualPosition.tsx
index 35e6bc2f..a0b5b629 100644
--- a/src/pages/NewPosition/CreateManualPosition.tsx
+++ b/src/pages/NewPosition/CreateManualPosition.tsx
@@ -7,14 +7,15 @@ import { useReadAlgebraPoolToken0, useReadAlgebraPoolToken1 } from "@/generated"
 import { useCurrency } from "@/hooks/common/useCurrency";
 import { useDerivedMintInfo, useRangeHopCallbacks, useMintActionHandlers, useMintState } from "@/state/mintStore";
 import { INITIAL_POOL_FEE, Bound, nearestUsableTick, TickMath } from "@cryptoalgebra/integral-sdk";
-import { useState, useMemo, useEffect } from "react";
+import { ReactNode, useState, useMemo, useEffect } from "react";
 import { Address } from "viem";
 
 interface ManualProps {
     poolAddress?: Address;
+    modeSwitch?: ReactNode;
 }
 
-export function CreateManualPosition({ poolAddress }: ManualProps) {
+export function CreateManualPosition({ poolAddress, modeSwitch }: ManualProps) {
     const { data: token0 } = useReadAlgebraPoolToken0({
         address: poolAddress,
     });
@@ -42,7 +43,7 @@ export function CreateManualPosition({ poolAddress }: ManualProps) {
         poolAddress,
         INITIAL_POOL_FEE,
         currencyA ?? undefined,
-        undefined
+        undefined,
     );
 
     const { [Bound.LOWER]: priceLower, [Bound.UPPER]: priceUpper } = mintInfo.pricesAtTicks;
@@ -78,7 +79,7 @@ export function CreateManualPosition({ poolAddress }: ManualProps) {
         mintInfo.tickSpacing,
         tickLower,
         tickUpper,
-        mintInfo.pool
+        mintInfo.pool,
     );
 
     const { onLeftRangeInput, onRightRangeInput } = useMintActionHandlers(mintInfo.noLiquidity);
@@ -104,21 +105,23 @@ export function CreateManualPosition({ poolAddress }: ManualProps) {
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-y-3 md:gap-3 w-full text-left">
             <div className="col-span-2">
                 <div className="flex flex-col w-full">
-                    <div className="w-full p-3 md:p-6 bg-card flex flex-col gap-3 text-left rounded-xl border border-card-border">
+                    <div className="w-full p-3 md:p-6 bg-card flex flex-col gap-3 text-left rounded-2xl border border-card-border">
                         <div className="flex items-center justify-between w-full">
                             <h2 className="font-semibold text-lg md:text-2xl text-left">Select Range</h2>
                             <div className="flex h-fit w-fit gap-0.5 rounded-xl border border-lighter p-0.5">
                                 <Button
                                     className="h-4 rounded-lg text-xs font-normal max-sm:p-3.5"
-                                    variant={wasManuallyToggled ? "iconActive" : "icon"}
+                                    variant={wasManuallyToggled ? "iconHover" : "icon"}
                                     onClick={handleCurrencyToggle}
+                                    size="md"
                                 >
                                     {currency0?.symbol}
                                 </Button>
                                 <Button
                                     className="h-4 rounded-lg text-xs font-normal max-sm:p-3.5"
-                                    variant={!wasManuallyToggled ? "iconActive" : "icon"}
+                                    variant={!wasManuallyToggled ? "iconHover" : "icon"}
                                     onClick={handleCurrencyToggle}
+                                    size="md"
                                 >
                                     {currency1?.symbol}
                                 </Button>
@@ -160,7 +163,8 @@ export function CreateManualPosition({ poolAddress }: ManualProps) {
 
             <div className="flex flex-col">
                 {/* <h2 className="font-semibold text-2xl text-left mb-6 leading-[44px]">2. Enter Amounts</h2> */}
-                <div className="flex flex-col w-full h-fit gap-2 bg-card border border-card-border rounded-xl p-2">
+                <div className="flex flex-col w-full h-fit gap-2 bg-card border border-card-border rounded-2xl p-2">
+                    {modeSwitch}
                     <AmountsSection currencyA={currencyA} currencyB={currencyB} mintInfo={mintInfo} />
                 </div>
             </div>
diff --git a/src/pages/NewPosition/index.tsx b/src/pages/NewPosition/index.tsx
index 43a22ecd..3325ee42 100644
--- a/src/pages/NewPosition/index.tsx
+++ b/src/pages/NewPosition/index.tsx
@@ -1,12 +1,12 @@
 import PageContainer from "@/components/common/PageContainer";
 import PageTitle from "@/components/common/PageTitle";
 import { useParams } from "react-router-dom";
-import { Button } from "@/components/ui/button";
 import { useEffect, useState } from "react";
 import { CreateManualPosition } from "./CreateManualPosition";
 import { Address } from "viem";
 import { enabledModules } from "config/app-modules";
 import ALMModule from "@/modules/ALMModule";
+import { cn } from "@/utils";
 
 const { useALMVaultsByPool } = ALMModule.hooks;
 const { CreateAutomatedPosition } = ALMModule.components;
@@ -37,35 +37,44 @@ const NewPositionPage = () => {
         }
     }, [vaults]);
 
+    const modeSwitch = isALMPool && enabledModules.ALMModule && (
+        <div className="relative flex w-full overflow-hidden rounded-xl bg-card-light">
+            <button
+                type="button"
+                onClick={() => setIsALM(false)}
+                className={cn(
+                    "flex h-12 w-full items-center justify-center px-6 text-sm font-medium transition-colors",
+                    isALM ? "text-text-300 hover:text-text-100" : "bg-card-border/40 text-text-100",
+                )}
+            >
+                Manual
+            </button>
+            <button
+                type="button"
+                onClick={() => setIsALM(true)}
+                disabled={isALM === null}
+                className={cn(
+                    "flex h-12 w-full items-center justify-center px-6 text-sm font-medium transition-colors disabled:pointer-events-none disabled:opacity-50",
+                    isALM ? "bg-card-border/40 text-text-100" : "text-text-300 hover:text-text-100",
+                )}
+            >
+                Automated
+            </button>
+        </div>
+    );
+
     return (
         <PageContainer>
             <div className="w-full grid grid-flow-col auto-cols-fr gap-3 max-md:flex-col max-md:flex mb-3">
                 <div className="col-span-2 mb-8">
                     <PageTitle title={"Create Position"} showSettings={false} />
                 </div>
-                {isALMPool && enabledModules.ALMModule && (
-                    <div className="flex items-center h-full max-h-16 col-span-1 p-2 bg-card rounded-xl justify-between gap-2 border border-card-border">
-                        <Button
-                            onClick={() => setIsALM(false)}
-                            size={"md"}
-                            variant={isALM ? "ghost" : "primaryLink"}
-                            className="flex items-center justify-center gap-2 w-full rounded-lg h-12"
-                        >
-                            Manually
-                        </Button>
-                        <Button
-                            onClick={() => setIsALM(true)}
-                            size={"md"}
-                            disabled={isALM === null}
-                            variant={!isALM ? "ghost" : "primaryLink"}
-                            className="flex items-center justify-center gap-2 w-full rounded-lg h-12"
-                        >
-                            Automated
-                        </Button>
-                    </div>
-                )}
             </div>
-            {isALM ? <CreateAutomatedPosition poolId={poolAddress} vaults={vaults} /> : <CreateManualPosition poolAddress={poolAddress} />}
+            {isALM ? (
+                <CreateAutomatedPosition poolId={poolAddress} vaults={vaults} modeSwitch={modeSwitch} />
+            ) : (
+                <CreateManualPosition poolAddress={poolAddress} modeSwitch={modeSwitch} />
+            )}
         </PageContainer>
     );
 };
diff --git a/src/pages/Pool/index.tsx b/src/pages/Pool/index.tsx
index 84845f91..f4c38d94 100644
--- a/src/pages/Pool/index.tsx
+++ b/src/pages/Pool/index.tsx
@@ -5,6 +5,7 @@ import PositionCard from "@/components/position/PositionCard";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { usePool, SecurityState } from "@/hooks/pools/usePool";
+import { usePoolStats } from "@/hooks/pools/usePoolStats";
 import { usePositions } from "@/hooks/positions/usePositions";
 import { FormattedPosition } from "@/types/formatted-position";
 import { getPositionAPR } from "@/utils/positions/getPositionAPR";
@@ -18,6 +19,7 @@ import { useAccount } from "wagmi";
 import JSBI from "jsbi";
 import { Address, parseUnits } from "viem";
 import ALMModule from "@/modules/ALMModule";
+import NAVHookModule from "@/modules/NAVHookModule";
 import FarmingModule from "@/modules/FarmingModule";
 import MyPositionsToolbar from "@/components/pool/MyPositionsToolbar";
 import { useAppKit } from "@reown/appkit/react";
@@ -26,10 +28,14 @@ import { useUSDCPrice } from "@/hooks/common/useUSDCValue";
 import useSWR from "swr";
 import { Deposit, useSinglePositionLazyQuery } from "@/graphql/generated/graphql";
 import { useReadSecurityRegistryGlobalStatus } from "@/generated";
+import { enabledModules } from "config";
 
 const { ALMPositionCard } = ALMModule.components;
 const { useUserALMVaultsByPool } = ALMModule.hooks;
 
+const { NAVHookPoolLayout } = NAVHookModule.components;
+const { useNAVHookPool } = NAVHookModule.hooks;
+
 const { ActiveFarming, UnclaimedRewards } = FarmingModule.components;
 const { useActiveFarming, useClosedFarmings, useUnclaimedRewards } = FarmingModule.hooks;
 
@@ -61,6 +67,10 @@ const PoolPage = () => {
 
     const effectiveStatus = globalStatus !== SecurityState.ENABLED ? globalStatus : poolSecurityStatus;
 
+    const poolStats = usePoolStats(poolId);
+    const { isNAVHookPool } = useNAVHookPool(poolId);
+    const showNAVHookPool = enabledModules.NAVHookModule && isNAVHookPool;
+
     const filteredPositions = useMemo(() => {
         if (!positions || !poolEntity) return [];
 
@@ -132,6 +142,9 @@ const PoolPage = () => {
 
             return positionsAPRs;
         },
+        {
+            keepPreviousData: true,
+        },
     );
 
     const positionsData = useMemo(() => {
@@ -210,78 +223,86 @@ const PoolPage = () => {
 
     return (
         <PageContainer>
-            <PoolHeader showCreatePosition={effectiveStatus === SecurityState.ENABLED} />
-
-            <div className="grid grid-cols-1 lg:grid-cols-3 gap-y-3 md:gap-3 w-full mt-3">
-                <div className="col-span-2">
-                    <MyPositionsToolbar
-                        currencyA={poolEntity && unwrappedToken(poolEntity.token0)}
-                        currencyB={poolEntity && unwrappedToken(poolEntity.token1)}
-                        positionsData={positionsData}
-                        poolStatus={effectiveStatus}
-                    />
-                    {!account ? (
-                        <NoAccount />
-                    ) : isLoading ? (
-                        <LoadingState />
-                    ) : noPositions ? (
-                        effectiveStatus === SecurityState.ENABLED ? (
-                            <NoPositions poolId={poolId} />
-                        ) : null
-                    ) : (
-                        <>
-                            <MyPositions
-                                positions={positionsData}
-                                poolId={poolId}
-                                selectedPosition={selectedPosition?.id}
-                                selectPosition={(position) => setSelectedPosition(position)}
+            <PoolHeader
+                currencyA={poolEntity && unwrappedToken(poolEntity.token0)}
+                currencyB={poolEntity && unwrappedToken(poolEntity.token1)}
+                poolId={poolId}
+                poolStatus={effectiveStatus}
+                stats={poolStats}
+                showCreatePosition={effectiveStatus === SecurityState.ENABLED && !showNAVHookPool}
+            />
+
+            {showNAVHookPool ? (
+                <NAVHookPoolLayout poolId={poolId} pool={poolEntity} poolStatus={effectiveStatus} poolStats={poolStats} />
+            ) : (
+                <div className="grid grid-cols-1 lg:grid-cols-3 gap-y-3 md:gap-3 w-full">
+                    <div className="col-span-2">
+                        <MyPositionsToolbar positionsData={positionsData} />
+                        {!account ? (
+                            <NoAccount />
+                        ) : isLoading ? (
+                            <LoadingState />
+                        ) : noPositions ? (
+                            effectiveStatus === SecurityState.ENABLED ? (
+                                <NoPositions poolId={poolId} />
+                            ) : null
+                        ) : (
+                            <>
+                                <MyPositions
+                                    positions={positionsData}
+                                    poolId={poolId}
+                                    selectedPosition={selectedPosition?.id}
+                                    selectPosition={(position) => setSelectedPosition(position)}
+                                />
+                                {unclaimedRewards &&
+                                    Boolean(unclaimedRewards?.rewards?.length) &&
+                                    effectiveStatus === SecurityState.ENABLED && (
+                                        <UnclaimedRewards unclaimedRewards={unclaimedRewards && unclaimedRewards.rewards} />
+                                    )}
+                            </>
+                        )}
+                        {farmingInfo && !isFarmingLoading && !areDepositsLoading && effectiveStatus === SecurityState.ENABLED && (
+                            <ActiveFarming
+                                deposits={(deposits?.deposits as Deposit[]) || []}
+                                farming={farmingInfo}
+                                positionsData={positionsData}
                             />
-                            {unclaimedRewards &&
-                                Boolean(unclaimedRewards?.rewards?.length) &&
-                                effectiveStatus === SecurityState.ENABLED && (
-                                    <UnclaimedRewards unclaimedRewards={unclaimedRewards && unclaimedRewards.rewards} />
-                                )}
-                        </>
-                    )}
-                    {farmingInfo && !isFarmingLoading && !areDepositsLoading && effectiveStatus === SecurityState.ENABLED && (
-                        <ActiveFarming
-                            deposits={(deposits?.deposits as Deposit[]) || []}
+                        )}
+                    </div>
+
+                    <div className="flex flex-col gap-8 w-full h-full">
+                        <PositionCard
+                            pool={poolEntity}
                             farming={farmingInfo}
-                            positionsData={positionsData}
+                            closedFarmings={closedFarmings}
+                            selectedPosition={selectedPosition?.isALM ? null : selectedPosition}
+                            poolStatus={effectiveStatus}
                         />
-                    )}
-                </div>
-
-                <div className="flex flex-col gap-8 w-full h-full">
-                    <PositionCard
-                        pool={poolEntity}
-                        farming={farmingInfo}
-                        closedFarmings={closedFarmings}
-                        selectedPosition={selectedPosition?.isALM ? null : selectedPosition}
-                        poolStatus={effectiveStatus}
-                    />
-                    <ALMPositionCard
-                        farming={farmingInfo}
-                        poolAddress={poolId}
-                        userVault={userVaults?.find(
-                            (v) => v.vault.id === selectedPosition?.almVaultAddress && v.shares === selectedPosition?.almShares,
-                        )}
-                        poolStatus={effectiveStatus}
-                    />
+                        <ALMPositionCard
+                            farming={farmingInfo}
+                            poolAddress={poolId}
+                            userVault={userVaults?.find(
+                                (v) => v.vault.id === selectedPosition?.almVaultAddress && v.shares === selectedPosition?.almShares,
+                            )}
+                            poolStatus={effectiveStatus}
+                        />
+                    </div>
                 </div>
-            </div>
+            )}
         </PageContainer>
     );
 };
 
 const NoPositions = ({ poolId }: { poolId: Address }) => (
-    <div className="flex flex-col items-start gap-4 p-6 bg-card border border-card-border rounded-xl animate-fade-in">
-        <h2 className="text-2xl font-bold text-left">You don't have positions for this pool</h2>
-        <p className="text-md font-semibold">Let's create one!</p>
-        <Button variant={"primary"} className="gap-2" asChild>
+    <div className="flex flex-col items-start gap-4 rounded-2xl border border-card-border bg-card/70 p-6 text-center animate-fade-in">
+        <div className="flex flex-col gap-1">
+            <h2 className="text-xl font-bold text-left">No positions found</h2>
+            <p className="text-sm font-semibold text-text-300 text-left">Create a position to start providing liquidity in this pool.</p>
+        </div>
+        <Button variant="primary" className="gap-2" size="md" asChild>
             <Link to={`/pool/${poolId}/new-position`}>
                 Create Position
-                <MoveRightIcon />
+                <MoveRightIcon size={18} />
             </Link>
         </Button>
     </div>
@@ -291,10 +312,12 @@ const NoAccount = () => {
     const { open } = useAppKit();
 
     return (
-        <div className="flex flex-col items-start p-6 bg-card border border-card-border rounded-xl animate-fade-in">
-            <h2 className="text-2xl font-bold">Connect Wallet</h2>
-            <p className="text-md font-semibold my-4">Connect your account to view or create positions</p>
-            <Button variant={"primary"} size={"lg"} onClick={() => open()}>
+        <div className="flex flex-col items-start gap-4 rounded-2xl border border-card-border bg-card/70 p-6 text-center animate-fade-in">
+            <div className="flex flex-col gap-1">
+                <h2 className="text-xl font-bold text-left">Connect Wallet</h2>
+                <p className="text-sm font-semibold text-text-300 text-left">Connect your account to view or create positions.</p>
+            </div>
+            <Button variant="primary" size="md" onClick={() => open()}>
                 Connect Wallet
             </Button>
         </div>
@@ -302,7 +325,7 @@ const NoAccount = () => {
 };
 
 const LoadingState = () => (
-    <div className="flex flex-col w-full gap-4 p-4 bg-card rounded-xl">
+    <div className="flex flex-col w-full gap-3 rounded-2xl border border-card-border bg-card/70 p-4">
         {[1, 2, 3, 4].map((v) => (
             <Skeleton key={`position-skeleton-${v}`} className="w-full h-[50px] bg-card-light rounded-xl" />
         ))}
diff --git a/src/state/mintStore.ts b/src/state/mintStore.ts
index c9563e94..e5945206 100644
--- a/src/state/mintStore.ts
+++ b/src/state/mintStore.ts
@@ -116,8 +116,8 @@ const initialState = {
     initialUSDPrices: { [Field.CURRENCY_A]: "", [Field.CURRENCY_B]: "" },
     initialTokenPrice: "",
     currentStep: 0,
-    token0InputMode: enabledModules.BoostedPoolsModule ? ("underlying" as const) : ("boosted" as const),
-    token1InputMode: enabledModules.BoostedPoolsModule ? ("underlying" as const) : ("boosted" as const),
+    token0InputMode: "boosted" as const,
+    token1InputMode: "boosted" as const,
 };
 
 export const useMintState = create<MintState>((set, get) => ({
@@ -150,7 +150,7 @@ export const useMintState = create<MintState>((set, get) => ({
 }));
 
 export function useMintActionHandlers(
-    noLiquidity: boolean | undefined
+    noLiquidity: boolean | undefined,
 ): {
     onFieldAInput: (typedValue: string) => void;
     onFieldBInput: (typedValue: string) => void;
@@ -187,7 +187,7 @@ export function useDerivedMintInfo(
     poolAddress?: Address,
     feeAmount?: number,
     baseCurrency?: Currency,
-    existingPosition?: Position
+    existingPosition?: Position,
 ): IDerivedMintInfo {
     const { address: account } = useAccount();
 
@@ -209,7 +209,7 @@ export function useDerivedMintInfo(
             [Field.CURRENCY_A]: currencyA,
             [Field.CURRENCY_B]: currencyB,
         }),
-        [currencyA, currencyB]
+        [currencyA, currencyB],
     );
 
     // formatted with tokens
@@ -226,7 +226,7 @@ export function useDerivedMintInfo(
                     ? [tokenA, tokenB]
                     : [tokenB, tokenA]
                 : [undefined, undefined],
-        [tokenA, tokenB]
+        [tokenA, tokenB],
     );
 
     const [addressA, addressB] = [
@@ -349,7 +349,7 @@ export function useDerivedMintInfo(
             [Bound.LOWER]: tickSpacing ? nearestUsableTick(TickMath.MIN_TICK, tickSpacing) : undefined,
             [Bound.UPPER]: tickSpacing ? nearestUsableTick(TickMath.MAX_TICK, tickSpacing) : undefined,
         }),
-        [tickSpacing]
+        [tickSpacing],
     );
 
     // parse typed range values and determine closest ticks
@@ -387,7 +387,7 @@ export function useDerivedMintInfo(
             [Bound.LOWER]: Boolean(feeAmount) && tickLower === tickSpaceLimits.LOWER,
             [Bound.UPPER]: Boolean(feeAmount) && tickUpper === tickSpaceLimits.UPPER,
         }),
-        [tickSpaceLimits, tickLower, tickUpper, feeAmount]
+        [tickSpaceLimits, tickLower, tickUpper, feeAmount],
     );
 
     // mark invalid range
@@ -404,7 +404,7 @@ export function useDerivedMintInfo(
 
     // liquidity range warning
     const outOfRange = Boolean(
-        !invalidRange && price && lowerPrice && upperPrice && (price.lessThan(lowerPrice) || price.greaterThan(upperPrice))
+        !invalidRange && price && lowerPrice && upperPrice && (price.lessThan(lowerPrice) || price.greaterThan(upperPrice)),
     );
 
     const independentInputMode = independentField === Field.CURRENCY_A ? token0InputMode : token1InputMode;
@@ -423,7 +423,7 @@ export function useDerivedMintInfo(
 
     const debouncedIndependentAmount: CurrencyAmount<Currency> | undefined = tryParseAmount(
         debouncedTypedValue,
-        independentDisplayCurrency
+        independentDisplayCurrency,
     );
 
     const needsConversion = enabledModules.BoostedPoolsModule && independentCurrency?.isBoosted && independentInputMode === "underlying";
@@ -431,7 +431,7 @@ export function useDerivedMintInfo(
     const { outputAmount: convertedAmount } = useBoostedConversion(
         needsConversion ? debouncedIndependentAmount : undefined,
         independentCurrency,
-        "underlying-to-boosted"
+        "underlying-to-boosted",
     );
 
     const independentAmount = needsConversion ? convertedAmount : debouncedIndependentAmount;
@@ -485,7 +485,7 @@ export function useDerivedMintInfo(
     const { outputAmount: convertedDependentAmount } = useBoostedConversion(
         needsDependentConversion ? dependentAmount : undefined,
         dependentCurrency,
-        "boosted-to-underlying"
+        "boosted-to-underlying",
     );
 
     const displayDependentAmount = needsDependentConversion ? convertedDependentAmount : dependentAmount;
@@ -517,13 +517,13 @@ export function useDerivedMintInfo(
         invalidRange ||
         Boolean(
             (deposit0Disabled && poolForPosition && tokenA && poolForPosition.token0.equals(tokenA)) ||
-                (deposit1Disabled && poolForPosition && tokenA && poolForPosition.token1.equals(tokenA))
+                (deposit1Disabled && poolForPosition && tokenA && poolForPosition.token1.equals(tokenA)),
         );
     const depositBDisabled =
         invalidRange ||
         Boolean(
             (deposit0Disabled && poolForPosition && tokenB && poolForPosition.token0.equals(tokenB)) ||
-                (deposit1Disabled && poolForPosition && tokenB && poolForPosition.token1.equals(tokenB))
+                (deposit1Disabled && poolForPosition && tokenB && poolForPosition.token1.equals(tokenB)),
         );
 
     // create position entity based on users selection
@@ -655,7 +655,7 @@ export function useRangeHopCallbacks(
     tickSpacing: number,
     tickLower: number | undefined,
     tickUpper: number | undefined,
-    pool?: Pool | undefined | null
+    pool?: Pool | undefined | null,
 ) {
     const {
         actions: { setFullRange },
@@ -678,7 +678,7 @@ export function useRangeHopCallbacks(
             }
             return "";
         },
-        [baseToken, quoteToken, tickLower, tickSpacing, pool]
+        [baseToken, quoteToken, tickLower, tickSpacing, pool],
     );
 
     const getIncrementLower = useCallback(
@@ -694,7 +694,7 @@ export function useRangeHopCallbacks(
             }
             return "";
         },
-        [baseToken, quoteToken, tickLower, tickSpacing, pool]
+        [baseToken, quoteToken, tickLower, tickSpacing, pool],
     );
 
     const getDecrementUpper = useCallback(
@@ -710,7 +710,7 @@ export function useRangeHopCallbacks(
             }
             return "";
         },
-        [baseToken, quoteToken, tickUpper, tickSpacing, pool]
+        [baseToken, quoteToken, tickUpper, tickSpacing, pool],
     );
 
     const getIncrementUpper = useCallback(
@@ -726,7 +726,7 @@ export function useRangeHopCallbacks(
             }
             return "";
         },
-        [baseToken, quoteToken, tickUpper, tickSpacing, pool]
+        [baseToken, quoteToken, tickUpper, tickSpacing, pool],
     );
 
     const getSetRange = useCallback(
@@ -743,7 +743,7 @@ export function useRangeHopCallbacks(
             }
             return ["", ""];
         },
-        [baseToken, quoteToken, tickSpacing, pool]
+        [baseToken, quoteToken, tickSpacing, pool],
     );
 
     const getSetFullRange = useCallback(() => setFullRange(), []);
diff --git a/src/types/approve-state.ts b/src/types/approve-state.ts
index 600b080a..fa3f74cf 100644
--- a/src/types/approve-state.ts
+++ b/src/types/approve-state.ts
@@ -1,6 +1,7 @@
 export const ApprovalState = {
     UNKNOWN: "UNKNOWN",
     NOT_APPROVED: "NOT_APPROVED",
+    RESET_REQUIRED: "RESET_REQUIRED",
     PENDING: "PENDING",
     APPROVED: "APPROVED",
 };
diff --git a/src/types/formatted-position.ts b/src/types/formatted-position.ts
index b886d98d..19765e06 100644
--- a/src/types/formatted-position.ts
+++ b/src/types/formatted-position.ts
@@ -3,6 +3,7 @@ import { Position } from "@cryptoalgebra/integral-sdk";
 export interface FormattedPosition {
     id: string;
     outOfRange: boolean;
+    isClosed: boolean;
     range: string;
     liquidityUSD: number;
     feesUSD: number | null;
diff --git a/yarn.lock b/yarn.lock
index f1736290..74be881d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1475,22 +1475,22 @@
     tiny-warning "^1.0.3"
     toformat "^2.0.0"
 
-"@cryptoalgebra/integral-omega-router-sdk@1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-omega-router-sdk/-/integral-omega-router-sdk-1.0.1.tgz#67d355087d14521bed82ae871d77ccd819383a66"
-  integrity sha512-1bsNLX01yEO+M4qVHLDppw/c1p8i6aB/KgCfXO3uMmmCtaGBoZFBXsa13haytw2Rl5iQ2drOsA9CBiSaTURhag==
+"@cryptoalgebra/integral-omega-router-sdk@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-omega-router-sdk/-/integral-omega-router-sdk-1.0.2.tgz#4fac626439af93de32591d8bbbf70ff30d610507"
+  integrity sha512-E3WYszMSiJxER0Y0u4Pk1B1YW31+Gu9EjP6VUBTgDTx3kiSRD6MHQYymhV/8i7R6E76ZkowtNu5XBfPv4WHGKw==
   dependencies:
-    "@cryptoalgebra/integral-sdk" "npm:@cryptoalgebra/integral-sdk@1.1.2"
+    "@cryptoalgebra/integral-sdk" "^1.1.3"
     "@uniswap/permit2-sdk" "^1.4.0"
     "@uniswap/sdk-core" "^7.10.0"
     "@uniswap/v2-sdk" "^4.16.0"
     "@uniswap/v3-sdk" "^3.26.0"
     viem "^2.31.3"
 
-"@cryptoalgebra/integral-sdk@1.1.2", "@cryptoalgebra/integral-sdk@npm:@cryptoalgebra/integral-sdk@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-sdk/-/integral-sdk-1.1.2.tgz#9d036532829fc4c76df1c52971e2fd0e8c882b4c"
-  integrity sha512-f0yYtK2oeM/8VBSNkJEwdtYdbpMsJjQkmtbHbW7nqjaqpdEwk/NKkekXCliSqew+P9VvQ71+71pGt3YfKgBkMQ==
+"@cryptoalgebra/integral-sdk@1.1.3", "@cryptoalgebra/integral-sdk@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-sdk/-/integral-sdk-1.1.3.tgz#4c58e3818a4351152ccf91dd9fa4a98a8ee2cb5c"
+  integrity sha512-Xf6mnPPQIf4BWp5HhbV2KPnUbBQe4gHu9k6qNKv3h6TDJdZAyYdT6DRqBADareI0LAjq3ojbPQBQWM+8CMNqeA==
   dependencies:
     "@ethersproject/abi" "^5.7.0"
     "@ethersproject/address" "^5.7.0"