diff --git a/README.md b/README.md
index 8002609..db375cd 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,19 @@
 # CoverMax 🛡️
 
-*A decentralized insurance protocol powered by tradeable risk tokens*
+_A decentralized insurance protocol powered by tradeable risk tokens_
 
 ## 🎮 Quick Start for Testing
 
 Want to try out CoverMax? Use this test wallet that already has test tokens:
 
 **Test Private Key:**
+
 ```
 994fc012e651448eacdba62f2e49c17796e44aac67155e512894c23ddbf3e1fd
 ```
 
 This wallet is pre-funded with test tokens (aUSDC, cUSDT) that you can use to:
+
 - Deposit into insurance pools
 - Receive and trade risk tokens
 - Submit test claims
@@ -33,13 +35,13 @@ Watch CoverMax in action: https://youtu.be/CvOf5WiP0co
 
 ### The Insurance Mechanism
 
-1. **Deposit Phase** (2 days): Users deposit yield-bearing assets (aUSDC, cUSDT) into insurance pools
+1. **Continuous Deposits**: Users can deposit yield-bearing assets (aUSDC, cUSDT) at any time during the protocol lifecycle
 2. **Token Issuance**: For each deposit, users receive equal amounts of:
    - **Senior Risk Tokens** (CM-SENIOR) - Lower risk, priority claims
    - **Junior Risk Tokens** (CM-JUNIOR) - Higher risk, subordinate claims
-3. **Trading Phase**: Risk tokens can be traded on Uniswap like any ERC20 token
-4. **Coverage Phase** (3 days): Active insurance period where claims can be submitted
-5. **Redemption Phase**: Token holders can redeem remaining tokens for underlying assets
+3. **Trading**: Risk tokens can be traded on Uniswap like any ERC20 token throughout all phases
+4. **Active Phase** (5 days): Combined deposit and coverage period where claims can be submitted
+5. **Flexible Redemption**: Token holders can redeem tokens at any time with phase-specific rules
 
 ### The Risk-Insurance Relationship
 
@@ -52,6 +54,7 @@ The core innovation is that **selling risk tokens = providing insurance coverage
 ### Example Scenarios
 
 #### Risk Tier Trading (Advanced Strategy)
+
 ```
 1. Alice deposits 1000 aUSDC → receives 500 CM-SENIOR + 500 CM-JUNIOR tokens
 2. Bob deposits 1000 cUSDT → receives 500 CM-SENIOR + 500 CM-JUNIOR tokens
@@ -76,48 +79,58 @@ The core innovation is that **selling risk tokens = providing insurance coverage
 
 - **aUSDC**: Aave interest-bearing USDC
 - **cUSDT**: Compound interest-bearing USDT
-- *Extensible to other yield-bearing assets*
+- _Extensible to other yield-bearing assets_
 
 ### Risk Token Tiers
 
-| Token Type | Risk Level | Claim Priority | Use Case |
-|------------|------------|----------------|----------|
+| Token Type | Risk Level | Claim Priority | Use Case                         |
+| ---------- | ---------- | -------------- | -------------------------------- |
 | CM-SENIOR  | Lower      | First claims   | Conservative insurance providers |
-| CM-JUNIOR  | Higher     | Subordinate    | Risk-seeking yield farmers |
+| CM-JUNIOR  | Higher     | Subordinate    | Risk-seeking yield farmers       |
 
 ## 🔄 Protocol Lifecycle
 
-### Phase 1: Deposit Period (2 days)
-- Users deposit yield-bearing assets
+### Phase 1: Active Period (5 days)
+
+- Combined deposit and coverage period for maximum flexibility
+- Users can deposit yield-bearing assets at any time during the protocol lifecycle
+- Active insurance coverage for all deposited assets
 - Dual-tier risk tokens are minted 1:1 with deposits
 - Tokens can be traded immediately on Uniswap
-
-### Phase 2: Coverage Period (5 days)
-- Active insurance coverage for deposited assets
+- Withdrawals require equal amounts of senior and junior tokens
 - Claims can be submitted and processed
 - Risk tokens continue trading on secondary markets
 
-### Phase 3: Senior Claims (1 day)
+### Phase 2: Claims Period (1 day)
+
 - Priority redemption period for senior token holders
 - Senior tokens have first claim on remaining assets
+- Any combination of senior/junior tokens can be withdrawn (in normal mode)
+- In emergency mode: only senior token withdrawals allowed
+- Deposits continue to be accepted
+
+### Phase 3: Final Claims (1 day)
 
-### Phase 4: Final Claims (1 day)
-- All remaining tokens can be redeemed
+- All remaining tokens can be redeemed with any combination of senior/junior
+- Deposits continue to be accepted
 - Protocol cycle completes and can restart
 
 ## 💰 Economic Model
 
 ### For Insurance Providers
+
 - **Deposit** yield-bearing assets to earn insurance premiums
 - **Hold tokens** to bear risk and earn yield from claims that don't materialize
 - **Sell tokens** to reduce risk exposure and lock in profits
 
 ### For Risk Traders
+
 - **Buy risk tokens** on Uniswap to speculate on insurance outcomes
 - **Sell risk tokens** to exit positions or reduce exposure
 - **Arbitrage** between risk levels and market pricing
 
 ### For Insurance Seekers
+
 - **Submit claims** backed by evidence when covered events occur
 - **Receive payouts** from the insurance pool when claims are approved
 - **Benefit** from community-funded insurance coverage
@@ -125,82 +138,25 @@ The core innovation is that **selling risk tokens = providing insurance coverage
 ## 🦄 Uniswap Integration
 
 ### Why Uniswap?
+
 Risk tokens are standard ERC20 tokens that can be traded on any DEX. Uniswap provides:
+
 - **Liquidity**: Deep markets for risk token trading
 - **Price Discovery**: Market-driven risk pricing
 - **Accessibility**: Anyone can buy/sell insurance risk
 - **Composability**: Risk tokens can be used in other DeFi protocols
 
-### Trading Strategy Examples
-
-#### 1. Risk Tier Arbitrage (CM-SENIOR ↔ CM-JUNIOR Pool)
-```solidity
-// Strategy: Trade down risk by converting junior to senior tokens
-// Bob wants more downside protection, less upside exposure
-uniswapRouter.swapExactTokensForTokens(
-    200 * 1e18, // Sell 200 CM-JUNIOR tokens
-    190 * 1e18, // Expect ~190 CM-SENIOR tokens (forfeit some upside)
-    [juniorToken, seniorToken],
-    msg.sender,
-    deadline
-);
-
-// Result: Bob now has more senior tokens (priority claims)
-// but less junior tokens (subordinate claims)
-```
-
-#### 2. Complete Risk Exit (Risk Token → Stablecoin)
-```solidity
-// Strategy: Exit insurance position entirely
-// Sell risk tokens for stablecoins to eliminate exposure
-uniswapRouter.swapExactTokensForTokens(
-    250 * 1e18, // Sell 250 CM-SENIOR tokens
-    minAmountOut,
-    [seniorToken, USDC],
-    msg.sender,
-    deadline
-);
-```
-
-#### 3. Risk Speculation (Stablecoin → Risk Token)
-```solidity
-// Strategy: Buy underpriced risk for potential yield
-// Charlie thinks insurance claims are unlikely
-uniswapRouter.swapExactTokensForTokens(
-    1000 * 1e6, // Spend 1000 USDC
-    minTokensOut,
-    [USDC, juniorToken],
-    msg.sender,
-    deadline
-);
-```
-
-## 🔧 Technical Implementation
-
-### Smart Contract Features
-
-- **Reentrancy Protection**: All external functions protected against reentrancy attacks
-- **Phase-Based Logic**: Automated lifecycle management with time-based phases
-- **Proportional Redemption**: Fair distribution of assets based on token holdings
-- **Emergency Pause**: Owner can pause protocol in emergencies
-- **Claim Processing**: Structured insurance claim submission and approval system
-
-### Security Considerations
-
-- **Audited OpenZeppelin contracts** for standard functionality
-- **Custom errors** for gas-efficient error handling
-- **Precision math** using 27-decimal precision for accurate calculations
-- **Access controls** with owner-only administrative functions
-
 ## 📊 Key Metrics
 
 ### Protocol Health
+
 - **Total Value Locked (TVL)**: Combined value of all deposited assets
 - **Insurance Coverage Ratio**: Amount of active insurance coverage
 - **Token Distribution**: Spread of risk across token holders
 - **Claim Success Rate**: Percentage of approved vs submitted claims
 
 ### Market Dynamics
+
 - **Risk Token Price**: Market valuation of insurance risk
 - **Liquidity Depth**: Available trading volume on Uniswap
 - **Volatility**: Price stability of risk tokens
@@ -237,11 +193,13 @@ npx hardhat test
 All tests should pass. For troubleshooting, ensure you are using a compatible Node.js version and Hardhat is installed.
 
 # Deploy to local network
+
 npx hardhat ignition deploy ignition/modules/RiskToken.ts --network localhost
 
 ## 🤝 Contributing
 
 Contributions welcome! This project includes:
+
 - **Hardhat development environment**
 - **TypeScript support**
 - **Comprehensive test suite**
@@ -257,4 +215,4 @@ For commercial licensing inquiries, contact: legal@covermax.fi
 
 ---
 
-*CoverMax: Phase-based risk management with dual-tier tokens*
+_CoverMax: Phase-based risk management with dual-tier tokens_
diff --git a/contracts/RiskVault.sol b/contracts/RiskVault.sol
index 3326ebe..b3a0e12 100644
--- a/contracts/RiskVault.sol
+++ b/contracts/RiskVault.sol
@@ -12,10 +12,9 @@ import "./IRiskToken.sol";
 contract RiskVault is Ownable, ReentrancyGuard {
     /* Protocol Phases */
     enum Phase {
-        DEPOSIT,      // Phase 1: Deposit Period (2 days)
-        COVERAGE,       // Phase 2: Active Coverage Period (3 days) 
-        CLAIMS,       // Phase 3: Claims Period (1 day)
-        FINAL_CLAIMS  // Phase 4: Final Claims Period (1 day)
+        ACTIVE,       // Phase 1: Active Period - Deposits and Coverage (5 days)
+        CLAIMS,       // Phase 2: Claims Period (1 day)
+        FINAL_CLAIMS  // Phase 3: Final Claims Period (1 day)
     }
 
     /* Core Protocol Assets */
@@ -26,9 +25,8 @@ contract RiskVault is Ownable, ReentrancyGuard {
 
     /* Protocol Constants */
     uint256 private constant MIN_DEPOSIT_AMOUNT = 10; // Minimum deposit threshold
-    uint256 private constant DEPOSIT_PHASE_DURATION = 2 days;
-    uint256 private constant COVERAGE_PHASE_DURATION = 3 days;
-    uint256 private constant SENIOR_CLAIMS_DURATION = 1 days;
+    uint256 private constant ACTIVE_PHASE_DURATION = 5 days; // Combined deposit + coverage period
+    uint256 private constant CLAIMS_PHASE_DURATION = 1 days;
     uint256 private constant FINAL_CLAIMS_DURATION = 1 days;
 
     /* Protocol State */
@@ -85,13 +83,13 @@ contract RiskVault is Ownable, ReentrancyGuard {
         seniorToken = address(_seniorToken);
         juniorToken = address(_juniorToken);
         
-        // Initialize lifecycle - start in DEPOSIT phase
-        currentPhase = Phase.DEPOSIT;
+        // Initialize lifecycle - start in ACTIVE phase
+        currentPhase = Phase.ACTIVE;
         phaseStartTime = block.timestamp;
         cycleStartTime = block.timestamp;
         
         emit CycleStarted(1, block.timestamp);
-        emit PhaseTransitioned(0, uint8(Phase.DEPOSIT), block.timestamp);
+        emit PhaseTransitioned(0, uint8(Phase.ACTIVE), block.timestamp);
     }
 
     /* Access Control Modifiers */
@@ -103,7 +101,7 @@ contract RiskVault is Ownable, ReentrancyGuard {
     modifier onlyDuringPhase(Phase requiredPhase) {
         _updatePhaseIfNeeded();
         if (currentPhase != requiredPhase) {
-            if (requiredPhase == Phase.DEPOSIT) revert InvalidPhaseForDeposit();
+            if (requiredPhase == Phase.ACTIVE) revert InvalidPhaseForDeposit();
             else revert InvalidPhaseForWithdrawal();
         }
         _;
@@ -125,15 +123,11 @@ contract RiskVault is Ownable, ReentrancyGuard {
         uint256 timeElapsed = block.timestamp - phaseStartTime;
         Phase oldPhase = currentPhase;
         
-        if (currentPhase == Phase.DEPOSIT && timeElapsed >= DEPOSIT_PHASE_DURATION) {
-            currentPhase = Phase.COVERAGE;
-            phaseStartTime = block.timestamp;
-            emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
-        } else if (currentPhase == Phase.COVERAGE && timeElapsed >= COVERAGE_PHASE_DURATION) {
+        if (currentPhase == Phase.ACTIVE && timeElapsed >= ACTIVE_PHASE_DURATION) {
             currentPhase = Phase.CLAIMS;
             phaseStartTime = block.timestamp;
             emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
-        } else if (currentPhase == Phase.CLAIMS && timeElapsed >= SENIOR_CLAIMS_DURATION) {
+        } else if (currentPhase == Phase.CLAIMS && timeElapsed >= CLAIMS_PHASE_DURATION) {
             currentPhase = Phase.FINAL_CLAIMS;
             phaseStartTime = block.timestamp;
             emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
@@ -153,11 +147,7 @@ contract RiskVault is Ownable, ReentrancyGuard {
     function forcePhaseTransitionImmediate() external onlyOwner {
         Phase oldPhase = currentPhase;
         
-        if (currentPhase == Phase.DEPOSIT) {
-            currentPhase = Phase.COVERAGE;
-            phaseStartTime = block.timestamp;
-            emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
-        } else if (currentPhase == Phase.COVERAGE) {
+        if (currentPhase == Phase.ACTIVE) {
             currentPhase = Phase.CLAIMS;
             phaseStartTime = block.timestamp;
             emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
@@ -166,7 +156,7 @@ contract RiskVault is Ownable, ReentrancyGuard {
             phaseStartTime = block.timestamp;
             emit PhaseTransitioned(uint8(oldPhase), uint8(currentPhase), block.timestamp);
         }
-        // Note: FINAL_CLAIMS requires startNewCycle() to reset to DEPOSIT
+        // Note: FINAL_CLAIMS requires startNewCycle() to reset to ACTIVE
     }
 
     /**
@@ -181,7 +171,7 @@ contract RiskVault is Ownable, ReentrancyGuard {
         if (timeElapsed < FINAL_CLAIMS_DURATION) revert PhaseTransitionNotReady();
         
         Phase oldPhase = currentPhase;
-        currentPhase = Phase.DEPOSIT;
+        currentPhase = Phase.ACTIVE;
         phaseStartTime = block.timestamp;
         cycleStartTime = block.timestamp;
         
@@ -310,18 +300,17 @@ contract RiskVault is Ownable, ReentrancyGuard {
 
     // Core Vault Functions
     /**
-     * @dev Deposits yield-bearing assets to get CM tokens (only during DEPOSIT phase)
+     * @dev Deposits yield-bearing assets to get CM tokens (can deposit at any time)
      * @param asset The yield-bearing asset to deposit (aUSDC or cUSDT)
      * @param depositAmount Amount of asset to deposit
      */
     function depositAsset(address asset, uint256 depositAmount)
         external
-        onlyDuringPhase(Phase.DEPOSIT)
         whenNotEmergency
         nonReentrant
     {
         if (depositAmount <= MIN_DEPOSIT_AMOUNT) revert InsufficientDepositAmount();
-        if (depositAmount & 1 != 0) revert UnevenDepositAmount(); // Must be even for equal token split
+        if ((depositAmount & 1) != 0) revert UnevenDepositAmount(); // Must be even for equal token split
         if (!_isAssetSupported(asset)) revert UnsupportedAsset();
 
         // Transfer asset from depositor
@@ -344,7 +333,10 @@ contract RiskVault is Ownable, ReentrancyGuard {
 
 
     /**
-     * @dev Withdraws tokens during any phase with specific conditions
+     * @dev Withdraws tokens at any time with phase-specific conditions:
+     * - ACTIVE phase: Requires equal senior and junior amounts
+     * - CLAIMS phase (emergency): Only senior tokens allowed
+     * - CLAIMS phase (normal)/FINAL_CLAIMS: Any token combination allowed
      * @param seniorAmount Amount of senior tokens to withdraw
      * @param juniorAmount Amount of junior tokens to withdraw
      * @param preferredAsset Optional: specific asset to withdraw (address(0) for proportional split)
@@ -364,13 +356,13 @@ contract RiskVault is Ownable, ReentrancyGuard {
         if (currentPhase == Phase.CLAIMS && emergencyMode) {
             // During senior claims in emergency mode, only senior tokens allowed
             if (juniorAmount > 0) revert OnlySeniorTokensAllowed();
-        } else if (currentPhase != Phase.CLAIMS && currentPhase != Phase.FINAL_CLAIMS) {
-            // During DEPOSIT and COVERAGE phases, require equal amounts
+        } else if (currentPhase == Phase.ACTIVE) {
+            // During ACTIVE phase, require equal amounts
             if (seniorAmount != juniorAmount) {
                 revert EqualAmountsRequired();
             }
         }
-        // During SENIOR_CLAIMS (non-emergency) and FINAL_CLAIMS phases, any combination is allowed
+        // During CLAIMS (non-emergency) and FINAL_CLAIMS phases, any combination is allowed
 
         uint256 aUSDCAmount;
         uint256 cUSDTAmount;
@@ -558,7 +550,7 @@ contract RiskVault is Ownable, ReentrancyGuard {
      * @dev Gets protocol status including current phase
      * @return emergency Whether emergency mode is active
      * @return totalTokens Total CM tokens issued
-     * @return phase Current protocol phase (0=DEPOSIT, 1=COVERAGE, 2=SENIOR_CLAIMS, 3=FINAL_CLAIMS)
+     * @return phase Current protocol phase (0=ACTIVE, 1=CLAIMS, 2=FINAL_CLAIMS)
      * @return phaseEndTime When current phase ends
      */
     function getProtocolStatus() external view returns (
@@ -568,12 +560,10 @@ contract RiskVault is Ownable, ReentrancyGuard {
         uint256 phaseEndTime
     ) {
         uint256 phaseDuration;
-        if (currentPhase == Phase.DEPOSIT) {
-            phaseDuration = DEPOSIT_PHASE_DURATION;
-        } else if (currentPhase == Phase.COVERAGE) {
-            phaseDuration = COVERAGE_PHASE_DURATION;
+        if (currentPhase == Phase.ACTIVE) {
+            phaseDuration = ACTIVE_PHASE_DURATION;
         } else if (currentPhase == Phase.CLAIMS) {
-            phaseDuration = SENIOR_CLAIMS_DURATION;
+            phaseDuration = CLAIMS_PHASE_DURATION;
         } else {
             phaseDuration = FINAL_CLAIMS_DURATION;
         }
@@ -600,12 +590,10 @@ contract RiskVault is Ownable, ReentrancyGuard {
         uint256 timeRemaining
     ) {
         uint256 phaseDuration;
-        if (currentPhase == Phase.DEPOSIT) {
-            phaseDuration = DEPOSIT_PHASE_DURATION;
-        } else if (currentPhase == Phase.COVERAGE) {
-            phaseDuration = COVERAGE_PHASE_DURATION;
+        if (currentPhase == Phase.ACTIVE) {
+            phaseDuration = ACTIVE_PHASE_DURATION;
         } else if (currentPhase == Phase.CLAIMS) {
-            phaseDuration = SENIOR_CLAIMS_DURATION;
+            phaseDuration = CLAIMS_PHASE_DURATION;
         } else {
             phaseDuration = FINAL_CLAIMS_DURATION;
         }
diff --git a/frontend/.env.example b/frontend/.env.example
new file mode 100644
index 0000000..d826224
--- /dev/null
+++ b/frontend/.env.example
@@ -0,0 +1,12 @@
+# AI Configuration
+# Get your free Groq API key from https://console.groq.com/keys
+VITE_GROQ_API_KEY=your_groq_api_key_here
+
+# Hedera Configuration (Optional - for advanced features)
+# Get testnet credentials from https://portal.hedera.com/
+VITE_HEDERA_OPERATOR_ID=0.0.xxxxx
+VITE_HEDERA_OPERATOR_KEY=your_private_key_here
+
+# Existing Configuration
+VITE_PRIVY_APP_ID=your_privy_app_id
+VITE_INFURA_API_KEY=your_infura_api_key
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e4737c6..8eb4f40 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -8,6 +8,9 @@
       "name": "vite_react_shadcn_ts",
       "version": "0.0.0",
       "dependencies": {
+        "@langchain/core": "^0.3.67",
+        "@langchain/groq": "^0.2.3",
+        "@langchain/openai": "^0.6.4",
         "@privy-io/react-auth": "^1.99.1",
         "@privy-io/wagmi-connector": "^0.1.13",
         "@radix-ui/react-accordion": "^1.2.0",
@@ -41,9 +44,11 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.0.0",
         "date-fns": "^3.6.0",
+        "dotenv": "^17.2.1",
         "embla-carousel-react": "^8.3.0",
         "ethers": "^6.15.0",
         "input-otp": "^1.2.4",
+        "langchain": "^0.3.30",
         "lucide-react": "^0.462.0",
         "next-themes": "^0.3.0",
         "react": "^18.3.1",
@@ -97,9 +102,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -107,9 +112,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -117,13 +122,13 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.9.tgz",
-      "integrity": "sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.28.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -145,19 +150,25 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.9.tgz",
-      "integrity": "sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@cfworker/json-schema": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/@cfworker/json-schema/-/json-schema-4.1.1.tgz",
+      "integrity": "sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og==",
+      "license": "MIT"
+    },
     "node_modules/@coinbase/wallet-sdk": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@coinbase/wallet-sdk/-/wallet-sdk-4.0.3.tgz",
@@ -1697,17 +1708,13 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -1719,13 +1726,17 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
+      "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
@@ -1735,15 +1746,208 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@langchain/core": {
+      "version": "0.3.67",
+      "resolved": "https://registry.npmjs.org/@langchain/core/-/core-0.3.67.tgz",
+      "integrity": "sha512-ATmkAj8V+FaHM2UYX+O9tdaKJr4eu8FSVPF6F6aaD+0Gq980Eza1qp15kV3jCpG+f5mGwkFToQixkT+SSmZJDg==",
+      "license": "MIT",
+      "dependencies": {
+        "@cfworker/json-schema": "^4.0.2",
+        "ansi-styles": "^5.0.0",
+        "camelcase": "6",
+        "decamelize": "1.2.0",
+        "js-tiktoken": "^1.0.12",
+        "langsmith": "^0.3.46",
+        "mustache": "^4.2.0",
+        "p-queue": "^6.6.2",
+        "p-retry": "4",
+        "uuid": "^10.0.0",
+        "zod": "^3.25.32",
+        "zod-to-json-schema": "^3.22.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@langchain/core/node_modules/@types/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
+      "license": "MIT"
+    },
+    "node_modules/@langchain/core/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@langchain/core/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@langchain/core/node_modules/langsmith": {
+      "version": "0.3.53",
+      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.3.53.tgz",
+      "integrity": "sha512-cnEcJEiYjbcFQy7vTCQb7sR4w70UtBCu9loCOON+yYcK6T1lVmx27lQ4AF2KY7xzKY+FhbxWms5PV3SocizzaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/uuid": "^10.0.0",
+        "chalk": "^4.1.2",
+        "console-table-printer": "^2.12.1",
+        "p-queue": "^6.6.2",
+        "p-retry": "4",
+        "semver": "^7.6.3",
+        "uuid": "^10.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "*",
+        "@opentelemetry/exporter-trace-otlp-proto": "*",
+        "@opentelemetry/sdk-trace-base": "*",
+        "openai": "*"
+      },
+      "peerDependenciesMeta": {
+        "@opentelemetry/api": {
+          "optional": true
+        },
+        "@opentelemetry/exporter-trace-otlp-proto": {
+          "optional": true
+        },
+        "@opentelemetry/sdk-trace-base": {
+          "optional": true
+        },
+        "openai": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@langchain/core/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@langchain/groq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@langchain/groq/-/groq-0.2.3.tgz",
+      "integrity": "sha512-r+yjysG36a0IZxTlCMr655Feumfb4IrOyA0jLLq4l7gEhVyMpYXMwyE6evseyU2LRP+7qOPbGRVpGqAIK0MsUA==",
+      "license": "MIT",
+      "dependencies": {
+        "groq-sdk": "^0.19.0",
+        "zod": "^3.22.4"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/openai": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.6.4.tgz",
+      "integrity": "sha512-0B8AdImAjIgvGKnNN8URGVB4JUg61Of9EW+scZTS0OJOKjhdybe6ars/OwXkY9pacU3lMxIIKEMm9Op9DMaXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tiktoken": "^1.0.12",
+        "openai": "^5.3.0",
+        "zod": "^3.25.32"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.3.58 <0.4.0"
+      }
+    },
+    "node_modules/@langchain/openai/node_modules/openai": {
+      "version": "5.12.0",
+      "resolved": "https://registry.npmjs.org/openai/-/openai-5.12.0.tgz",
+      "integrity": "sha512-vUdt02xiWgOHiYUmW0Hj1Qu9OKAiVQu5Bd547ktVCiMKC1BkB5L3ImeEnCyq3WpRKR6ZTaPgekzqdozwdPs7Lg==",
+      "license": "Apache-2.0",
+      "bin": {
+        "openai": "bin/cli"
+      },
+      "peerDependencies": {
+        "ws": "^8.18.0",
+        "zod": "^3.23.8"
+      },
+      "peerDependenciesMeta": {
+        "ws": {
+          "optional": true
+        },
+        "zod": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@langchain/openai/node_modules/ws": {
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@langchain/textsplitters": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@langchain/textsplitters/-/textsplitters-0.1.0.tgz",
+      "integrity": "sha512-djI4uw9rlkAb5iMhtLED+xJebDdAG935AdP4eRTB02R7OB/act55Bj9wsskhZsvuyQRpO4O1wQOp85s6T6GWmw==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tiktoken": "^1.0.12"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/core": ">=0.2.21 <0.4.0"
+      }
+    },
     "node_modules/@lit-labs/ssr-dom-shim": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.3.0.tgz",
@@ -2101,6 +2305,17 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
+      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -2329,6 +2544,18 @@
         }
       }
     },
+    "node_modules/@privy-io/react-auth/node_modules/dotenv": {
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/@privy-io/react-auth/node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@@ -6713,6 +6940,16 @@
         "undici-types": "~6.19.2"
       }
     },
+    "node_modules/@types/node-fetch": {
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "form-data": "^4.0.4"
+      }
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.13",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz",
@@ -6764,6 +7001,12 @@
         "@types/react-router": "*"
       }
     },
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "license": "MIT"
+    },
     "node_modules/@types/stylis": {
       "version": "4.2.5",
       "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz",
@@ -9332,9 +9575,9 @@
       "license": "MIT"
     },
     "node_modules/acorn": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz",
-      "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -9365,7 +9608,6 @@
       "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
       "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "humanize-ms": "^1.2.1"
       },
@@ -9446,7 +9688,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
       "license": "Python-2.0"
     },
     "node_modules/aria-hidden": {
@@ -9471,6 +9712,12 @@
         "tslib": "^2.0.0"
       }
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
     "node_modules/atomic-sleep": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz",
@@ -9585,9 +9832,9 @@
       }
     },
     "node_modules/bignumber.js": {
-      "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
-      "integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==",
+      "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz",
+      "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==",
       "license": "MIT",
       "engines": {
         "node": "*"
@@ -9744,6 +9991,15 @@
         "ieee754": "^1.2.1"
       }
     },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/bufferutil": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.9.tgz",
@@ -9842,9 +10098,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001669",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-      "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
+      "version": "1.0.30001727",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
+      "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
       "dev": true,
       "funding": [
         {
@@ -9866,7 +10122,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -10412,6 +10667,18 @@
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "license": "MIT"
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -10428,6 +10695,15 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/console-table-printer": {
+      "version": "2.14.6",
+      "resolved": "https://registry.npmjs.org/console-table-printer/-/console-table-printer-2.14.6.tgz",
+      "integrity": "sha512-MCBl5HNVaFuuHW6FGbL/4fB7N/ormCy+tQ+sxTrF6QtSbSNETvPuOVbkJBhzDgYhvjWGrTma4eYJa37ZuoQsPw==",
+      "license": "MIT",
+      "dependencies": {
+        "simple-wcswidth": "^1.0.1"
+      }
+    },
     "node_modules/cookie-es": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/cookie-es/-/cookie-es-1.2.2.tgz",
@@ -10694,9 +10970,9 @@
       "license": "MIT"
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -10777,6 +11053,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/derive-valtio": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/derive-valtio/-/derive-valtio-0.1.0.tgz",
@@ -10833,9 +11118,9 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "version": "17.2.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
+      "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -10992,6 +11277,21 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/es-toolkit": {
       "version": "1.39.3",
       "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.39.3.tgz",
@@ -11797,6 +12097,62 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/form-data-encoder": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
+      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==",
+      "license": "MIT"
+    },
+    "node_modules/form-data/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/form-data/node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/formdata-node": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
+      "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==",
+      "license": "MIT",
+      "dependencies": {
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.3"
+      },
+      "engines": {
+        "node": ">= 12.20"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
@@ -11977,6 +12333,36 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/groq-sdk": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/groq-sdk/-/groq-sdk-0.19.0.tgz",
+      "integrity": "sha512-vdh5h7ORvwvOvutA80dKF81b0gPWHxu6K/GOJBOM0n6p6CSqAVLhFfeS79Ef0j/yCycDR09jqY7jkYz9dLiS6w==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/node": "^18.11.18",
+        "@types/node-fetch": "^2.6.4",
+        "abort-controller": "^3.0.0",
+        "agentkeepalive": "^4.2.1",
+        "form-data-encoder": "1.7.2",
+        "formdata-node": "^4.3.2",
+        "node-fetch": "^2.6.7"
+      }
+    },
+    "node_modules/groq-sdk/node_modules/@types/node": {
+      "version": "18.19.121",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.121.tgz",
+      "integrity": "sha512-bHOrbyztmyYIi4f1R0s17QsPs1uyyYnGcXeZoGEd227oZjry0q6XQBQxd82X1I57zEfwO8h9Xo+Kl5gX1d9MwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/groq-sdk/node_modules/undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "license": "MIT"
+    },
     "node_modules/h3": {
       "version": "1.15.3",
       "resolved": "https://registry.npmjs.org/h3/-/h3-1.15.3.tgz",
@@ -11998,7 +12384,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -12099,7 +12484,6 @@
       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ms": "^2.0.0"
       }
@@ -12567,6 +12951,15 @@
       "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==",
       "license": "MIT"
     },
+    "node_modules/js-tiktoken": {
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/js-tiktoken/-/js-tiktoken-1.0.20.tgz",
+      "integrity": "sha512-Xlaqhhs8VfCd6Sh7a1cFkZHQbYTLCwVJJWiHVxBYzLPxW0XsoxBy1hitmjkdIjD3Aon5BXLHFwU5O8WUx6HH+A==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.5.1"
+      }
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -12577,7 +12970,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -12642,6 +13034,15 @@
       "license": "ISC",
       "peer": true
     },
+    "node_modules/jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/keccak": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz",
@@ -12673,6 +13074,155 @@
       "integrity": "sha512-8t6Q3TclQ4uZynJY9IGr2+SsIGwK9JHcO6ootkHCGA0CrQCRy+VkouYNO2xicET6b9al7QKzpebNow+gkpCL8g==",
       "license": "MIT"
     },
+    "node_modules/langchain": {
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/langchain/-/langchain-0.3.30.tgz",
+      "integrity": "sha512-UyVsfwHDpHbrnWrjWuhJHqi8Non+Zcsf2kdpDTqyJF8NXrHBOpjdHT5LvPuW9fnE7miDTWf5mLcrWAGZgcrznQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@langchain/openai": ">=0.1.0 <0.7.0",
+        "@langchain/textsplitters": ">=0.0.0 <0.2.0",
+        "js-tiktoken": "^1.0.12",
+        "js-yaml": "^4.1.0",
+        "jsonpointer": "^5.0.1",
+        "langsmith": "^0.3.33",
+        "openapi-types": "^12.1.3",
+        "p-retry": "4",
+        "uuid": "^10.0.0",
+        "yaml": "^2.2.1",
+        "zod": "^3.25.32"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@langchain/anthropic": "*",
+        "@langchain/aws": "*",
+        "@langchain/cerebras": "*",
+        "@langchain/cohere": "*",
+        "@langchain/core": ">=0.3.58 <0.4.0",
+        "@langchain/deepseek": "*",
+        "@langchain/google-genai": "*",
+        "@langchain/google-vertexai": "*",
+        "@langchain/google-vertexai-web": "*",
+        "@langchain/groq": "*",
+        "@langchain/mistralai": "*",
+        "@langchain/ollama": "*",
+        "@langchain/xai": "*",
+        "axios": "*",
+        "cheerio": "*",
+        "handlebars": "^4.7.8",
+        "peggy": "^3.0.2",
+        "typeorm": "*"
+      },
+      "peerDependenciesMeta": {
+        "@langchain/anthropic": {
+          "optional": true
+        },
+        "@langchain/aws": {
+          "optional": true
+        },
+        "@langchain/cerebras": {
+          "optional": true
+        },
+        "@langchain/cohere": {
+          "optional": true
+        },
+        "@langchain/deepseek": {
+          "optional": true
+        },
+        "@langchain/google-genai": {
+          "optional": true
+        },
+        "@langchain/google-vertexai": {
+          "optional": true
+        },
+        "@langchain/google-vertexai-web": {
+          "optional": true
+        },
+        "@langchain/groq": {
+          "optional": true
+        },
+        "@langchain/mistralai": {
+          "optional": true
+        },
+        "@langchain/ollama": {
+          "optional": true
+        },
+        "@langchain/xai": {
+          "optional": true
+        },
+        "axios": {
+          "optional": true
+        },
+        "cheerio": {
+          "optional": true
+        },
+        "handlebars": {
+          "optional": true
+        },
+        "peggy": {
+          "optional": true
+        },
+        "typeorm": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/langchain/node_modules/@types/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
+      "license": "MIT"
+    },
+    "node_modules/langchain/node_modules/langsmith": {
+      "version": "0.3.53",
+      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.3.53.tgz",
+      "integrity": "sha512-cnEcJEiYjbcFQy7vTCQb7sR4w70UtBCu9loCOON+yYcK6T1lVmx27lQ4AF2KY7xzKY+FhbxWms5PV3SocizzaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/uuid": "^10.0.0",
+        "chalk": "^4.1.2",
+        "console-table-printer": "^2.12.1",
+        "p-queue": "^6.6.2",
+        "p-retry": "4",
+        "semver": "^7.6.3",
+        "uuid": "^10.0.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "*",
+        "@opentelemetry/exporter-trace-otlp-proto": "*",
+        "@opentelemetry/sdk-trace-base": "*",
+        "openai": "*"
+      },
+      "peerDependenciesMeta": {
+        "@opentelemetry/api": {
+          "optional": true
+        },
+        "@opentelemetry/exporter-trace-otlp-proto": {
+          "optional": true
+        },
+        "@opentelemetry/sdk-trace-base": {
+          "optional": true
+        },
+        "openai": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/langchain/node_modules/uuid": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -13420,6 +13970,15 @@
       "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==",
       "license": "(Apache-2.0 AND MIT)"
     },
+    "node_modules/mustache": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "license": "MIT",
+      "bin": {
+        "mustache": "bin/mustache"
+      }
+    },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -13432,9 +13991,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
@@ -13478,6 +14037,26 @@
       "integrity": "sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==",
       "license": "MIT"
     },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+      "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -13620,6 +14199,12 @@
         "wrappy": "1"
       }
     },
+    "node_modules/openapi-types": {
+      "version": "12.1.3",
+      "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
+      "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
+      "license": "MIT"
+    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -13734,6 +14319,15 @@
       "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
       "license": "MIT"
     },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/p-limit": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -13766,6 +14360,47 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-queue": {
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz",
+      "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^4.0.4",
+        "p-timeout": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "license": "MIT",
+      "dependencies": {
+        "p-finally": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -14627,6 +15262,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -14926,6 +15570,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/simple-wcswidth": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/simple-wcswidth/-/simple-wcswidth-1.1.2.tgz",
+      "integrity": "sha512-j7piyCjAeTDSjzTSQ7DokZtMNwNlEAyxqSZeCS+CXH7fJ4jx3FuJ/mTW3mE+6JLs4VJBbcll0Kjn+KXI5t21Iw==",
+      "license": "MIT"
+    },
     "node_modules/sonic-boom": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.8.0.tgz",
@@ -14954,6 +15604,31 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/split-on-first": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
@@ -15215,7 +15890,6 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -15298,6 +15972,36 @@
         "tailwindcss": ">=3.0.0 || insiders"
       }
     },
+    "node_modules/terser": {
+      "version": "5.43.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+      "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.14.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/text-encoding-utf-8": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
@@ -15412,9 +16116,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
     "node_modules/tweetnacl": {
@@ -16043,6 +16747,15 @@
         }
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "4.0.0-beta.3",
+      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
+      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/web3-core": {
       "version": "1.10.4",
       "resolved": "https://registry.npmjs.org/web3-core/-/web3-core-1.10.4.tgz",
@@ -16633,14 +17346,23 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.25.74",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.74.tgz",
-      "integrity": "sha512-J8poo92VuhKjNknViHRAIuuN6li/EwFbAC8OedzI8uxpEPGiXHGQu9wemIAioIpqgfB4SySaJhdk0mH5Y4ICBg==",
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
+    "node_modules/zod-to-json-schema": {
+      "version": "3.24.6",
+      "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.24.6.tgz",
+      "integrity": "sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==",
+      "license": "ISC",
+      "peerDependencies": {
+        "zod": "^3.24.1"
+      }
+    },
     "node_modules/zustand": {
       "version": "5.0.6",
       "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.6.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 4df0ea6..e6c9c40 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,6 +11,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@langchain/core": "^0.3.67",
+    "@langchain/groq": "^0.2.3",
+    "@langchain/openai": "^0.6.4",
     "@privy-io/react-auth": "^1.99.1",
     "@privy-io/wagmi-connector": "^0.1.13",
     "@radix-ui/react-accordion": "^1.2.0",
@@ -44,9 +47,11 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
     "date-fns": "^3.6.0",
+    "dotenv": "^17.2.1",
     "embla-carousel-react": "^8.3.0",
     "ethers": "^6.15.0",
     "input-otp": "^1.2.4",
+    "langchain": "^0.3.30",
     "lucide-react": "^0.462.0",
     "next-themes": "^0.3.0",
     "react": "^18.3.1",
diff --git a/frontend/public/New_CBT_Standalone.png b/frontend/public/New_CBT_Standalone.png
new file mode 100644
index 0000000..317c57f
Binary files /dev/null and b/frontend/public/New_CBT_Standalone.png differ
diff --git a/frontend/public/UCLIE_logo_black.png b/frontend/public/UCLIE_logo_black.png
new file mode 100644
index 0000000..ed12153
Binary files /dev/null and b/frontend/public/UCLIE_logo_black.png differ
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index d7d6d33..a21aa4e 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -9,9 +9,10 @@ import React from "react";
 import Index from "./pages/Index";
 import Dashboard from "./pages/Dashboard";
 import Insurance from "./pages/Insurance";
-import Advanced from "./pages/Advanced";
 import Admin from "./pages/Admin";
+import WidgetDemo from "./pages/WidgetDemo";
 import NotFound from "./pages/NotFound";
+import { Navigate } from "react-router-dom";
 
 const AppProviders: React.FC<{ children: React.ReactNode }> = React.memo(({ children }) => (
   <TooltipProvider>
@@ -30,8 +31,9 @@ const App: React.FC = () => {
           <Route path="/" element={<Index />} />
           <Route path="/dashboard" element={<Dashboard />} />
           <Route path="/insurance" element={<Insurance />} />
-          <Route path="/advanced" element={<Advanced />} />
+          <Route path="/advanced" element={<Navigate to="/dashboard" replace />} />
           <Route path="/admin" element={<Admin />} />
+          <Route path="/widget-demo" element={<WidgetDemo />} />
           <Route path="*" element={<NotFound />} />
         </Routes>
       </BrowserRouter>
diff --git a/frontend/src/components/ActionCard.tsx b/frontend/src/components/ActionCard.tsx
deleted file mode 100644
index 5c2cf58..0000000
--- a/frontend/src/components/ActionCard.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-
-import React, { useState } from 'react';
-import { Card, CardContent, CardFooter } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Slider } from '@/components/ui/slider';
-
-interface ActionCardProps {
-  title: string;
-  description: string;
-  buttonText: string;
-  isWithdraw?: boolean;
-  isPercentage?: boolean;
-  maxValue: number;
-  onAction: ((amount: number) => void) | (() => void);
-  disabled?: boolean;
-}
-
-const ActionCard: React.FC<ActionCardProps> = ({
-  title,
-  description,
-  buttonText,
-  isWithdraw = false,
-  isPercentage = false,
-  maxValue,
-  onAction,
-  disabled = false,
-}) => {
-  const [amount, setAmount] = useState<number>(0);
-  const [percentage, setPercentage] = useState<number>(0);
-
-  const handleSliderChange = (value: number[]) => {
-    const newValue = value[0];
-    setPercentage(newValue);
-
-    if (isPercentage) {
-      setAmount(newValue);
-    } else {
-      setAmount((maxValue * newValue) / 100);
-    }
-  };
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const value = parseFloat(e.target.value) || 0;
-
-    if (isPercentage) {
-      setAmount(Math.min(value, 100));
-      setPercentage(Math.min(value, 100));
-    } else {
-      setAmount(Math.min(value, maxValue));
-      setPercentage((value / maxValue) * 100);
-    }
-  };
-
-  const handleMax = () => {
-    setAmount(isPercentage ? 100 : maxValue);
-    setPercentage(100);
-  };
-
-  const handleHalf = () => {
-    setAmount(isPercentage ? 50 : maxValue / 2);
-    setPercentage(50);
-  };
-
-  const handleAction = () => {
-    // Try to call as a function with amount parameter first
-    try {
-      (onAction as (amount: number) => void)(amount);
-    } catch {
-      // If that fails, try calling as a function with no parameters
-      (onAction as () => void)();
-    }
-    setAmount(0);
-    setPercentage(0);
-  };
-
-  return (
-    <Card className="w-full shadow-sm hover:shadow-md transition-shadow bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-      <CardContent className="space-y-4 pt-6">
-        <div className="flex items-center space-x-2">
-          <Input
-            type="number"
-            value={amount || ''}
-            onChange={handleInputChange}
-            placeholder={isPercentage ? "Percentage" : "Amount"}
-            className="flex-1 bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-            min={0}
-            max={isPercentage ? 100 : maxValue}
-            step={isPercentage ? 1 : 0.01}
-          />
-          <span className="text-sm font-medium text-slate-300">
-            {isPercentage ? '%' : '$'}
-          </span>
-        </div>
-
-        <div className="space-y-2">
-          <div className="flex justify-between">
-            <span className="text-sm text-slate-400">0%</span>
-            <span className="text-sm text-slate-400">50%</span>
-            <span className="text-sm text-slate-400">100%</span>
-          </div>
-          <Slider
-            value={[percentage]}
-            max={100}
-            step={1}
-            onValueChange={handleSliderChange}
-            className="my-4"
-          />
-        </div>
-
-        <div className="flex space-x-2 pt-2">
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={handleHalf}
-            className="flex-1 bg-slate-700 hover:bg-slate-600 text-white border-slate-600 hover:border-slate-500"
-          >
-            50%
-          </Button>
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={handleMax}
-            className="flex-1 bg-slate-700 hover:bg-slate-600 text-white border-slate-600 hover:border-slate-500"
-          >
-            Max
-          </Button>
-        </div>
-      </CardContent>
-      <CardFooter>
-        <Button
-          onClick={handleAction}
-          disabled={disabled || amount <= 0}
-          className={`w-full ${
-            isWithdraw
-              ? 'bg-red-600 hover:bg-red-700'
-              : 'bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700'
-          }`}
-        >
-          {buttonText}
-        </Button>
-      </CardFooter>
-    </Card>
-  );
-};
-
-export default ActionCard;
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index 7b04d78..cfe8e98 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -11,7 +11,7 @@ const Navbar: React.FC = () => {
 
   // Helper function to determine if a route is active
   const isActive = (path: string) => location.pathname === path;
-  
+
   // Format address for display
   const formatAddress = (addr: string) => {
     return `${addr.slice(0, 6)}...${addr.slice(-4)}`;
@@ -33,17 +33,10 @@ const Navbar: React.FC = () => {
             <Button
               variant="ghost"
               asChild
-              className={isActive("/dashboard") ? "bg-slate-700 text-white hover:bg-slate-600" : "text-slate-300 hover:text-white hover:bg-slate-800"}
+              className={isActive("/dashboard") || isActive("/advanced") ? "bg-blue-600 hover:bg-blue-700 text-white" : "text-slate-300 hover:text-white hover:bg-slate-800"}
             >
               <Link to="/dashboard">Dashboard</Link>
             </Button>
-            <Button
-              variant="ghost"
-              asChild
-              className={isActive("/advanced") ? "bg-purple-600 hover:bg-purple-700 text-white" : "text-slate-300 hover:text-white hover:bg-slate-800"}
-            >
-              <Link to="/advanced">Advanced</Link>
-            </Button>
             <Button
               variant="ghost"
               asChild
diff --git a/frontend/src/components/PhaseDisplay.tsx b/frontend/src/components/PhaseDisplay.tsx
deleted file mode 100644
index 6abbf4b..0000000
--- a/frontend/src/components/PhaseDisplay.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useWeb3 } from '@/context/PrivyWeb3Context';
-import { PHASE_NAMES, Phase } from '@/config/contracts';
-import { Card } from '@/components/ui/card';
-import { Progress } from '@/components/ui/progress';
-import { Badge } from '@/components/ui/badge';
-import { AlertCircle, Clock, Shield, FileText } from 'lucide-react';
-
-const PhaseDisplay: React.FC = () => {
-  const { vaultInfo } = useWeb3();
-  const [timeRemaining, setTimeRemaining] = useState<string>('');
-  const [progress, setProgress] = useState(0);
-
-  useEffect(() => {
-    const updateTimer = () => {
-      const remaining = Number(vaultInfo.timeRemaining);
-      if (remaining <= 0) {
-        setTimeRemaining('Phase ending...');
-        setProgress(100);
-        return;
-      }
-
-      const days = Math.floor(remaining / 86400);
-      const hours = Math.floor((remaining % 86400) / 3600);
-      const minutes = Math.floor((remaining % 3600) / 60);
-      const seconds = remaining % 60;
-
-      let timeStr = '';
-      if (days > 0) timeStr += `${days}d `;
-      if (hours > 0) timeStr += `${hours}h `;
-      if (minutes > 0) timeStr += `${minutes}m `;
-      timeStr += `${seconds}s`;
-
-      setTimeRemaining(timeStr);
-
-      // Calculate progress based on phase duration
-      const phaseDurations: { [key: number]: number } = {
-        [Phase.DEPOSIT]: 2 * 24 * 60 * 60,
-        [Phase.COVERAGE]: 3 * 24 * 60 * 60,
-        [Phase.CLAIMS]: 1 * 24 * 60 * 60,
-        [Phase.FINAL_CLAIMS]: 1 * 24 * 60 * 60,
-      };
-
-      const duration = phaseDurations[vaultInfo.currentPhase] || 1;
-      const elapsed = duration - remaining;
-      setProgress((elapsed / duration) * 100);
-    };
-
-    updateTimer();
-    const interval = setInterval(updateTimer, 1000);
-    return () => clearInterval(interval);
-  }, [vaultInfo.timeRemaining, vaultInfo.currentPhase]);
-
-  const getPhaseIcon = () => {
-    switch (vaultInfo.currentPhase) {
-      case Phase.DEPOSIT:
-        return <FileText className="h-5 w-5" />;
-      case Phase.COVERAGE:
-        return <Shield className="h-5 w-5" />;
-      case Phase.CLAIMS:
-      case Phase.FINAL_CLAIMS:
-        return <AlertCircle className="h-5 w-5" />;
-      default:
-        return <Clock className="h-5 w-5" />;
-    }
-  };
-
-  const getPhaseColor = () => {
-    switch (vaultInfo.currentPhase) {
-      case Phase.DEPOSIT:
-        return 'bg-green-500';
-      case Phase.COVERAGE:
-        return 'bg-blue-500';
-      case Phase.CLAIMS:
-        return 'bg-orange-500';
-      case Phase.FINAL_CLAIMS:
-        return 'bg-red-500';
-      default:
-        return 'bg-gray-500';
-    }
-  };
-
-  const getPhaseDescription = () => {
-    switch (vaultInfo.currentPhase) {
-      case Phase.DEPOSIT:
-        return 'Users can deposit aUSDC or cUSDT to receive CM-SENIOR and CM-JUNIOR tokens';
-      case Phase.COVERAGE:
-        return 'Coverage is active. Tokens are locked and earning yield';
-      case Phase.CLAIMS:
-        return 'Senior token holders can withdraw their funds';
-      case Phase.FINAL_CLAIMS:
-        return 'All token holders can withdraw remaining funds';
-      default:
-        return '';
-    }
-  };
-
-  return (
-    <Card className="p-6 bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-      <div className="space-y-4">
-        <div className="flex items-center justify-between">
-          <div className="flex items-center space-x-3">
-            <div className={`p-2 rounded-lg ${getPhaseColor()} text-white`}>
-              {getPhaseIcon()}
-            </div>
-            <div>
-              <h3 className="text-lg font-semibold text-white">
-                {PHASE_NAMES[vaultInfo.currentPhase as Phase]}
-              </h3>
-              <p className="text-sm text-slate-400">Current Protocol Phase</p>
-            </div>
-          </div>
-          {vaultInfo.emergencyMode && (
-            <Badge variant="destructive" className="animate-pulse bg-red-600 hover:bg-red-700">
-              Emergency Mode Active
-            </Badge>
-          )}
-        </div>
-
-        <div className="space-y-2">
-          <div className="flex justify-between text-sm">
-            <span className="text-slate-400">Time Remaining</span>
-            <span className="font-medium text-white">{timeRemaining}</span>
-          </div>
-          <Progress value={progress} className="h-2" />
-        </div>
-
-        <p className="text-sm text-slate-300">{getPhaseDescription()}</p>
-
-        <div className="grid grid-cols-2 gap-4 pt-4 border-t border-slate-700">
-          <div className="text-center">
-            <p className="text-sm text-slate-400">Vault TVL</p>
-            <p className="text-lg font-semibold text-white">
-              ${((Number(vaultInfo.aUSDCBalance) + Number(vaultInfo.cUSDTBalance)) / 1e18).toFixed(2)}
-            </p>
-          </div>
-          <div className="text-center">
-            <p className="text-sm text-slate-400">Total Tokens Issued</p>
-            <p className="text-lg font-semibold text-white">
-              {(Number(vaultInfo.totalTokensIssued) / 1e18).toFixed(2)}
-            </p>
-          </div>
-        </div>
-      </div>
-    </Card>
-  );
-};
-
-export default PhaseDisplay;
\ No newline at end of file
diff --git a/frontend/src/components/PredictionMarketWidget.tsx b/frontend/src/components/PredictionMarketWidget.tsx
new file mode 100644
index 0000000..0209969
--- /dev/null
+++ b/frontend/src/components/PredictionMarketWidget.tsx
@@ -0,0 +1,1126 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { ChatGroq } from '@langchain/groq';
+import { HumanMessage, SystemMessage } from '@langchain/core/messages';
+import {
+  Shield,
+  TrendingUp,
+  DollarSign,
+  RefreshCw,
+  AlertCircle,
+  Clock,
+  Target,
+  Brain,
+  Sparkles,
+  Loader2,
+  ChevronRight,
+  AlertTriangle,
+  Wallet,
+  Eye
+} from 'lucide-react';
+import { useWeb3 } from '@/context/PrivyWeb3Context';
+import { Phase, ContractName, getContractAddress, getPhaseNameFromBigInt } from '@/config/contracts';
+import { ethers } from 'ethers';
+
+interface PredictionMarketWidgetProps {
+  protocolName: string;
+  protocolLogo: string;
+  timeframe: string;
+  minBet: string;
+  maxPayout: string;
+  supportedAssets: ('aUSDC' | 'cUSDT')[];
+  onOddsUpdate?: (odds: { hack: number; safe: number }, seniorPrice: string, juniorPrice: string) => void;
+  aiRecommendation?: { betType: 'hack' | 'safe'; confidence: number } | null;
+}
+
+
+const PredictionMarketWidget: React.FC<PredictionMarketWidgetProps> = ({
+  protocolName,
+  protocolLogo,
+  timeframe,
+  minBet,
+  maxPayout,
+  supportedAssets,
+  onOddsUpdate,
+  aiRecommendation
+}) => {
+  const {
+    isConnected,
+    connectWallet,
+    seniorTokenAddress,
+    juniorTokenAddress,
+    depositAsset,
+    swapExactTokensForTokens,
+    getAmountsOut,
+    getTokenBalance,
+    refreshData,
+    balances,
+    vaultInfo,
+    getPairReserves,
+    currentChain
+  } = useWeb3();
+
+  const [selectedBet, setSelectedBet] = useState<'hack' | 'safe' | null>(null);
+  const [betAmount, setBetAmount] = useState('');
+  const [assetType, setAssetType] = useState<'aUSDC' | 'cUSDT'>(supportedAssets[0]);
+  const [isProcessing, setIsProcessing] = useState(false);
+  const [currentOdds, setCurrentOdds] = useState({ hack: 1.02, safe: 1.25 });
+  const [pricesLoading, setPricesLoading] = useState(false);
+  const [seniorPrice, setSeniorPrice] = useState('1.00');
+  const [juniorPrice, setJuniorPrice] = useState('1.00');
+  const lastOddsUpdate = useRef({ hack: 0, safe: 0, senior: '', junior: '' });
+
+  // AI Analysis states
+  const [showAIAnalysis, setShowAIAnalysis] = useState(false);
+  const [isAnalyzing, setIsAnalyzing] = useState(false);
+  const [aiAnalysis, setAiAnalysis] = useState<{
+    recommendation: 'hack' | 'safe';
+    confidence: number;
+    reasoning: string[];
+    expectedValue: number;
+    riskLevel: 'low' | 'medium' | 'high';
+  } | null>(null);
+
+  // Wallet holdings state (simplified - used internally during AI analysis)
+  const [walletAnalysis, setWalletAnalysis] = useState<{
+    totalValue: number;
+    riskExposure: string;
+    recommendation: string;
+  } | null>(null);
+
+  // Fetch token prices and pool reserves from Uniswap pair
+  useEffect(() => {
+    const fetchTokenPrices = async () => {
+      if (!seniorTokenAddress || !juniorTokenAddress || !getAmountsOut || !currentChain) return;
+
+      setPricesLoading(true);
+      try {
+        // Get pool reserves to calculate proper AMM pricing
+        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
+        const reserves = await getPairReserves(pairAddress);
+        const seniorReserve = parseFloat(ethers.formatEther(reserves.reserve0));
+        const juniorReserve = parseFloat(ethers.formatEther(reserves.reserve1));
+
+        // Calculate prices directly from Uniswap AMM reserves
+        // In a Uniswap pair, price = other_reserve / this_reserve
+        const seniorPriceInJunior = juniorReserve / seniorReserve;
+        const juniorPriceInSenior = seniorReserve / juniorReserve;
+
+        // For USD pricing, we need to establish a base.
+        // Let's use getAmountsOut to get actual market prices
+        try {
+          // Get price of 1 SENIOR in terms of JUNIOR
+          const seniorToJuniorPath = [seniorTokenAddress, juniorTokenAddress];
+          const seniorPrice1Unit = await getAmountsOut('1', seniorToJuniorPath);
+
+          // Get price of 1 JUNIOR in terms of SENIOR
+          const juniorToSeniorPath = [juniorTokenAddress, seniorTokenAddress];
+          const juniorPrice1Unit = await getAmountsOut('1', juniorToSeniorPath);
+
+          setSeniorPrice(parseFloat(seniorPrice1Unit).toFixed(2));
+          setJuniorPrice(parseFloat(juniorPrice1Unit).toFixed(2));
+        } catch (error) {
+          console.error('Error getting AMM prices:', error);
+          // Fallback to reserve-based calculation
+          setSeniorPrice(seniorPriceInJunior.toFixed(2));
+          setJuniorPrice(juniorPriceInSenior.toFixed(2));
+        }
+      } catch (error) {
+        console.error('Error fetching token prices:', error);
+        // Keep default prices on error (equal weighting)
+        setSeniorPrice('1.00');
+        setJuniorPrice('1.00');
+      } finally {
+        setPricesLoading(false);
+      }
+    };
+
+    fetchTokenPrices();
+
+    // Refresh prices every 30 seconds
+    const interval = setInterval(fetchTokenPrices, 30000);
+    return () => clearInterval(interval);
+  }, [seniorTokenAddress, juniorTokenAddress, getAmountsOut, getPairReserves, currentChain]);
+
+  // Update odds based on current market prices from the liquidity pool
+  useEffect(() => {
+    const seniorPriceNum = parseFloat(seniorPrice);
+    const juniorPriceNum = parseFloat(juniorPrice);
+
+    if (seniorPriceNum > 0 && juniorPriceNum > 0) {
+      // In a prediction market, odds should reflect fair payout
+      // If senior token costs $1.08, hack bet should pay 1/1.08 = 0.926x (less than 1x = losing bet)
+      // If junior token costs $0.92, safe bet should pay 1/0.92 = 1.087x (more than 1x = winning bet)
+
+      // The odds are simply the reciprocal of the token price
+      const hackOdds = 1.0 / seniorPriceNum; // What you get back per $1 bet on hack
+      const safeOdds = 1.0 / juniorPriceNum; // What you get back per $1 bet on safe
+
+      const newOdds = {
+        hack: hackOdds, // Allow odds below 1.0 (losing bets)
+        safe: safeOdds  // Allow odds below 1.0 (losing bets)
+      };
+      setCurrentOdds(newOdds);
+
+      // Notify parent component - only if values actually changed
+      if (onOddsUpdate && (
+        lastOddsUpdate.current.hack !== hackOdds ||
+        lastOddsUpdate.current.safe !== safeOdds ||
+        lastOddsUpdate.current.senior !== seniorPrice ||
+        lastOddsUpdate.current.junior !== juniorPrice
+      )) {
+        onOddsUpdate(newOdds, seniorPrice, juniorPrice);
+        lastOddsUpdate.current = { hack: hackOdds, safe: safeOdds, senior: seniorPrice, junior: juniorPrice };
+      }
+    } else {
+      // Fallback to default odds if prices aren't loaded
+      const defaultOdds = {
+        hack: 1.02,
+        safe: 1.25
+      };
+      setCurrentOdds(defaultOdds);
+
+      // Only call if values changed
+      if (onOddsUpdate && (
+        lastOddsUpdate.current.hack !== defaultOdds.hack ||
+        lastOddsUpdate.current.safe !== defaultOdds.safe ||
+        lastOddsUpdate.current.senior !== seniorPrice ||
+        lastOddsUpdate.current.junior !== juniorPrice
+      )) {
+        onOddsUpdate(defaultOdds, seniorPrice, juniorPrice);
+        lastOddsUpdate.current = { hack: defaultOdds.hack, safe: defaultOdds.safe, senior: seniorPrice, junior: juniorPrice };
+      }
+    }
+  }, [seniorPrice, juniorPrice]); // Remove onOddsUpdate from dependencies to prevent infinite loop
+
+  const handleBetSelection = (bet: 'hack' | 'safe') => {
+    setSelectedBet(bet);
+  };
+
+  // Apply AI recommendation if provided
+  useEffect(() => {
+    if (aiRecommendation) {
+      setSelectedBet(aiRecommendation.betType);
+    }
+  }, [aiRecommendation]);
+
+  // Initialize Groq AI model
+  const initializeAI = () => {
+    const groqApiKey = import.meta.env.VITE_GROQ_API_KEY || '';
+    if (!groqApiKey) {
+      console.warn('GROQ API key not found. Add VITE_GROQ_API_KEY to your .env file');
+      return null;
+    }
+
+    return new ChatGroq({
+      apiKey: groqApiKey,
+      model: 'llama-3.3-70b-versatile',
+      temperature: 0.3,
+      maxTokens: 1000
+    });
+  };
+
+  // Analyze betting opportunity with AI (enhanced with wallet context)
+  const analyzeWithAI = async () => {
+    setIsAnalyzing(true);
+
+    try {
+      const model = initializeAI();
+      if (!model) {
+        // Fallback to mathematical analysis
+        const fallbackAnalysis = generateMathAnalysis();
+        setAiAnalysis(fallbackAnalysis);
+        setShowAIAnalysis(true);
+        return;
+      }
+
+      // Get comprehensive wallet analysis first
+      const walletAnalysisResult = await analyzeWalletHoldings();
+
+      // Calculate market implied probabilities
+      const totalValue = parseFloat(seniorPrice) + parseFloat(juniorPrice);
+      const hackProbability = (parseFloat(seniorPrice) / totalValue) * 100;
+      const safeProbability = (parseFloat(juniorPrice) / totalValue) * 100;
+
+      const systemPrompt = new SystemMessage(`You are an expert DeFi risk analyst specializing in CoverMax prediction markets.
+
+CRITICAL UNDERSTANDING OF COVERMAX MECHANICS:
+- SENIOR TOKENS = Already protected/insured positions (safe from hacks)
+- JUNIOR TOKENS = Higher yield but at-risk positions (lose value if hack occurs)
+
+BETTING LOGIC:
+- HACK bet = Buying more senior tokens = Seeking more protection
+- SAFE bet = Buying more junior tokens = Acting as underwriter for yield
+
+STRATEGIC RECOMMENDATIONS:
+- Users with MANY senior tokens are already well-protected → Consider SAFE bets to earn underwriting yield
+- Users with MANY junior tokens are already at-risk → Consider HACK bets for protection/rebalancing
+- Conservative portfolios (stablecoins) → HACK bets for protection
+- Risk-taking portfolios (meme coins) → SAFE bets to act as underwriters and earn yield
+- Consider position concentration - don't over-concentrate in one token type
+
+Respond in JSON format with these exact fields:
+{
+  "recommendation": "hack" or "safe",
+  "confidence": number between 0-100,
+  "reasoning": [array of 3-4 key reasons including wallet context],
+  "riskLevel": "low", "medium", or "high",
+  "expectedValue": number (positive means profitable)
+}`);
+
+      // Include comprehensive analysis
+      const seniorBalance = Number(balances.seniorTokens) / 1e18;
+      const juniorBalance = Number(balances.juniorTokens) / 1e18;
+      const hasPosition = seniorBalance > 0 || juniorBalance > 0;
+
+      const userPrompt = new HumanMessage(`Analyze this betting opportunity with full wallet context:
+
+MARKET DATA:
+- Protocol: ${protocolName}
+- HACK bet odds: ${currentOdds.hack.toFixed(3)}x (${hackProbability.toFixed(1)}% implied probability)
+- SAFE bet odds: ${currentOdds.safe.toFixed(3)}x (${safeProbability.toFixed(1)}% implied probability)
+
+CURRENT COVERMAX POSITION:
+${hasPosition ? `
+- Senior tokens: ${seniorBalance.toFixed(2)} (${seniorBalance > juniorBalance ? 'OVERWEIGHT - Already well-protected' : 'underweight'})
+- Junior tokens: ${juniorBalance.toFixed(2)} (${juniorBalance > seniorBalance ? 'OVERWEIGHT - High risk/yield position' : 'underweight'})
+
+POSITION IMPLICATIONS:
+- If overweight senior tokens → User already has protection → Consider SAFE bets for yield diversification
+- If overweight junior tokens → User has high risk exposure → Consider HACK bets for protection/rebalancing
+- Balanced position → Follow general risk profile recommendations
+` : '- No current position in this protocol - Fresh start for optimal positioning'}
+
+USER RISK PROFILE:
+${walletAnalysisResult ? `
+- Risk Level: ${walletAnalysisResult.riskProfile.level} (Score: ${walletAnalysisResult.riskProfile.score}/100)
+- Portfolio Analysis: ${walletAnalysisResult.riskProfile.analysis}
+- Meme Coin Allocation: ${walletAnalysisResult.riskProfile.memeAllocation}%
+- Primary Holdings: ${walletAnalysisResult.riskProfile.primaryHoldings}
+- DeFi Exposure: ${walletAnalysisResult.riskProfile.defiExposure}
+` : 'Risk profile not available'}
+
+STRATEGIC CONSIDERATIONS:
+1. POSITION BALANCING:
+   - Heavy senior token holders → Already protected → SAFE bets for yield diversification
+   - Heavy junior token holders → High risk exposure → HACK bets for protection
+
+2. RISK PROFILE ALIGNMENT:
+   - High-risk users (meme coin holders) → SAFE bets to act as underwriters and earn yield
+   - Conservative users (stablecoin heavy) → HACK bets for portfolio protection
+
+
+Recommend the optimal bet considering: expected value, risk profile, AND existing position balance.`);
+
+      const response = await model.invoke([systemPrompt, userPrompt]);
+
+      // Parse AI response
+      try {
+        const content = response.content.toString();
+        const jsonMatch = content.match(/\{[\s\S]*\}/);
+        if (jsonMatch) {
+          const parsed = JSON.parse(jsonMatch[0]);
+          setAiAnalysis(parsed);
+          setShowAIAnalysis(true);
+
+          // Auto-select the recommended bet
+          setSelectedBet(parsed.recommendation);
+        }
+      } catch (parseError) {
+        // Fallback analysis
+        const fallbackAnalysis = generateMathAnalysis();
+        setAiAnalysis(fallbackAnalysis);
+        setShowAIAnalysis(true);
+      }
+
+    } catch (error) {
+      console.error('AI analysis failed:', error);
+      const fallbackAnalysis = generateMathAnalysis();
+      setAiAnalysis(fallbackAnalysis);
+      setShowAIAnalysis(true);
+    } finally {
+      setIsAnalyzing(false);
+    }
+  };
+
+  // Analyze user's wallet holdings with comprehensive risk profiling
+  const analyzeWalletHoldings = async () => {
+    try {
+      // Get comprehensive wallet data (in production, this would query multiple chains)
+      const walletData = await getComprehensiveWalletData();
+
+      // Calculate current position values
+      const seniorTokenValue = Number(balances.seniorTokens) / 1e18 * parseFloat(seniorPrice);
+      const juniorTokenValue = Number(balances.juniorTokens) / 1e18 * parseFloat(juniorPrice);
+      const totalPositionValue = seniorTokenValue + juniorTokenValue;
+
+      // Calculate available liquidity
+      const aUSDCBalance = Number(balances.aUSDC) / 1e18;
+      const cUSDTBalance = Number(balances.cUSDT) / 1e18;
+      const totalLiquidity = aUSDCBalance + cUSDTBalance;
+
+      // Determine risk profile from wallet composition
+      const riskProfile = assessRiskProfile(walletData);
+
+      // AI-enhanced analysis with full wallet context
+      const model = initializeAI();
+      if (model) {
+        try {
+          const prompt = new HumanMessage(`Analyze this wallet for betting recommendations:
+
+CURRENT POSITION:
+- Senior tokens: ${(Number(balances.seniorTokens) / 1e18).toFixed(2)} ($${seniorTokenValue.toFixed(2)})
+- Junior tokens: ${(Number(balances.juniorTokens) / 1e18).toFixed(2)} ($${juniorTokenValue.toFixed(2)})
+- Available liquidity: $${totalLiquidity.toFixed(2)}
+
+WALLET RISK PROFILE:
+${riskProfile.analysis}
+
+PORTFOLIO CHARACTERISTICS:
+- Risk Level: ${riskProfile.level} (${riskProfile.score}/100)
+- Primary Holdings: ${riskProfile.primaryHoldings}
+- DeFi Exposure: ${riskProfile.defiExposure}
+- Meme Coin Allocation: ${riskProfile.memeAllocation}%
+
+BETTING CONTEXT:
+- Protocol: ${protocolName}
+- Current HACK odds: ${currentOdds.hack.toFixed(2)}x
+- Current SAFE odds: ${currentOdds.safe.toFixed(2)}x
+
+Based on this risk profile, should this user:
+1. Bet HACK (seek protection) - suitable for conservative users
+2. Bet SAFE (act as underwriter) - suitable for risk-takers who want yield
+3. Stay neutral - if position is already optimal
+
+Provide specific reasoning based on their wallet composition and risk tolerance.`);
+
+          const response = await model.invoke([prompt]);
+          const aiRecommendation = response.content.toString();
+
+          setWalletAnalysis({
+            totalValue: totalPositionValue + totalLiquidity + walletData.totalPortfolioValue,
+            riskExposure: riskProfile.level,
+            recommendation: aiRecommendation
+          });
+
+          return {
+            totalValue: totalPositionValue + totalLiquidity + walletData.totalPortfolioValue,
+            riskExposure: riskProfile.level,
+            recommendation: aiRecommendation,
+            riskProfile
+          };
+
+        } catch (error) {
+          console.error('AI wallet analysis failed:', error);
+        }
+      }
+
+      // Fallback analysis without AI
+      const basicRiskAssessment = getBasicRiskAssessment(riskProfile);
+      setWalletAnalysis({
+        totalValue: totalPositionValue + totalLiquidity,
+        riskExposure: riskProfile.level,
+        recommendation: basicRiskAssessment
+      });
+
+      return {
+        totalValue: totalPositionValue + totalLiquidity,
+        riskExposure: riskProfile.level,
+        recommendation: basicRiskAssessment,
+        riskProfile
+      };
+
+    } catch (error) {
+      console.error('Wallet analysis failed:', error);
+      return null;
+    }
+  };
+
+  // Get comprehensive wallet data (mock implementation - in production, query multiple chains)
+  const getComprehensiveWalletData = async () => {
+    // Mock wallet analysis - in production, this would use APIs like Moralis, Alchemy, etc.
+    const mockWalletData = {
+      totalPortfolioValue: 12000,
+      assets: [
+        { type: 'stablecoin', value: 3000, percentage: 25 },
+        { type: 'bluechip', value: 6000, percentage: 50 }, // ETH, BTC
+        { type: 'defi', value: 2000, percentage: 16.7 }, // UNI, AAVE, etc.
+        { type: 'meme', value: 1000, percentage: 8.3 }, // DOGE, SHIB, PEPE
+      ],
+      defiProtocols: ['Aave', 'Uniswap', 'Compound'],
+      nftCount: 5,
+      transactionHistory: 150,
+      avgTransactionSize: 500
+    };
+
+    return mockWalletData;
+  };
+
+  // Assess risk profile from wallet composition
+  const assessRiskProfile = (walletData: any) => {
+    const memeAllocation = walletData.assets.find((a: any) => a.type === 'meme')?.percentage || 0;
+    const stableCoinAllocation = walletData.assets.find((a: any) => a.type === 'stablecoin')?.percentage || 0;
+    const defiAllocation = walletData.assets.find((a: any) => a.type === 'defi')?.percentage || 0;
+
+    let riskScore = 0;
+    let level = 'Conservative';
+    let analysis = '';
+
+    // Calculate risk score (0-100)
+    riskScore += memeAllocation * 2; // Meme coins = high risk
+    riskScore += defiAllocation * 1.5; // DeFi = medium-high risk
+    riskScore += Math.max(0, 50 - stableCoinAllocation); // Low stables = higher risk
+    riskScore += (walletData.avgTransactionSize > 1000) ? 20 : 0; // Large txns = risk taker
+    riskScore += (walletData.nftCount > 10) ? 15 : 0; // Many NFTs = speculative
+
+    // Determine risk level
+    if (riskScore >= 70) {
+      level = 'High Risk / Degen';
+      analysis = `Portfolio shows degen trader behavior with ${memeAllocation}% in meme coins. This user seeks high returns and likely comfortable with risk.`;
+    } else if (riskScore >= 40) {
+      level = 'Moderate Risk';
+      analysis = `Balanced portfolio with some speculative positions. Shows calculated risk-taking behavior.`;
+    } else {
+      level = 'Conservative';
+      analysis = `Conservative portfolio heavily weighted towards stablecoins (${stableCoinAllocation}%) and blue chips.`;
+    }
+
+    return {
+      score: Math.min(riskScore, 100),
+      level,
+      analysis,
+      memeAllocation,
+      primaryHoldings: walletData.assets.reduce((max: any, asset: any) =>
+        asset.percentage > max.percentage ? asset : max
+      ).type,
+      defiExposure: `${defiAllocation}% (${walletData.defiProtocols.length} protocols)`,
+    };
+  };
+
+  // Basic risk assessment without AI
+  const getBasicRiskAssessment = (riskProfile: any) => {
+    if (riskProfile.level === 'High Risk / Degen') {
+      return `High-risk profile detected. Consider SAFE bets to act as underwriter and earn yield from protocol fees. Your risk tolerance suggests you'd prefer earning returns rather than seeking protection.`;
+    } else if (riskProfile.level === 'Conservative') {
+      return `Conservative profile detected. Consider HACK bets for portfolio protection. Your stable portfolio suggests you value downside protection over speculative gains.`;
+    } else {
+      return `Moderate risk profile. Consider alternating between HACK and SAFE bets based on current market conditions and odds.`;
+    }
+  };
+
+  // Generate mathematical analysis as fallback
+  const generateMathAnalysis = () => {
+    const seniorPriceNum = parseFloat(seniorPrice);
+    const juniorPriceNum = parseFloat(juniorPrice);
+    const totalValue = seniorPriceNum + juniorPriceNum;
+    const hackProb = (seniorPriceNum / totalValue);
+    const safeProb = (juniorPriceNum / totalValue);
+
+    const hackEV = hackProb * currentOdds.hack - 1;
+    const safeEV = safeProb * currentOdds.safe - 1;
+
+    const recommendation = hackEV > safeEV ? 'hack' : 'safe';
+    const confidence = Math.min(95, Math.abs(hackEV - safeEV) * 100 + 50);
+
+    return {
+      recommendation: recommendation as 'hack' | 'safe',
+      confidence: Math.round(confidence),
+      reasoning: [
+        `${recommendation === 'hack' ? 'HACK' : 'SAFE'} bet has ${recommendation === 'hack' ? hackEV > 0 ? 'positive' : 'less negative' : safeEV > 0 ? 'positive' : 'less negative'} expected value`,
+        `Market implies ${(recommendation === 'hack' ? hackProb : safeProb) * 100}% probability for this outcome`,
+        `Potential return of ${recommendation === 'hack' ? currentOdds.hack.toFixed(2) : currentOdds.safe.toFixed(2)}x on investment`
+      ],
+      expectedValue: parseFloat((recommendation === 'hack' ? hackEV : safeEV).toFixed(3)),
+      riskLevel: Math.abs(recommendation === 'hack' ? hackEV : safeEV) > 0.1 ? 'low' : 'medium' as 'low' | 'medium' | 'high'
+    };
+  };
+
+  const calculatePayout = (amount: string, odds: number) => {
+    const numAmount = parseFloat(amount);
+    if (isNaN(numAmount) || numAmount <= 0) return '0.00';
+    return (numAmount * odds).toFixed(2);
+  };
+
+  // Calculate cost per share and number of shares with slippage consideration
+  const calculateShareInfo = (betAmount: string, betType: 'hack' | 'safe') => {
+    const amount = parseFloat(betAmount);
+    if (isNaN(amount) || amount <= 0) return {
+      costPerShare: '0.00',
+      numShares: '0.00',
+      totalPayout: '0.00',
+      slippageWarning: false,
+      effectiveCostPerShare: '0.00'
+    };
+
+    // Use real token prices from the liquidity pool
+    const seniorPriceNum = parseFloat(seniorPrice);
+    const juniorPriceNum = parseFloat(juniorPrice);
+
+    let baseCostPerShare: number;
+    if (betType === 'hack') {
+      baseCostPerShare = seniorPriceNum > 0 ? seniorPriceNum : 0.98;
+    } else {
+      baseCostPerShare = juniorPriceNum > 0 ? juniorPriceNum : 0.80;
+    }
+
+    // Estimate slippage impact (simplified model)
+    // Larger trades have more slippage
+    const slippagePercent = Math.min(0.05, (amount / 10000) * 0.02); // Max 5% slippage
+    const slippageMultiplier = 1 + slippagePercent;
+
+    // Effective cost includes slippage
+    const effectiveCostPerShare = baseCostPerShare * slippageMultiplier;
+
+    // Also account for the 5% slippage tolerance used in actual swaps
+    const swapSlippageTolerance = 0.05;
+    const finalEffectiveCost = effectiveCostPerShare * (1 + swapSlippageTolerance);
+
+    const numShares = amount / finalEffectiveCost;
+    const totalPayout = numShares * 1.0;
+
+    const hasSignificantSlippage = slippagePercent > 0.01; // 1% threshold
+
+    return {
+      costPerShare: baseCostPerShare.toFixed(3),
+      effectiveCostPerShare: finalEffectiveCost.toFixed(3),
+      numShares: numShares.toFixed(2),
+      totalPayout: totalPayout.toFixed(2),
+      slippageWarning: hasSignificantSlippage,
+      slippagePercent: (slippagePercent * 100).toFixed(1)
+    };
+  };
+
+  const getImpliedProbability = (betType: 'hack' | 'safe') => {
+    // Calculate actual probabilities from real-time token pool prices
+    const seniorPriceNum = parseFloat(seniorPrice);
+    const juniorPriceNum = parseFloat(juniorPrice);
+    const totalValue = seniorPriceNum + juniorPriceNum;
+
+    if (betType === 'hack') {
+      // Hack bet wins if senior tokens outperform (protocol gets hacked, senior gets paid first)
+      // Market probability = senior token weight in pool
+      const hackProbability = (seniorPriceNum / totalValue) * 100;
+      return Math.round(hackProbability).toString();
+    } else {
+      // Safe bet wins if junior tokens outperform (protocol stays safe, junior gets higher yields)
+      // Market probability = junior token weight in pool
+      const safeProbability = (juniorPriceNum / totalValue) * 100;
+      return Math.round(safeProbability).toString();
+    }
+  };
+
+  const calculateConversionAmount = (depositAmount: string, conversionType: 'toSenior' | 'toJunior') => {
+    if (!depositAmount || parseFloat(depositAmount) <= 0) return '0';
+
+    const amount = parseFloat(depositAmount);
+
+    // Use real-time pool prices
+    const seniorPriceNum = parseFloat(seniorPrice);
+    const juniorPriceNum = parseFloat(juniorPrice);
+
+    // When depositing, user gets 50/50 split initially
+    const halfAmount = amount / 2;
+
+    if (conversionType === 'toSenior') {
+      // For hack bet: Get senior tokens from half deposit, then swap junior->senior
+      const seniorFromDeposit = halfAmount / seniorPriceNum;
+      const juniorTokens = halfAmount / juniorPriceNum;
+      const seniorFromSwap = (juniorTokens * juniorPriceNum) / seniorPriceNum;
+      const totalSenior = seniorFromDeposit + seniorFromSwap;
+      return totalSenior.toFixed(2);
+    } else {
+      // For safe bet: Get junior tokens from half deposit, then swap senior->junior
+      const juniorFromDeposit = halfAmount / juniorPriceNum;
+      const seniorTokens = halfAmount / seniorPriceNum;
+      const juniorFromSwap = (seniorTokens * seniorPriceNum) / juniorPriceNum;
+      const totalJunior = juniorFromDeposit + juniorFromSwap;
+      return totalJunior.toFixed(2);
+    }
+  };
+
+  const handlePlaceBet = async () => {
+    if (!selectedBet || !betAmount || parseFloat(betAmount) <= 0 || !isConnected) return;
+
+    setIsProcessing(true);
+
+    try {
+      // First, deposit to get tokens (50/50 split)
+      await depositAsset(assetType, betAmount);
+
+      if (selectedBet === 'hack') {
+        // HACK bet = Protocol will get hacked = MAX SAFETY strategy
+        // Swap all junior tokens to senior tokens
+        const freshJuniorBalance = await getTokenBalance(juniorTokenAddress!);
+        const juniorBalance = Number(freshJuniorBalance) / 1e18;
+
+        if (juniorBalance > 0.001) {
+          const path = [juniorTokenAddress!, seniorTokenAddress!];
+          const balanceString = ethers.formatEther(freshJuniorBalance);
+
+          const estimate = await getAmountsOut(balanceString, path);
+          const minOutput = (parseFloat(estimate) * 0.95).toFixed(18); // 5% slippage tolerance
+          await swapExactTokensForTokens(balanceString, minOutput, path);
+        }
+      } else {
+        // SAFE bet = Protocol won't get hacked = MAX UPSIDE strategy
+        // Swap all senior tokens to junior tokens
+        const freshSeniorBalance = await getTokenBalance(seniorTokenAddress!);
+        const seniorBalance = Number(freshSeniorBalance) / 1e18;
+
+        if (seniorBalance > 0.001) {
+          const path = [seniorTokenAddress!, juniorTokenAddress!];
+          const balanceString = ethers.formatEther(freshSeniorBalance);
+
+          const estimate = await getAmountsOut(balanceString, path);
+          const minOutput = (parseFloat(estimate) * 0.95).toFixed(18); // 5% slippage tolerance
+          await swapExactTokensForTokens(balanceString, minOutput, path);
+        }
+      }
+
+      await refreshData(); // Refresh UI with new token balances
+      setBetAmount('');
+      setSelectedBet(null);
+
+    } catch (error) {
+      console.error('Bet failed:', error);
+      alert('Bet failed. Please try again.');
+    } finally {
+      setIsProcessing(false);
+    }
+  };
+
+  const getBetColorClass = (bet: 'hack' | 'safe') => {
+    if (bet === 'hack') {
+      return selectedBet === 'hack'
+        ? 'border-red-500 bg-red-500/20'
+        : 'border-slate-600 bg-slate-700/50 hover:border-red-400 hover:bg-red-500/10';
+    } else {
+      return selectedBet === 'safe'
+        ? 'border-green-500 bg-green-500/20'
+        : 'border-slate-600 bg-slate-700/50 hover:border-green-400 hover:bg-green-500/10';
+    }
+  };
+
+  // Format token amounts for display
+  const formatTokenAmount = (amount: bigint) => {
+    return parseFloat(ethers.formatEther(amount)).toFixed(4);
+  };
+
+  if (!isConnected) {
+    return (
+      <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm max-w-md mx-auto">
+        <CardHeader className="pb-4">
+          <CardTitle className="flex items-center gap-3 text-white">
+            <span className="text-2xl">{protocolLogo}</span>
+            <div>
+              <div className="text-lg">{protocolName} Prediction Market</div>
+              <div className="text-sm text-slate-400 font-normal">Connect wallet to start betting</div>
+            </div>
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          <Button
+            onClick={connectWallet}
+            className="w-full bg-blue-600 hover:bg-blue-700"
+          >
+            Connect Wallet
+          </Button>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  return (
+    <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm max-w-md mx-auto">
+      <CardHeader className="pb-4">
+        <CardTitle className="flex items-center gap-3 text-white">
+          <span className="text-2xl">{protocolLogo}</span>
+          <div>
+            <div className="text-lg">{protocolName} Prediction Market</div>
+            <div className="text-sm text-slate-400 font-normal">Real betting with risk tokens</div>
+          </div>
+        </CardTitle>
+      </CardHeader>
+
+      <CardContent className="space-y-4">
+        {/* Protocol Status */}
+        <div className="bg-green-500/10 border border-green-500/30 rounded-lg p-3 mb-4">
+          <div className="flex items-center gap-2">
+            <div className="w-2 h-2 bg-green-400 rounded-full animate-pulse"></div>
+            <span className={`text-sm font-medium ${
+              vaultInfo.emergencyMode ? 'text-red-400' : 'text-green-400'
+            }`}>
+              {vaultInfo.emergencyMode ? 'Emergency Mode Active' : 'Live Betting Available'}
+            </span>
+            <span className="text-slate-400 text-xs ml-auto">
+              Phase: {getPhaseNameFromBigInt(vaultInfo.currentPhase)}
+            </span>
+          </div>
+        </div>
+
+        {/* Question */}
+        <div className="text-center">
+          <h3 className="text-white font-semibold mb-2">
+            Will {protocolName} get exploited?
+          </h3>
+          <p className="text-slate-400 text-sm">
+            Real betting with risk tokens • Earn up to {currentOdds.safe.toFixed(2)}x returns
+          </p>
+        </div>
+
+        {/* AI Analysis Button or Results */}
+        {!showAIAnalysis ? (
+          <Button
+            onClick={analyzeWithAI}
+            disabled={isAnalyzing}
+            variant="outline"
+            className="w-full bg-purple-600/20 hover:bg-purple-600/30 border-purple-500/50 text-purple-300"
+          >
+            {isAnalyzing ? (
+              <>
+                <Loader2 className="h-4 w-4 mr-2 animate-spin" />
+                Analyzing Portfolio & Market...
+              </>
+            ) : (
+              <>
+                <Brain className="h-4 w-4 mr-2" />
+                Get AI Recommendation
+              </>
+            )}
+          </Button>
+        ) : aiAnalysis && (
+          <div className={`p-3 rounded-lg border ${
+            aiAnalysis.recommendation === 'hack'
+              ? 'bg-red-500/10 border-red-500/50'
+              : 'bg-green-500/10 border-green-500/50'
+          }`}>
+            <div className="flex items-center justify-between mb-2">
+              <div className="flex items-center gap-2">
+                <Sparkles className="h-4 w-4 text-purple-400" />
+                <span className="text-sm font-semibold text-white">
+                  AI Recommends: {aiAnalysis.recommendation === 'hack' ? 'HACK' : 'SAFE'}
+                </span>
+              </div>
+              <div className="flex items-center gap-2">
+                <span className="text-xs text-slate-400">Confidence:</span>
+                <span className="text-sm font-bold text-white">{aiAnalysis.confidence}%</span>
+              </div>
+            </div>
+
+            {/* Expected Value */}
+            <div className="bg-slate-900/50 rounded p-2 mb-2">
+              <div className="flex justify-between items-center text-xs">
+                <span className="text-slate-400">Expected Value:</span>
+                <span className={`font-mono font-bold ${
+                  aiAnalysis.expectedValue > 0 ? 'text-green-400' : 'text-red-400'
+                }`}>
+                  {aiAnalysis.expectedValue > 0 ? '+' : ''}{(aiAnalysis.expectedValue * 100).toFixed(1)}%
+                </span>
+              </div>
+            </div>
+
+            {/* Key Reasoning Points */}
+            <div className="space-y-1 mb-2">
+              {aiAnalysis.reasoning.slice(0, 3).map((reason, index) => (
+                <div key={index} className="flex items-start gap-1">
+                  <ChevronRight className="h-3 w-3 text-purple-400 mt-0.5 flex-shrink-0" />
+                  <span className="text-xs text-slate-300">{reason}</span>
+                </div>
+              ))}
+            </div>
+
+            {/* Portfolio Context Badge */}
+            {walletAnalysis && (
+              <div className="bg-slate-800/50 rounded p-2 mb-2">
+                <div className="flex items-center gap-2 mb-1">
+                  <Wallet className="h-3 w-3 text-purple-400" />
+                  <span className="text-xs font-semibold text-white">Portfolio Context</span>
+                </div>
+                <div className="text-xs text-slate-300">
+                  Risk Profile: <span className={`font-medium ${
+                    walletAnalysis.riskExposure.includes('High Risk') ? 'text-red-400' :
+                    walletAnalysis.riskExposure.includes('Conservative') ? 'text-blue-400' :
+                    'text-green-400'
+                  }`}>{walletAnalysis.riskExposure}</span>
+                </div>
+                <div className="text-xs text-slate-400 mt-1">
+                  Total Portfolio: ${walletAnalysis.totalValue.toFixed(0)}
+                </div>
+              </div>
+            )}
+
+            <Button
+              size="sm"
+              variant="ghost"
+              onClick={() => setShowAIAnalysis(false)}
+              className="w-full text-xs text-slate-400 hover:text-slate-300"
+            >
+              New Analysis
+            </Button>
+          </div>
+        )}
+
+        {/* Asset Selection */}
+        <div>
+          <Label className="text-slate-200 mb-2 block font-medium">Select Asset</Label>
+          <div className={`grid ${supportedAssets.length === 1 ? 'grid-cols-1' : 'grid-cols-2'} gap-2`}>
+            {supportedAssets.map((asset) => (
+              <button
+                key={asset}
+                onClick={() => setAssetType(asset)}
+                className={`p-3 rounded-lg border transition-all ${
+                  assetType === asset
+                    ? 'bg-blue-600/30 border-blue-500 text-blue-300'
+                    : 'bg-slate-700/60 border-slate-600 text-slate-200 hover:bg-slate-700/80 hover:text-white'
+                }`}
+              >
+                <div className="text-center">
+                  <div className="font-semibold text-sm">{asset}</div>
+                  <div className="text-xs opacity-90">
+                    {asset === 'aUSDC' ? 'Aave USDC' : 'Compound USDT'}
+                  </div>
+                  <div className="text-xs mt-1 font-medium">
+                    Balance: {formatTokenAmount(balances[asset])}
+                  </div>
+                </div>
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* Betting Options */}
+        <div className="grid grid-cols-2 gap-3">
+          {/* YES - Gets Hacked (Safety Strategy) */}
+          <button
+            onClick={() => handleBetSelection('hack')}
+            className={`p-4 rounded-lg border-2 transition-all relative ${getBetColorClass('hack')}`}
+          >
+            {aiAnalysis?.recommendation === 'hack' && showAIAnalysis && (
+              <div className="absolute -top-2 -right-2 bg-purple-500 rounded-full p-1">
+                <Sparkles className="h-3 w-3 text-white" />
+              </div>
+            )}
+            <div className="text-center">
+              <Shield className="w-6 h-6 text-red-400 mx-auto mb-2" />
+              <div className="text-white font-bold">YES</div>
+              <div className="text-xs text-slate-400 mb-1">Gets Hacked</div>
+              <div className="text-red-400 font-bold">{currentOdds.hack.toFixed(2)}x</div>
+              <div className="text-xs text-slate-500">
+                {getImpliedProbability('hack')}% chance
+              </div>
+            </div>
+          </button>
+
+          {/* NO - Stays Safe (Upside Strategy) */}
+          <button
+            onClick={() => handleBetSelection('safe')}
+            className={`p-4 rounded-lg border-2 transition-all relative ${getBetColorClass('safe')}`}
+          >
+            {aiAnalysis?.recommendation === 'safe' && showAIAnalysis && (
+              <div className="absolute -top-2 -right-2 bg-purple-500 rounded-full p-1">
+                <Sparkles className="h-3 w-3 text-white" />
+              </div>
+            )}
+            <div className="text-center">
+              <TrendingUp className="w-6 h-6 text-green-400 mx-auto mb-2" />
+              <div className="text-white font-bold">NO</div>
+              <div className="text-xs text-slate-400 mb-1">Stays Safe</div>
+              <div className="text-green-400 font-bold">{currentOdds.safe.toFixed(2)}x</div>
+              <div className="text-xs text-slate-500">
+                {getImpliedProbability('safe')}% chance
+              </div>
+            </div>
+          </button>
+        </div>
+
+        {/* Bet Amount Input */}
+        <div className="space-y-2">
+          <Label className="text-slate-200 mb-2 block font-medium">Bet Amount ({assetType})</Label>
+          <div className="relative">
+            <Input
+              type="number"
+              placeholder="0.00"
+              value={betAmount}
+              onChange={(e) => setBetAmount(e.target.value)}
+              min={minBet}
+              max={maxPayout}
+              className="bg-slate-700/50 border-slate-600 text-white pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+            />
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+              onClick={() => setBetAmount((parseFloat(ethers.formatEther(balances[assetType]))).toString())}
+            >
+              Max
+            </Button>
+          </div>
+          <div className="flex justify-between text-sm text-slate-300">
+            <span className="font-medium">Available: {formatTokenAmount(balances[assetType])}</span>
+            <span className="text-slate-500">Min: {minBet}</span>
+          </div>
+        </div>
+
+        {/* Enhanced Cost/Payout Breakdown */}
+        {selectedBet && betAmount && parseFloat(betAmount) > 0 && (
+          <div className="bg-slate-700/30 rounded-lg p-4 space-y-3">
+            <div className="text-sm font-semibold text-white flex items-center gap-2">
+              <DollarSign className="w-4 h-4" />
+              What You Pay, What You Get
+            </div>
+
+            {(() => {
+              const shareInfo = calculateShareInfo(betAmount, selectedBet);
+              return (
+                <div className="space-y-2">
+                  {/* Cost Breakdown */}
+                  <div className="bg-slate-600/30 rounded p-2 space-y-1">
+                    <div className="flex justify-between items-center text-sm">
+                      <span className="text-slate-300">Cost per share:</span>
+                      <span className="text-white font-mono">${shareInfo.costPerShare}</span>
+                    </div>
+                    <div className="flex justify-between items-center text-sm">
+                      <span className="text-slate-300">Number of shares:</span>
+                      <span className="text-white font-mono">{shareInfo.numShares}</span>
+                    </div>
+                    <div className="text-xs text-slate-400 mt-1">
+                      ${betAmount} ÷ ${shareInfo.costPerShare} = {shareInfo.numShares} shares
+                    </div>
+                  </div>
+
+                  {/* Payout Breakdown */}
+                  <div className="bg-slate-600/30 rounded p-2 space-y-1">
+                    <div className="flex justify-between items-center text-sm">
+                      <span className="text-slate-300">If you win:</span>
+                      <span className="text-green-400 font-bold">${shareInfo.totalPayout}</span>
+                    </div>
+                    <div className="flex justify-between items-center text-sm">
+                      <span className="text-slate-300">Profit/Loss:</span>
+                      {(() => {
+                        const profit = parseFloat(shareInfo.totalPayout) - parseFloat(betAmount);
+                        const isProfit = profit >= 0;
+                        return (
+                          <span className={`font-bold ${isProfit ? 'text-green-400' : 'text-red-400'}`}>
+                            {isProfit ? '+' : ''}${profit.toFixed(2)}
+                          </span>
+                        );
+                      })()}
+                    </div>
+                    <div className="text-xs text-slate-400 mt-1">
+                      {shareInfo.numShares} shares × $1.00 each = ${shareInfo.totalPayout}
+                    </div>
+                  </div>
+
+                  {/* Risk Explanation */}
+                  <div className={`text-xs rounded p-2 ${
+                    parseFloat(shareInfo.costPerShare) > 1.0
+                      ? 'text-red-300 bg-red-900/30'
+                      : 'text-slate-400 bg-slate-800/50'
+                  }`}>
+                    <strong>How it works:</strong> Each share pays $1.00 if your prediction is correct, $0.00 if wrong.
+                    You're buying {shareInfo.numShares} shares at ${shareInfo.costPerShare} each.
+                    {parseFloat(shareInfo.costPerShare) > 1.0 && (
+                      <div className="mt-1 font-semibold">
+                        ⚠️ Warning: You're paying more than $1.00 per share that only pays $1.00 - this bet would lose money even if you win!
+                      </div>
+                    )}
+                  </div>
+
+                  {/* Strategy note */}
+                  <div className="text-xs text-slate-500 border-t border-slate-600 pt-2">
+                    Strategy: {selectedBet === 'hack' ? 'MAX SAFETY (Senior tokens)' : 'MAX UPSIDE (Junior tokens)'}
+                  </div>
+                </div>
+              );
+            })()}
+          </div>
+        )}
+
+        {/* Action Button */}
+        <Button
+          onClick={handlePlaceBet}
+          className={`w-full py-3 font-bold ${
+            selectedBet === 'hack'
+              ? 'bg-red-600 hover:bg-red-700'
+              : selectedBet === 'safe'
+              ? 'bg-green-600 hover:bg-green-700'
+              : 'bg-blue-600 hover:bg-blue-700'
+          }`}
+          disabled={!selectedBet || !betAmount || parseFloat(betAmount) <= 0 || isProcessing}
+        >
+          {isProcessing ? (
+            <>
+              <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+              Processing...
+            </>
+          ) : selectedBet ? (
+            `Place ${selectedBet === 'hack' ? 'HACK' : 'SAFE'} Bet • $${betAmount}`
+          ) : (
+            'Select Your Prediction'
+          )}
+        </Button>
+
+        {/* Portfolio Summary */}
+        <div className="bg-slate-700/30 rounded-lg p-3">
+          <div className="flex items-center gap-2 mb-2">
+            <Wallet className="h-4 w-4 text-purple-400" />
+            <span className="text-sm text-white font-semibold">Your Portfolio</span>
+          </div>
+
+          {/* Basic Position Info */}
+          <div className="space-y-1 text-xs">
+            <div className="flex justify-between">
+              <span className="text-slate-400">Senior Tokens:</span>
+              <span className="text-blue-400">
+                {formatTokenAmount(balances.seniorTokens)}
+                {Number(balances.seniorTokens) > 0 && (
+                  <span className="text-slate-500 ml-1">
+                    (${(Number(balances.seniorTokens) / 1e18 * parseFloat(seniorPrice)).toFixed(2)})
+                  </span>
+                )}
+              </span>
+            </div>
+            <div className="flex justify-between">
+              <span className="text-slate-400">Junior Tokens:</span>
+              <span className="text-amber-400">
+                {formatTokenAmount(balances.juniorTokens)}
+                {Number(balances.juniorTokens) > 0 && (
+                  <span className="text-slate-500 ml-1">
+                    (${(Number(balances.juniorTokens) / 1e18 * parseFloat(juniorPrice)).toFixed(2)})
+                  </span>
+                )}
+              </span>
+            </div>
+            <div className="flex justify-between">
+              <span className="text-slate-400">Available {assetType}:</span>
+              <span className="text-green-400">{formatTokenAmount(balances[assetType])}</span>
+            </div>
+          </div>
+
+          <div className="text-xs text-slate-500 mt-2 text-center">
+            AI analyzes your wallet + market conditions for optimal bets
+          </div>
+        </div>
+
+        {/* Stats Footer */}
+        <div className="flex justify-between text-xs text-slate-500 pt-2 border-t border-slate-700">
+          <div className="flex items-center gap-1">
+            <Clock className="w-3 h-3" />
+            <span>Ends in {timeframe}</span>
+          </div>
+          <div className="flex items-center gap-1">
+            <Target className="w-3 h-3" />
+            <span>Fixed odds • Real positions</span>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+};
+
+export default PredictionMarketWidget;
diff --git a/frontend/src/components/QuickTrade.tsx b/frontend/src/components/QuickTrade.tsx
index 4810e1f..aec8f68 100644
--- a/frontend/src/components/QuickTrade.tsx
+++ b/frontend/src/components/QuickTrade.tsx
@@ -6,11 +6,11 @@ import { Label } from '@/components/ui/label';
 import { Alert, AlertDescription } from '@/components/ui/alert';
 import { useWeb3 } from '@/context/PrivyWeb3Context';
 import { Shield, TrendingUp, Scale, Zap, DollarSign, AlertCircle } from 'lucide-react';
-import { Phase, ContractName, getContractAddress, SupportedChainId } from '@/config/contracts';
+import { Phase, ContractName, getContractAddress, SupportedChainId, getPhaseNameFromBigInt } from '@/config/contracts';
 import SmartLiquiditySuggestion from './SmartLiquiditySuggestion';
 import { ethers } from 'ethers';
 
-type TradeIntent = 'safety' | 'upside' | 'equalize' | 'fullCoverage' | 'fullRisk' | 'balanced' | 'maxSafety' | 'maxUpside' | 'addLiquidity';
+type TradeIntent = 'safety' | 'upside' | 'equalize' | 'fullCoverage' | 'fullRisk' | 'balanced' | 'maxSafety' | 'maxUpside' | 'stakeRiskTokens';
 
 const QuickTrade: React.FC = () => {
   const { 
@@ -22,7 +22,7 @@ const QuickTrade: React.FC = () => {
     swapExactTokensForTokens,
     getAmountsOut,
     depositAsset,
-    addLiquidity,
+    stakeRiskTokens,
     refreshData,
     getPairReserves,
     getTokenBalance,
@@ -197,7 +197,7 @@ const QuickTrade: React.FC = () => {
           console.log(`Adding liquidity: ${seniorAmountString} SENIOR + ${juniorAmountString} JUNIOR`);
           console.log(`Pool ratio: ${poolRatio.toFixed(6)} (${juniorReserve}/${seniorReserve})`);
           
-          await addLiquidity(seniorAmountString, juniorAmountString, seniorTokenAddress!, juniorTokenAddress!);
+          await stakeRiskTokens(seniorAmountString, juniorAmountString, seniorTokenAddress!, juniorTokenAddress!);
           setShowLiquiditySuggestion(false);
         } else {
           alert('Insufficient tokens to add meaningful liquidity while maintaining pool ratio.');
@@ -206,7 +206,7 @@ const QuickTrade: React.FC = () => {
         alert('Cannot determine pool ratio. Pool may be empty.');
       }
     } catch (error) {
-      console.error('Add liquidity failed:', error);
+      console.error('Stake risk tokens failed:', error);
       alert('Adding liquidity failed. Please try again.');
     } finally {
       setIsExecuting(false);
@@ -294,15 +294,13 @@ const QuickTrade: React.FC = () => {
             </div>
           </div>
 
-          {/* Deposit Phase Check */}
-          {Number(vaultInfo.currentPhase) !== Phase.DEPOSIT && (
-            <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-              <AlertCircle className="h-4 w-4" />
-              <AlertDescription>
-                Deposits are only allowed during the Deposit phase. Current phase: {vaultInfo.currentPhase !== undefined ? Phase[vaultInfo.currentPhase] : 'Loading...'}
-              </AlertDescription>
-            </Alert>
-          )}
+          {/* Phase Info */}
+          <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
+            <AlertCircle className="h-4 w-4" />
+            <AlertDescription>
+              Current phase: {getPhaseNameFromBigInt(vaultInfo.currentPhase)}. Deposits and withdrawals allowed at any time.
+            </AlertDescription>
+          </Alert>
 
           {/* Deposit Action Buttons */}
           <div>
@@ -310,7 +308,7 @@ const QuickTrade: React.FC = () => {
             <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
               <Button 
                 onClick={() => handleDepositAndTrade('fullCoverage')}
-                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting || Number(vaultInfo.currentPhase) !== Phase.DEPOSIT}
+                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting}
                 className="h-24 text-lg font-medium bg-slate-700 hover:bg-slate-600 transition-all duration-200 border border-slate-600"
               >
                 <div className="flex flex-col items-center space-y-1">
@@ -327,7 +325,7 @@ const QuickTrade: React.FC = () => {
 
               <Button 
                 onClick={() => handleDepositAndTrade('fullRisk')}
-                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting || Number(vaultInfo.currentPhase) !== Phase.DEPOSIT}
+                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting}
                 className="h-24 text-lg font-medium bg-slate-700 hover:bg-slate-600 transition-all duration-200 border border-slate-600"
               >
                 <div className="flex flex-col items-center space-y-1">
@@ -344,7 +342,7 @@ const QuickTrade: React.FC = () => {
 
               <Button 
                 onClick={() => handleDepositAndTrade('balanced')}
-                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting || Number(vaultInfo.currentPhase) !== Phase.DEPOSIT}
+                disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || isExecuting}
                 className="h-24 text-lg font-medium bg-slate-700 hover:bg-slate-600 transition-all duration-200 border border-slate-600"
               >
                 <div className="flex flex-col items-center space-y-1">
diff --git a/frontend/src/components/StatCard.tsx b/frontend/src/components/StatCard.tsx
index 94c2587..928ea6a 100644
--- a/frontend/src/components/StatCard.tsx
+++ b/frontend/src/components/StatCard.tsx
@@ -1,4 +1,3 @@
-
 import React from 'react';
 import { Card, CardContent } from '@/components/ui/card';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
@@ -61,4 +60,4 @@ const StatCard: React.FC<StatCardProps> = ({
   );
 };
 
-export default React.memo(StatCard);
+export default StatCard;
\ No newline at end of file
diff --git a/frontend/src/components/Trade.tsx b/frontend/src/components/Trade.tsx
deleted file mode 100644
index 444b556..0000000
--- a/frontend/src/components/Trade.tsx
+++ /dev/null
@@ -1,337 +0,0 @@
-import React, { useState, useCallback, useEffect } from 'react';
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-import { Label } from '@/components/ui/label';
-import { useWeb3 } from '@/context/PrivyWeb3Context';
-import { Shield, TrendingUp, Scale, Zap } from 'lucide-react';
-
-type TradeIntent = 'safety' | 'upside' | 'equalize';
-
-const QuickTrade: React.FC = () => {
-  const { 
-    isConnected, 
-    balances, 
-    seniorTokenAddress,
-    juniorTokenAddress,
-    swapExactTokensForTokens,
-    getAmountsOut,
-    withdraw,
-  } = useWeb3();
-
-  const [intent, setIntent] = useState<TradeIntent>('safety');
-  const [amount, setAmount] = useState('');
-  const [isExecuting, setIsExecuting] = useState(false);
-  const [estimatedOutput, setEstimatedOutput] = useState('0');
-
-  // Calculate current token values
-  const seniorValue = Number(balances.seniorTokens) / 1e18;
-  const juniorValue = Number(balances.juniorTokens) / 1e18;
-  const aUSDCValue = Number(balances.aUSDC) / 1e18;
-  const cUSDTValue = Number(balances.cUSDT) / 1e18;
-  const totalAssets = aUSDCValue + cUSDTValue;
-  
-  const handleEqualizeRisk = async () => {
-    try {
-      // Calculate the difference to equalize
-      const totalValue = seniorValue + juniorValue; // Using token amounts instead of USD values for simplicity
-      const targetAmount = totalValue / 2;
-      
-      // Determine which token to swap and how much
-      if (seniorValue > targetAmount) {
-        // Need to swap some SENIOR to JUNIOR
-        const swapAmount = (seniorValue - targetAmount).toString();
-        
-        if (seniorTokenAddress && juniorTokenAddress) {
-          const path = [seniorTokenAddress, juniorTokenAddress];
-          const estimate = await getAmountsOut(swapAmount, path);
-          const minOutput = (parseFloat(estimate) * 0.95).toString(); // 5% slippage
-          
-          await swapExactTokensForTokens(swapAmount, minOutput, path);
-        }
-      } else if (juniorValue > targetAmount) {
-        // Need to swap some JUNIOR to SENIOR
-        const swapAmount = (juniorValue - targetAmount).toString();
-        
-        if (seniorTokenAddress && juniorTokenAddress) {
-          const path = [juniorTokenAddress, seniorTokenAddress];
-          const estimate = await getAmountsOut(swapAmount, path);
-          const minOutput = (parseFloat(estimate) * 0.95).toString(); // 5% slippage
-          
-          await swapExactTokensForTokens(swapAmount, minOutput, path);
-        }
-      }
-    } catch (error) {
-      console.error('Equalize risk failed:', error);
-      throw error;
-    }
-  };
-  
-  // Update estimated output when amount or intent changes
-  useEffect(() => {
-    const updateEstimate = async () => {
-      if (!amount || parseFloat(amount) <= 0) {
-        setEstimatedOutput('0');
-        return;
-      }
-
-      try {
-        if (intent === 'safety') {
-          // Get estimate for swapping juniorTokens to seniorTokens
-          const path = [juniorTokenAddress!, seniorTokenAddress!];
-          const estimate = await getAmountsOut(amount, path);
-          setEstimatedOutput(estimate);
-        } else if (intent === 'upside') {
-          // Get estimate for swapping seniorTokens to juniorTokens
-          const path = [seniorTokenAddress!, juniorTokenAddress!];
-          const estimate = await getAmountsOut(amount, path);
-          setEstimatedOutput(estimate);
-        }
-      } catch (error) {
-        console.error('Error getting estimate:', error);
-        setEstimatedOutput('0');
-      }
-    };
-
-    if (intent !== 'equalize' && amount && parseFloat(amount) > 0) {
-      updateEstimate();
-      // Update estimate every 3 seconds for real-time pricing
-      const interval = setInterval(updateEstimate, 3000);
-      return () => clearInterval(interval);
-    }
-  }, [amount, intent, seniorTokenAddress, juniorTokenAddress, getAmountsOut]);
-
-  const getIntentDetails = () => {
-    switch (intent) {
-      case 'safety':
-        return {
-          title: 'Get More Safety',
-          description: 'Swap for more SENIOR tokens',
-          icon: <Shield className="w-5 h-5" />,
-          color: 'bg-blue-600',
-          action: `You'll get ~${parseFloat(estimatedOutput).toFixed(4)} SENIOR tokens`
-        };
-      case 'upside':
-        return {
-          title: 'Increase Upside',
-          description: 'Swap for more JUNIOR tokens',
-          icon: <TrendingUp className="w-5 h-5" />,
-          color: 'bg-amber-600',
-          action: `You'll get ~${parseFloat(estimatedOutput).toFixed(4)} JUNIOR tokens`
-        };
-      case 'equalize':
-        return {
-          title: 'Equalize Risk',
-          description: 'Balance your SENIOR and JUNIOR tokens',
-          icon: <Scale className="w-5 h-5" />,
-          color: 'bg-purple-600',
-          action: 'This will balance your portfolio to equal amounts of SENIOR and JUNIOR tokens'
-        };
-    }
-  };
-
-  const handleExecuteTrade = useCallback(async () => {
-    if (intent !== 'equalize' && (!amount || parseFloat(amount) <= 0)) {
-      alert('Please enter a valid amount');
-      return;
-    }
-
-    setIsExecuting(true);
-    
-    try {
-      const amountValue = parseFloat(amount);
-      const minOutput = (parseFloat(estimatedOutput) * 0.95).toString(); // 5% slippage tolerance
-      
-      switch (intent) {
-        case 'safety':
-          if (amountValue > juniorValue) {
-            alert('Insufficient JUNIOR tokens');
-            return;
-          }
-          // Swap JUNIOR to SENIOR
-          await swapExactTokensForTokens(
-            amount,
-            minOutput,
-            [juniorTokenAddress!, seniorTokenAddress!],
-          );
-          break;
-          
-        case 'upside':
-          if (amountValue > seniorValue) {
-            alert('Insufficient SENIOR tokens');
-            return;
-          }
-          // Swap SENIOR to JUNIOR
-          await swapExactTokensForTokens(
-            amount,
-            minOutput,
-            [seniorTokenAddress!, juniorTokenAddress!],
-          );
-          break;
-          
-        case 'equalize':
-          // Call the equalize function - no amount needed as it auto-calculates
-          await handleEqualizeRisk();
-          break;
-      }
-      
-      setAmount('');
-    } catch (error) {
-      console.error('Trade execution failed:', error);
-      alert('Trade failed. Please try again.');
-    } finally {
-      setIsExecuting(false);
-    }
-  }, [intent, amount, estimatedOutput, totalAssets, seniorValue, juniorValue, seniorTokenAddress, juniorTokenAddress, swapExactTokensForTokens, withdraw]);
-
-  const details = getIntentDetails();
-
-  if (!isConnected) {
-    return (
-      <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-        <CardHeader>
-          <CardTitle className="text-white flex items-center">
-            <Zap className="w-5 h-5 mr-2" />
-            Trade
-          </CardTitle>
-        </CardHeader>
-        <CardContent>
-          <p className="text-slate-400 text-center py-8">
-            Connect your wallet to start trading risk tokens
-          </p>
-        </CardContent>
-      </Card>
-    );
-  }
-
-  return (
-    <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-      <CardHeader>
-        <CardTitle className="text-white flex items-center">
-          <Zap className="w-5 h-5 mr-2" />
-          Rebalance Your Risk
-        </CardTitle>
-        <p className="text-slate-400 text-sm mt-1">
-          Tell us what you want to do
-        </p>
-      </CardHeader>
-      <CardContent className="space-y-6">
-        {/* Intent Selection */}
-        <div>
-          <Label className="text-slate-300 mb-3 block">I want to:</Label>
-          <RadioGroup value={intent} onValueChange={(value) => setIntent(value as TradeIntent)}>
-            <div className="space-y-3">
-              <Label 
-                htmlFor="safety" 
-                className="flex items-center space-x-3 p-3 rounded-lg border border-slate-600 hover:border-blue-500 transition-colors cursor-pointer"
-              >
-                <RadioGroupItem value="safety" id="safety" />
-                <div className="flex items-center space-x-3 flex-1">
-                  <div className="w-8 h-8 bg-blue-600 rounded-lg flex items-center justify-center text-white">
-                    <Shield className="w-4 h-4" />
-                  </div>
-                  <div>
-                    <span className="text-white font-medium block">
-                      Get more safety
-                    </span>
-                    <p className="text-slate-400 text-xs">Priority claims, lower risk</p>
-                  </div>
-                </div>
-              </Label>
-
-              <Label 
-                htmlFor="upside" 
-                className="flex items-center space-x-3 p-3 rounded-lg border border-slate-600 hover:border-amber-500 transition-colors cursor-pointer"
-              >
-                <RadioGroupItem value="upside" id="upside" />
-                <div className="flex items-center space-x-3 flex-1">
-                  <div className="w-8 h-8 bg-amber-600 rounded-lg flex items-center justify-center text-white">
-                    <TrendingUp className="w-4 h-4" />
-                  </div>
-                  <div>
-                    <span className="text-white font-medium block">
-                      Increase upside
-                    </span>
-                    <p className="text-slate-400 text-xs">Higher potential, more risk</p>
-                  </div>
-                </div>
-              </Label>
-
-              <Label 
-                htmlFor="equalize" 
-                className="flex items-center space-x-3 p-3 rounded-lg border border-slate-600 hover:border-purple-500 transition-colors cursor-pointer"
-              >
-                <RadioGroupItem value="equalize" id="equalize" />
-                <div className="flex items-center space-x-3 flex-1">
-                  <div className="w-8 h-8 bg-purple-600 rounded-lg flex items-center justify-center text-white">
-                    <Scale className="w-4 h-4" />
-                  </div>
-                  <div>
-                    <span className="text-white font-medium block">
-                      Equalize risk
-                    </span>
-                    <p className="text-slate-400 text-xs">Balance SENIOR and JUNIOR tokens</p>
-                  </div>
-                </div>
-              </Label>
-            </div>
-          </RadioGroup>
-        </div>
-
-        {/* Amount Input */}
-        <div>
-          <Label className="text-slate-300 mb-2 block">
-            {intent === 'safety' ? 'JUNIOR Amount' : 
-             intent === 'upside' ? 'SENIOR Amount' :
-             'Auto-calculated (no input needed)'}
-          </Label>
-          <Input
-            type="number"
-            placeholder={intent === 'equalize' ? 'Auto-calculated' : '0.00'}
-            value={amount}
-            onChange={(e) => setAmount(e.target.value)}
-            disabled={intent === 'equalize'}
-            className="bg-slate-700/50 border-slate-600 text-white text-lg py-6"
-          />
-          <p className="text-slate-400 text-xs mt-1">
-            {intent === 'safety' 
-              ? `Available: ${juniorValue.toFixed(4)} JUNIOR tokens`
-              : intent === 'upside'
-              ? `Available: ${seniorValue.toFixed(4)} SENIOR tokens`
-              : `Current: ${seniorValue.toFixed(4)} SENIOR, ${juniorValue.toFixed(4)} JUNIOR`
-            }
-          </p>
-        </div>
-
-        {/* Trade Preview */}
-        {((amount && parseFloat(amount) > 0) || intent === 'equalize') && (
-          <div className="bg-slate-700/30 p-4 rounded-lg border border-slate-600">
-            <h4 className="text-white font-medium mb-2">Trade Preview</h4>
-            <p className="text-slate-300 text-sm">
-              {details.action}
-            </p>
-          </div>
-        )}
-
-        {/* Execute Button */}
-        <Button 
-          onClick={handleExecuteTrade}
-          disabled={intent === 'equalize' ? isExecuting : (!amount || parseFloat(amount) <= 0 || isExecuting)}
-          className={`w-full py-6 text-lg font-medium ${details.color} hover:opacity-90 transition-opacity`}
-        >
-          {isExecuting ? (
-            'Executing...'
-          ) : (
-            <>
-              <div className="mr-2">{details.icon}</div>
-              {details.title}
-            </>
-          )}
-        </Button>
-      </CardContent>
-    </Card>
-  );
-};
-
-export default React.memo(QuickTrade);
\ No newline at end of file
diff --git a/frontend/src/components/dashboard/AdvancedFeatures.tsx b/frontend/src/components/dashboard/AdvancedFeatures.tsx
new file mode 100644
index 0000000..8fbaa24
--- /dev/null
+++ b/frontend/src/components/dashboard/AdvancedFeatures.tsx
@@ -0,0 +1,324 @@
+import React, { useState } from 'react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import {
+  Minus,
+  RefreshCw,
+  Info,
+  Plus,
+} from 'lucide-react';
+
+interface AdvancedFeaturesProps {
+  seniorBalance: number;
+  juniorBalance: number;
+  lpBalance: number;
+  formatNumber: (num: number, decimals?: number) => string;
+  isExecuting: boolean;
+  vaultInfo: { emergencyMode: boolean };
+  onStakeRiskTokens: (seniorAmount: string, juniorAmount: string) => void;
+  onUnstakeRiskTokens: (amount: string) => void;
+  onEmergencyWithdraw: (amount: string, asset: 'aUSDC' | 'cUSDT') => void;
+}
+
+const AdvancedFeatures: React.FC<AdvancedFeaturesProps> = ({
+  seniorBalance,
+  juniorBalance,
+  lpBalance,
+  formatNumber,
+  isExecuting,
+  vaultInfo,
+  onStakeRiskTokens,
+  onUnstakeRiskTokens,
+  onEmergencyWithdraw,
+}) => {
+  const [stakingSeniorAmount, setStakingSeniorAmount] = useState('');
+  const [stakingJuniorAmount, setStakingJuniorAmount] = useState('');
+  const [unstakeAmount, setUnstakeAmount] = useState('');
+  const [emergencyAmount, setEmergencyAmount] = useState('');
+  const [preferredAsset, setPreferredAsset] = useState<'aUSDC' | 'cUSDT'>('aUSDC');
+
+  const handleStakeRiskTokens = () => {
+    if (!stakingSeniorAmount || !stakingJuniorAmount) return;
+    onStakeRiskTokens(stakingSeniorAmount, stakingJuniorAmount);
+    setStakingSeniorAmount('');
+    setStakingJuniorAmount('');
+  };
+
+  const handleUnstakeRiskTokens = () => {
+    if (!unstakeAmount) return;
+    onUnstakeRiskTokens(unstakeAmount);
+    setUnstakeAmount('');
+  };
+
+  const handleEmergencyWithdraw = () => {
+    if (!emergencyAmount) return;
+    onEmergencyWithdraw(emergencyAmount, preferredAsset);
+    setEmergencyAmount('');
+  };
+
+  const handleOptimalStaking = () => {
+    // Use equal amounts for simplicity - could be enhanced with pool ratio logic
+    const maxAmount = Math.min(seniorBalance, juniorBalance);
+    setStakingSeniorAmount(maxAmount.toFixed(6));
+    setStakingJuniorAmount(maxAmount.toFixed(6));
+  };
+
+  return (
+    <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 md:gap-6">
+      {/* Stake Tokens */}
+      <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Plus className="w-5 h-5 mr-2" />
+            Stake Risk Tokens
+          </CardTitle>
+          <CardDescription className="text-slate-200">
+            Stake your SENIOR and JUNIOR tokens to earn higher rewards from trading fees
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-4">
+
+          <Button
+            onClick={handleOptimalStaking}
+            disabled={seniorBalance <= 0 && juniorBalance <= 0}
+            className="w-full bg-blue-600/20 border border-blue-500 text-blue-300 hover:bg-blue-600/30"
+          >
+            Preview Optimal Staking Amounts
+          </Button>
+
+          <div className="grid grid-cols-2 gap-3">
+            <div>
+              <Label className="text-slate-200 font-medium mb-2 block">SENIOR Amount</Label>
+              <div className="relative">
+                <Input
+                  type="number"
+                  placeholder="0.0"
+                  value={stakingSeniorAmount}
+                  onChange={(e) => setStakingSeniorAmount(e.target.value)}
+                  className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400 pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                />
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                  onClick={() => setStakingSeniorAmount(seniorBalance.toString())}
+                >
+                  Max
+                </Button>
+              </div>
+              <p className="text-sm text-slate-400 mt-1">
+                Balance: {formatNumber(seniorBalance)}
+              </p>
+            </div>
+
+            <div>
+              <Label className="text-slate-200 font-medium mb-2 block">JUNIOR Amount</Label>
+              <div className="relative">
+                <Input
+                  type="number"
+                  placeholder="0.0"
+                  value={stakingJuniorAmount}
+                  onChange={(e) => setStakingJuniorAmount(e.target.value)}
+                  className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400 pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                />
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="sm"
+                  className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                  onClick={() => setStakingJuniorAmount(juniorBalance.toString())}
+                >
+                  Max
+                </Button>
+              </div>
+              <p className="text-sm text-slate-400 mt-1">
+                Balance: {formatNumber(juniorBalance)}
+              </p>
+            </div>
+          </div>
+
+          {stakingSeniorAmount && stakingJuniorAmount && (
+            <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
+              <Info className="h-4 w-4" />
+              <AlertDescription>
+                You'll receive staking rewards proportional to your share of the pool
+              </AlertDescription>
+            </Alert>
+          )}
+
+          <Button
+            onClick={handleStakeRiskTokens}
+            disabled={!stakingSeniorAmount || !stakingJuniorAmount || parseFloat(stakingSeniorAmount) <= 0 || parseFloat(stakingJuniorAmount) <= 0 || isExecuting}
+            className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
+          >
+            {isExecuting ? (
+              <div className="flex items-center">
+                <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+                Staking...
+              </div>
+            ) : (
+              <>
+                <Plus className="w-4 h-4 mr-2" />
+                Stake Tokens
+              </>
+            )}
+          </Button>
+        </CardContent>
+      </Card>
+
+      {/* Unstake Tokens */}
+      <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Minus className="w-5 h-5 mr-2" />
+            Unstake Risk Tokens
+          </CardTitle>
+          <CardDescription className="text-slate-200">
+            Unstake your tokens from the reward pool to get back your underlying tokens. You'll receive proportional amounts of both SENIOR and JUNIOR tokens.
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-4">
+
+          <div className="space-y-2">
+            <Label className="text-slate-200 font-medium">Amount to Unstake</Label>
+            <div className="relative">
+              <Input
+                type="number"
+                placeholder="0.0"
+                value={unstakeAmount}
+                onChange={(e) => setUnstakeAmount(e.target.value)}
+                className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400 pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+              />
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                onClick={() => setUnstakeAmount(lpBalance.toString())}
+              >
+                Max
+              </Button>
+            </div>
+            <p className="text-sm text-slate-400 mt-1">
+              Staked Balance: {formatNumber(lpBalance)}
+            </p>
+          </div>
+
+          {unstakeAmount && parseFloat(unstakeAmount) > 0 && (
+            <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
+              <Info className="h-4 w-4" />
+              <AlertDescription>
+                You'll receive proportional amounts of SENIOR and JUNIOR tokens plus any earned rewards
+              </AlertDescription>
+            </Alert>
+          )}
+
+          <Button
+            onClick={handleUnstakeRiskTokens}
+            disabled={!unstakeAmount || parseFloat(unstakeAmount) <= 0 || isExecuting}
+            className="w-full bg-gradient-to-r from-red-600 to-pink-600 hover:from-red-700 hover:to-pink-700"
+          >
+            {isExecuting ? (
+              <div className="flex items-center">
+                <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+                Unstaking...
+              </div>
+            ) : (
+              'Unstake Tokens'
+            )}
+          </Button>
+        </CardContent>
+      </Card>
+
+      {/* Emergency Withdrawal */}
+      {vaultInfo.emergencyMode && (
+        <Card className="bg-red-900/20 border-red-700 backdrop-blur-sm lg:col-span-2">
+          <CardHeader>
+            <CardTitle className="text-red-400">Emergency Withdrawal</CardTitle>
+            <CardDescription className="text-red-300">
+              Emergency mode is active. Senior token holders can withdraw with preferred asset.
+            </CardDescription>
+          </CardHeader>
+          <CardContent className="space-y-4">
+            <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+              <div>
+                <Label htmlFor="emergency-amount" className="text-slate-300 font-medium mb-2 block">CM-SENIOR Amount</Label>
+                <div className="relative">
+                  <Input
+                    id="emergency-amount"
+                    type="number"
+                    placeholder="0.0"
+                    value={emergencyAmount}
+                    onChange={(e) => setEmergencyAmount(e.target.value)}
+                    className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400 pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                  />
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                    onClick={() => setEmergencyAmount(seniorBalance.toString())}
+                  >
+                    Max
+                  </Button>
+                </div>
+              </div>
+              <div>
+                <Label className="text-slate-300 mb-2 block font-medium">Preferred Asset</Label>
+                <div className="grid grid-cols-2 gap-3">
+                  <button
+                    onClick={() => setPreferredAsset('aUSDC')}
+                    className={`p-3 rounded-lg border transition-all ${
+                      preferredAsset === 'aUSDC'
+                        ? 'bg-blue-600/20 border-blue-500 text-blue-400'
+                        : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
+                    }`}
+                  >
+                    <div className="text-center">
+                      <div className="font-semibold">aUSDC</div>
+                      <div className="text-sm opacity-80">Aave USDC</div>
+                    </div>
+                  </button>
+                  <button
+                    onClick={() => setPreferredAsset('cUSDT')}
+                    className={`p-3 rounded-lg border transition-all ${
+                      preferredAsset === 'cUSDT'
+                        ? 'bg-blue-600/20 border-blue-500 text-blue-400'
+                        : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
+                    }`}
+                  >
+                    <div className="text-center">
+                      <div className="font-semibold">cUSDT</div>
+                      <div className="text-sm opacity-80">Compound USDT</div>
+                    </div>
+                  </button>
+                </div>
+              </div>
+            </div>
+            <Button
+              onClick={handleEmergencyWithdraw}
+              disabled={!emergencyAmount || isExecuting}
+              variant="destructive"
+              className="w-full bg-red-600 hover:bg-red-700"
+            >
+              {isExecuting ? (
+                <div className="flex items-center">
+                  <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+                  Processing...
+                </div>
+              ) : (
+                'Emergency Withdraw'
+              )}
+            </Button>
+          </CardContent>
+        </Card>
+      )}
+    </div>
+  );
+};
+
+export default AdvancedFeatures;
diff --git a/frontend/src/components/dashboard/DepositStrategies.tsx b/frontend/src/components/dashboard/DepositStrategies.tsx
new file mode 100644
index 0000000..b113bf2
--- /dev/null
+++ b/frontend/src/components/dashboard/DepositStrategies.tsx
@@ -0,0 +1,220 @@
+import React, { useState } from 'react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { Badge } from '@/components/ui/badge';
+import {
+  Shield,
+  TrendingUp,
+  Activity,
+  Target,
+  Info,
+  RefreshCw,
+} from 'lucide-react';
+
+interface DepositStrategiesProps {
+  aUSDCBalance: number;
+  cUSDTBalance: number;
+  formatNumber: (num: number, decimals?: number) => string;
+  isExecuting: boolean;
+  onExecuteStrategy: (strategy: 'safety' | 'upside' | 'balanced', amount: string, asset: 'aUSDC' | 'cUSDT') => void;
+  seniorPrice?: string;
+  juniorPrice?: string;
+}
+
+const DepositStrategies: React.FC<DepositStrategiesProps> = ({
+  aUSDCBalance,
+  cUSDTBalance,
+  formatNumber,
+  isExecuting,
+  onExecuteStrategy,
+  seniorPrice = '1.00',
+  juniorPrice = '1.00',
+}) => {
+  const [activeStrategy, setActiveStrategy] = useState<'safety' | 'upside' | 'balanced'>('balanced');
+  const [amount, setAmount] = useState('');
+  const [selectedAsset, setSelectedAsset] = useState<'aUSDC' | 'cUSDT'>('aUSDC');
+
+  const handleExecute = () => {
+    if (!amount || parseFloat(amount) <= 0) return;
+    onExecuteStrategy(activeStrategy, amount, selectedAsset);
+    setAmount('');
+  };
+
+  return (
+    <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+      <CardHeader>
+        <CardTitle className="text-white flex items-center font-semibold">
+          <Target className="w-5 h-5 mr-2" />
+          Smart Deposit Strategies
+        </CardTitle>
+        <CardDescription className="text-slate-200">
+          Choose your risk strategy and we'll optimize your token allocation
+        </CardDescription>
+      </CardHeader>
+      <CardContent className="space-y-6">
+        {/* Strategy Selection */}
+        <div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
+          <Card
+            className={`cursor-pointer transition-all ${
+              activeStrategy === 'safety'
+                ? 'ring-2 ring-blue-500 bg-blue-900/30 border-blue-500'
+                : 'bg-slate-700/50 border-slate-600 hover:bg-slate-700/70'
+            }`}
+            onClick={() => setActiveStrategy('safety')}
+          >
+            <CardContent className="p-3 text-center">
+              <Shield className="w-6 h-6 text-blue-400 mx-auto mb-1" />
+              <h3 className="font-semibold text-white text-sm mb-1">Max Safety</h3>
+              <p className="text-xs text-slate-300 mb-2">All funds → Senior tokens</p>
+              <Badge variant="outline" className="border-blue-500 text-blue-300 text-xs">
+                Priority Claims
+              </Badge>
+            </CardContent>
+          </Card>
+
+          <Card
+            className={`cursor-pointer transition-all ${
+              activeStrategy === 'balanced'
+                ? 'ring-2 ring-purple-500 bg-purple-900/30 border-purple-500'
+                : 'bg-slate-700/50 border-slate-600 hover:bg-slate-700/70'
+            }`}
+            onClick={() => setActiveStrategy('balanced')}
+          >
+            <CardContent className="p-3 text-center">
+              <Activity className="w-6 h-6 text-purple-400 mx-auto mb-1" />
+              <h3 className="font-semibold text-white text-sm mb-1">Balanced</h3>
+              <p className="text-xs text-slate-300 mb-2">50% Senior / 50% Junior</p>
+              <Badge variant="outline" className="border-purple-500 text-purple-300 text-xs">
+                Moderate Risk
+              </Badge>
+            </CardContent>
+          </Card>
+
+          <Card
+            className={`cursor-pointer transition-all ${
+              activeStrategy === 'upside'
+                ? 'ring-2 ring-amber-500 bg-amber-900/30 border-amber-500'
+                : 'bg-slate-700/50 border-slate-600 hover:bg-slate-700/70'
+            }`}
+            onClick={() => setActiveStrategy('upside')}
+          >
+            <CardContent className="p-3 text-center">
+              <TrendingUp className="w-6 h-6 text-amber-400 mx-auto mb-1" />
+              <h3 className="font-semibold text-white text-sm mb-1">Max Upside</h3>
+              <p className="text-xs text-slate-300 mb-2">All funds → Junior tokens</p>
+              <Badge variant="outline" className="border-amber-500 text-amber-300 text-xs">
+                Higher Returns
+              </Badge>
+            </CardContent>
+          </Card>
+        </div>
+
+        {/* Deposit Form */}
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div>
+            <Label className="text-slate-200 mb-2 block font-medium">Select Asset</Label>
+            <div className="grid grid-cols-2 gap-2">
+              <button
+                onClick={() => setSelectedAsset('aUSDC')}
+                className={`p-3 rounded-lg border transition-all ${
+                  selectedAsset === 'aUSDC'
+                    ? 'bg-blue-600/30 border-blue-500 text-blue-300'
+                    : 'bg-slate-700/60 border-slate-600 text-slate-200 hover:bg-slate-700/80 hover:text-white'
+                }`}
+              >
+                <div className="text-center">
+                  <div className="font-semibold text-sm">aUSDC</div>
+                  <div className="text-xs opacity-90">Aave USDC</div>
+                  <div className="text-xs mt-1 font-medium">Balance: {formatNumber(aUSDCBalance, 2)}</div>
+                </div>
+              </button>
+              <button
+                onClick={() => setSelectedAsset('cUSDT')}
+                className={`p-3 rounded-lg border transition-all ${
+                  selectedAsset === 'cUSDT'
+                    ? 'bg-blue-600/30 border-blue-500 text-blue-300'
+                    : 'bg-slate-700/60 border-slate-600 text-slate-200 hover:bg-slate-700/80 hover:text-white'
+                }`}
+              >
+                <div className="text-center">
+                  <div className="font-semibold text-sm">cUSDT</div>
+                  <div className="text-xs opacity-90">Compound USDT</div>
+                  <div className="text-xs mt-1 font-medium">Balance: {formatNumber(cUSDTBalance, 2)}</div>
+                </div>
+              </button>
+            </div>
+          </div>
+
+          <div>
+            <Label className="text-slate-200 mb-2 block font-medium">Deposit Amount</Label>
+            <div className="relative">
+              <Input
+                type="number"
+                placeholder="0.00"
+                value={amount}
+                onChange={(e) => setAmount(e.target.value)}
+                className="bg-slate-700/50 border-slate-600 text-white pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+              />
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                onClick={() => setAmount((selectedAsset === 'aUSDC' ? aUSDCBalance : cUSDTBalance).toString())}
+              >
+                Max
+              </Button>
+            </div>
+            <div className="flex justify-between mt-2 text-sm text-slate-300">
+              <span className="font-medium">Available: {formatNumber(selectedAsset === 'aUSDC' ? aUSDCBalance : cUSDTBalance, 2)}</span>
+            </div>
+          </div>
+        </div>
+
+        {/* Strategy Preview */}
+        {amount && parseFloat(amount) > 0 && (
+          <Alert className="bg-slate-700/60 border-slate-500">
+            <Info className="h-4 w-4 text-blue-400" />
+            <AlertDescription>
+              <div className="space-y-2">
+                <div className="font-semibold text-white">Strategy Preview:</div>
+                <div className="text-sm space-y-1 text-slate-200">
+                  {activeStrategy === 'safety' && (
+                    <div>Depositing ${amount} will get you ~{formatNumber(parseFloat(amount) / parseFloat(seniorPrice))} Senior tokens (priority claims)</div>
+                  )}
+                  {activeStrategy === 'balanced' && (
+                    <div>Depositing ${amount} will get you ~{formatNumber((parseFloat(amount) / 2) / parseFloat(seniorPrice))} Senior + ~{formatNumber((parseFloat(amount) / 2) / parseFloat(juniorPrice))} Junior tokens</div>
+                  )}
+                  {activeStrategy === 'upside' && (
+                    <div>Depositing ${amount} will get you ~{formatNumber(parseFloat(amount) / parseFloat(juniorPrice))} Junior tokens (higher upside potential)</div>
+                  )}
+                </div>
+              </div>
+            </AlertDescription>
+          </Alert>
+        )}
+
+        {/* Execute Button */}
+        <Button
+          onClick={handleExecute}
+          disabled={!amount || parseFloat(amount) <= 0 || isExecuting}
+          className="w-full font-semibold bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
+        >
+          {isExecuting ? (
+            <div className="flex items-center">
+              <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+              Executing Strategy...
+            </div>
+          ) : (
+            `Execute ${activeStrategy.charAt(0).toUpperCase() + activeStrategy.slice(1)} Strategy`
+          )}
+        </Button>
+      </CardContent>
+    </Card>
+  );
+};
+
+export default DepositStrategies;
diff --git a/frontend/src/components/dashboard/MarketOverview.tsx b/frontend/src/components/dashboard/MarketOverview.tsx
new file mode 100644
index 0000000..22ff639
--- /dev/null
+++ b/frontend/src/components/dashboard/MarketOverview.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import {
+  Activity,
+  TrendingUp,
+  Droplets,
+  Users,
+  ExternalLink,
+} from 'lucide-react';
+
+interface MarketOverviewProps {
+  seniorPrice: string;
+  juniorPrice: string;
+  poolReserves: { senior: string; junior: string };
+  protocolTVL: number;
+  formatNumber: (num: number, decimals?: number) => string;
+}
+
+const MarketOverview: React.FC<MarketOverviewProps> = ({
+  seniorPrice,
+  juniorPrice,
+  poolReserves,
+  protocolTVL,
+  formatNumber,
+}) => {
+  return (
+    <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+      <CardHeader>
+        <div className="flex justify-between items-center">
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Activity className="w-5 h-5 mr-2" />
+            Market Overview
+          </CardTitle>
+        </div>
+      </CardHeader>
+      <CardContent>
+        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 md:gap-6">
+          <div className="text-center">
+            <p className="text-sm text-slate-300 mb-1 font-medium">Senior Price</p>
+            <p className="text-xl font-bold text-blue-400">${seniorPrice}</p>
+            <div className="flex items-center justify-center mt-1">
+              <TrendingUp className="w-3 h-3 text-green-400 mr-1" />
+              <span className="text-xs text-green-400 font-medium">Stable</span>
+            </div>
+          </div>
+          <div className="text-center">
+            <p className="text-sm text-slate-300 mb-1 font-medium">Junior Price</p>
+            <p className="text-xl font-bold text-amber-400">${juniorPrice}</p>
+            <div className="flex items-center justify-center mt-1">
+              <TrendingUp className="w-3 h-3 text-green-400 mr-1" />
+              <span className="text-xs text-green-400 font-medium">Volatile</span>
+            </div>
+          </div>
+          <div className="text-center">
+            <p className="text-sm text-slate-300 mb-1 font-medium">Pool Liquidity</p>
+            <p className="text-xl font-bold text-purple-400">
+              ${formatNumber((parseFloat(poolReserves.senior) + parseFloat(poolReserves.junior)), 0)}
+            </p>
+            <div className="flex items-center justify-center mt-1">
+              <Droplets className="w-3 h-3 text-purple-400 mr-1" />
+              <span className="text-xs text-purple-400 font-medium">Deep</span>
+            </div>
+          </div>
+          <div className="text-center">
+            <p className="text-sm text-slate-300 mb-1 font-medium">Protocol TVL</p>
+            <p className="text-xl font-bold text-green-400">${formatNumber(protocolTVL, 0)}</p>
+            <div className="flex items-center justify-center mt-1">
+              <Users className="w-3 h-3 text-green-400 mr-1" />
+              <span className="text-xs text-green-400 font-medium">Growing</span>
+            </div>
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+};
+
+export default MarketOverview;
diff --git a/frontend/src/components/dashboard/PortfolioOverview.tsx b/frontend/src/components/dashboard/PortfolioOverview.tsx
new file mode 100644
index 0000000..b523cfb
--- /dev/null
+++ b/frontend/src/components/dashboard/PortfolioOverview.tsx
@@ -0,0 +1,196 @@
+import React from 'react';
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Progress } from '@/components/ui/progress';
+import {
+  Shield,
+  TrendingUp,
+  Zap,
+  Settings,
+  Droplets,
+  Plus,
+  BarChart3,
+} from 'lucide-react';
+
+interface VaultInfo {
+  emergencyMode: boolean;
+}
+
+interface PortfolioOverviewProps {
+  seniorBalance: number;
+  juniorBalance: number;
+  lpBalance: number;
+  seniorPrice: string;
+  juniorPrice: string;
+  riskProfile: {
+    level: string;
+    color: string;
+    percentage: number;
+  };
+  formatNumber: (num: number, decimals?: number) => string;
+  protocolTVL: number;
+  userSharePercent: number;
+  vaultInfo: VaultInfo;
+  onTabChange: (tab: string) => void;
+}
+
+const PortfolioOverview: React.FC<PortfolioOverviewProps> = ({
+  seniorBalance,
+  juniorBalance,
+  lpBalance,
+  seniorPrice,
+  juniorPrice,
+  riskProfile,
+  formatNumber,
+  protocolTVL,
+  userSharePercent,
+  vaultInfo,
+  onTabChange,
+}) => {
+  return (
+    <div className="grid grid-cols-1 lg:grid-cols-3 gap-4 md:gap-6">
+      {/* Portfolio Breakdown */}
+      <Card className="lg:col-span-2 bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <BarChart3 className="w-5 h-5 mr-2" />
+            Portfolio Breakdown
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {/* Risk Profile Visualization */}
+          <div className="space-y-3">
+            <div className="flex justify-between items-center">
+              <span className="text-slate-200 font-medium">Risk Distribution</span>
+              <span className="text-sm text-slate-300 font-medium">
+                {formatNumber(riskProfile.percentage)}% Senior
+              </span>
+            </div>
+            <Progress
+              value={riskProfile.percentage}
+              className="h-3"
+            />
+            <div className="flex justify-between text-xs text-slate-400 font-medium">
+              <span>Conservative</span>
+              <span>Aggressive</span>
+            </div>
+          </div>
+
+          {/* Token Holdings */}
+          <div className="space-y-3">
+            <div className="flex justify-between items-center p-4 bg-slate-700/50 rounded-lg border border-slate-600/50">
+              <div className="flex items-center space-x-3">
+                <Shield className="w-6 h-6 text-blue-400" />
+                <div>
+                  <p className="text-white font-semibold">Senior Tokens</p>
+                  <p className="text-xs text-slate-300">Priority claims • Lower risk</p>
+                </div>
+              </div>
+              <div className="text-right">
+                <p className="text-white font-semibold">{formatNumber(seniorBalance)}</p>
+                <p className="text-xs text-slate-300">${seniorPrice} each</p>
+              </div>
+            </div>
+
+            <div className="flex justify-between items-center p-4 bg-slate-700/50 rounded-lg border border-slate-600/50">
+              <div className="flex items-center space-x-3">
+                <TrendingUp className="w-6 h-6 text-amber-400" />
+                <div>
+                  <p className="text-white font-semibold">Junior Tokens</p>
+                  <p className="text-xs text-slate-300">Higher upside • Higher risk</p>
+                </div>
+              </div>
+              <div className="text-right">
+                <p className="text-white font-semibold">{formatNumber(juniorBalance)}</p>
+                <p className="text-xs text-slate-300">${juniorPrice} each</p>
+              </div>
+            </div>
+
+            <div className="flex justify-between items-center p-4 bg-slate-700/50 rounded-lg border border-slate-600/50">
+              <div className="flex items-center space-x-3">
+                <Droplets className="w-6 h-6 text-purple-400" />
+                <div>
+                  <p className="text-white font-semibold">Staked Tokens</p>
+                  <p className="text-xs text-slate-300">Risk token staking rewards</p>
+                </div>
+              </div>
+              <div className="text-right">
+                <p className="text-white font-semibold">{formatNumber(lpBalance)}</p>
+                <p className="text-xs text-slate-300">Pool share</p>
+              </div>
+            </div>
+          </div>
+        </CardContent>
+      </Card>
+
+      {/* Quick Actions */}
+      <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Zap className="w-5 h-5 mr-2" />
+            Quick Actions
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-3">
+          <Button
+            className="w-full justify-between bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
+            onClick={() => onTabChange('deposit')}
+          >
+            Deposit & Get Tokens
+            <Plus className="w-4 h-4" />
+          </Button>
+
+          <Button
+            variant="outline"
+            className="w-full justify-between border-slate-600 bg-slate-800/50 text-slate-300 hover:bg-slate-700 hover:text-white"
+            onClick={() => onTabChange('manage')}
+          >
+            Manage Positions
+            <Settings className="w-4 h-4" />
+          </Button>
+
+          <Button
+            variant="outline"
+            className="w-full justify-between border-slate-600 bg-slate-800/50 text-slate-300 hover:bg-slate-700 hover:text-white"
+            onClick={() => onTabChange('advanced')}
+          >
+            Stake Risk Tokens
+            <Droplets className="w-4 h-4" />
+          </Button>
+
+          {/* Protocol Analytics */}
+          <div className="pt-4 border-t border-slate-600">
+            <div className="mb-3">
+              <h3 className="text-sm font-semibold text-white mb-2 flex items-center">
+                <BarChart3 className="w-4 h-4 mr-2" />
+                Protocol Analytics
+              </h3>
+            </div>
+            <div className="grid grid-cols-2 gap-3 mb-4">
+              <div className="text-center p-3 bg-slate-700/30 rounded-lg">
+                <p className="text-xs text-slate-300 font-medium">Total TVL</p>
+                <p className="text-lg font-bold text-green-400">${formatNumber(protocolTVL, 0)}</p>
+              </div>
+              <div className="text-center p-3 bg-slate-700/30 rounded-lg">
+                <p className="text-xs text-slate-300 font-medium">Your Share</p>
+                <p className="text-lg font-bold text-blue-400">{formatNumber(userSharePercent, 4)}%</p>
+              </div>
+              <div className="text-center p-3 bg-slate-700/30 rounded-lg">
+                <p className="text-xs text-slate-300 font-medium">Pool Ratio</p>
+                <p className="text-lg font-bold text-purple-400">1.00</p>
+              </div>
+              <div className="text-center p-3 bg-slate-700/30 rounded-lg">
+                <p className="text-xs text-slate-300 font-medium">Emergency</p>
+                <p className={`text-sm font-bold ${vaultInfo.emergencyMode ? 'text-red-400' : 'text-green-400'}`}>
+                  {vaultInfo.emergencyMode ? 'Active' : 'Inactive'}
+                </p>
+              </div>
+            </div>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+};
+
+export default PortfolioOverview;
diff --git a/frontend/src/components/dashboard/PositionManagement.tsx b/frontend/src/components/dashboard/PositionManagement.tsx
new file mode 100644
index 0000000..98fb787
--- /dev/null
+++ b/frontend/src/components/dashboard/PositionManagement.tsx
@@ -0,0 +1,279 @@
+import React, { useState, useEffect } from 'react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Alert, AlertDescription } from '@/components/ui/alert';
+import { Progress } from '@/components/ui/progress';
+import { Phase } from '@/config/contracts';
+import { useWeb3 } from '@/context/PrivyWeb3Context';
+import {
+  Activity,
+  Minus,
+  ArrowUpRight,
+  ArrowDownRight,
+  RefreshCw,
+  Info,
+  AlertCircle,
+  DollarSign,
+} from 'lucide-react';
+
+interface PositionManagementProps {
+  riskProfile: { percentage: number };
+  totalPortfolioValue: number;
+  formatNumber: (num: number, decimals?: number) => string;
+  isRebalancing: boolean;
+  isWithdrawing: boolean;
+  onRebalance: (targetPercent: number) => void;
+  onWithdraw: (amount: string) => void;
+  vaultInfo: any;
+}
+
+const PositionManagement: React.FC<PositionManagementProps> = ({
+  riskProfile,
+  totalPortfolioValue,
+  formatNumber,
+  isRebalancing,
+  isWithdrawing,
+  onRebalance,
+  onWithdraw,
+  vaultInfo,
+}) => {
+  const { balances } = useWeb3();
+  const [targetSeniorPercent, setTargetSeniorPercent] = useState(50);
+  const [isRebalancePreview, setIsRebalancePreview] = useState(false);
+  const [withdrawAmount, setWithdrawAmount] = useState('');
+
+  // Initialize target percent to current allocation
+  useEffect(() => {
+    setTargetSeniorPercent(Math.round(riskProfile.percentage));
+  }, [riskProfile.percentage]);
+
+  const handleRebalancePreview = (targetPercent: number) => {
+    setTargetSeniorPercent(targetPercent);
+    setIsRebalancePreview(true);
+  };
+
+  const handleRebalanceExecute = () => {
+    onRebalance(targetSeniorPercent);
+    // Keep the preview visible during execution
+    // It will reset when the component re-renders after successful rebalancing
+  };
+
+  const handleWithdrawExecute = () => {
+    if (!withdrawAmount) return;
+    onWithdraw(withdrawAmount);
+    setWithdrawAmount('');
+  };
+
+  return (
+    <div className="grid grid-cols-1 lg:grid-cols-2 gap-4 md:gap-6">
+      {/* Rebalance Portfolio */}
+      <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Activity className="w-5 h-5 mr-2" />
+            Rebalance Portfolio
+          </CardTitle>
+          <CardDescription className="text-slate-200">
+            Adjust your risk exposure by trading between Senior and Junior tokens
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {/* Current vs Target Visualization */}
+          <div className="space-y-4">
+            <div className="space-y-2">
+              <div className="flex justify-between text-sm">
+                <span className="text-slate-300 font-medium">Current Allocation</span>
+                <span className="text-white font-semibold">{formatNumber(riskProfile.percentage)}% Senior / {formatNumber(100 - riskProfile.percentage)}% Junior</span>
+              </div>
+              <Progress value={riskProfile.percentage} className="h-3" />
+            </div>
+
+            {(isRebalancePreview || isRebalancing) && (
+              <div className="space-y-2">
+                <div className="flex justify-between text-sm">
+                  <span className="text-slate-300 font-medium">Target Allocation</span>
+                  <span className="text-white font-semibold">{targetSeniorPercent}% Senior / {100 - targetSeniorPercent}% Junior</span>
+                </div>
+                <Progress value={targetSeniorPercent} className="h-3 bg-slate-700">
+                  <div className="h-full bg-gradient-to-r from-blue-500 to-purple-500 rounded-full transition-all" style={{ width: `${targetSeniorPercent}%` }} />
+                </Progress>
+              </div>
+            )}
+          </div>
+
+          {/* Target Allocation Buttons */}
+          <div className="space-y-3">
+            <Label className="text-slate-200 font-medium">Set Target Allocation</Label>
+            <div className="grid grid-cols-3 sm:grid-cols-5 gap-2">
+              {[0, 25, 50, 75, 100].map((percent) => (
+                <Button
+                  key={percent}
+                  variant={targetSeniorPercent === percent ? "default" : "outline"}
+                  size="sm"
+                  className={`${
+                    targetSeniorPercent === percent
+                      ? "bg-blue-600 text-white"
+                      : "border-slate-600 bg-slate-800/50 text-slate-300 hover:text-white hover:bg-slate-700"
+                  } text-xs sm:text-sm min-h-[2.5rem]`}
+                  onClick={() => handleRebalancePreview(percent)}
+                >
+                  <span className="text-center">{percent}%<br/>Senior</span>
+                </Button>
+              ))}
+            </div>
+            <div className="flex justify-between text-xs text-slate-400 font-medium px-2">
+              <span className="text-center">Max Risk</span>
+              <span className="text-center hidden sm:block">Balanced</span>
+              <span className="text-center">Max Safety</span>
+            </div>
+          </div>
+
+          {/* Action Buttons */}
+          {(isRebalancePreview || isRebalancing) ? (
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
+              <Button
+                variant="outline"
+                className="border-slate-600 bg-slate-800/50 text-slate-300 hover:text-white hover:bg-slate-700"
+                onClick={() => {
+                  setTargetSeniorPercent(Math.round(riskProfile.percentage));
+                  setIsRebalancePreview(false);
+                }}
+                disabled={isRebalancing}
+              >
+                Cancel
+              </Button>
+              <Button
+                className="bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700 text-white"
+                onClick={handleRebalanceExecute}
+                disabled={isRebalancing}
+              >
+                {isRebalancing ? (
+                  <div className="flex items-center justify-center">
+                    <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+                    Rebalancing...
+                  </div>
+                ) : (
+                  'Execute Rebalance'
+                )}
+              </Button>
+            </div>
+          ) : (
+            <Alert className="bg-blue-900/30 border-blue-500">
+              <Info className="h-4 w-4 text-blue-400" />
+              <AlertDescription className="text-blue-200">
+                Use the buttons above to set your target allocation. Trades will be executed via AMM.
+              </AlertDescription>
+            </Alert>
+          )}
+        </CardContent>
+      </Card>
+
+      {/* Withdraw */}
+      <Card className="bg-slate-800/80 border-slate-600 shadow-lg">
+        <CardHeader>
+          <CardTitle className="text-white flex items-center font-semibold">
+            <Minus className="w-5 h-5 mr-2" />
+            Withdraw
+          </CardTitle>
+          <CardDescription className="text-slate-200">
+            Withdraw from your position to both aUSDC and cUSDT proportionally
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {/* Current Asset Holdings */}
+          <div>
+            <Label className="text-slate-200 mb-3 block font-medium">Your Current Holdings</Label>
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-3 mb-4">
+              <div className="p-3 rounded-lg bg-slate-700/30 border border-slate-600">
+                <div className="flex items-center justify-between">
+                  <div>
+                    <div className="font-semibold text-blue-400">aUSDC</div>
+                    <div className="text-xs text-slate-400">Aave USDC</div>
+                  </div>
+                  <div className="text-right">
+                    <div className="font-mono text-white">{formatNumber(Number(balances.aUSDC) / 1e18)}</div>
+                  </div>
+                </div>
+              </div>
+              <div className="p-3 rounded-lg bg-slate-700/30 border border-slate-600">
+                <div className="flex items-center justify-between">
+                  <div>
+                    <div className="font-semibold text-amber-400">cUSDT</div>
+                    <div className="text-xs text-slate-400">Compound USDT</div>
+                  </div>
+                  <div className="text-right">
+                    <div className="font-mono text-white">{formatNumber(Number(balances.cUSDT) / 1e18)}</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          {/* Amount Input */}
+          <div>
+            <Label htmlFor="withdraw-amount" className="text-slate-200 font-medium">
+              Withdrawal Amount (USD)
+            </Label>
+            <div className="relative">
+              <DollarSign className="absolute left-3 top-1/2 transform -translate-y-1/2 w-4 h-4 text-slate-400" />
+              <Input
+                id="withdraw-amount"
+                type="number"
+                placeholder="0.0"
+                value={withdrawAmount}
+                onChange={(e) => setWithdrawAmount(e.target.value)}
+                className="pl-10 bg-slate-700/50 border-slate-600 text-white placeholder-slate-400 pr-16 [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+              />
+              <Button
+                type="button"
+                variant="ghost"
+                size="sm"
+                className="absolute right-2 top-1/2 -translate-y-1/2 h-6 px-2 text-xs text-blue-400 hover:text-blue-300 hover:bg-blue-500/20"
+                onClick={() => setWithdrawAmount(totalPortfolioValue.toString())}
+              >
+                Max
+              </Button>
+            </div>
+            <div className="text-sm text-slate-300 font-medium mt-1">
+              Max withdrawable: ${formatNumber(totalPortfolioValue)}
+            </div>
+            <div className="text-xs text-slate-400 mt-1">
+              Will be distributed proportionally to both aUSDC and cUSDT
+            </div>
+          </div>
+
+          <Button
+            onClick={handleWithdrawExecute}
+            disabled={!withdrawAmount || parseFloat(withdrawAmount) <= 0 || isWithdrawing}
+            className="w-full bg-gradient-to-r from-red-600 to-pink-600 hover:from-red-700 hover:to-pink-700 text-white"
+          >
+            {isWithdrawing ? (
+              <div className="flex items-center">
+                <RefreshCw className="w-4 h-4 mr-2 animate-spin" />
+                Processing...
+              </div>
+            ) : (
+              'Redeem Optimally'
+            )}
+          </Button>
+
+          <Alert className="bg-yellow-900/30 border-yellow-500">
+            <AlertCircle className="h-4 w-4 text-yellow-400" />
+            <AlertDescription className="text-yellow-200">
+              {vaultInfo.currentPhase === 0n && 'Active Period: Withdrawals require equal amounts of Senior and Junior tokens.'}
+              {vaultInfo.currentPhase === 1n && 'Claims Period: Any combination of Senior and Junior tokens can be withdrawn.'}
+              {vaultInfo.currentPhase === 2n && 'Final Claims Period: All token holders can withdraw remaining funds with any token combination.'}
+              {vaultInfo.currentPhase === undefined && 'Loading withdrawal rules...'}
+              {(vaultInfo.currentPhase !== 0n && vaultInfo.currentPhase !== 1n && vaultInfo.currentPhase !== 2n && vaultInfo.currentPhase !== undefined) &&
+                `Phase ${vaultInfo.currentPhase?.toString()}: Any combination of tokens can be withdrawn.`}
+            </AlertDescription>
+          </Alert>
+        </CardContent>
+      </Card>
+    </div>
+  );
+};
+
+export default PositionManagement;
diff --git a/frontend/src/components/ui/tabs.tsx b/frontend/src/components/ui/tabs.tsx
new file mode 100644
index 0000000..82badaa
--- /dev/null
+++ b/frontend/src/components/ui/tabs.tsx
@@ -0,0 +1,53 @@
+import * as React from "react"
+import * as TabsPrimitive from "@radix-ui/react-tabs"
+
+import { cn } from "@/lib/utils"
+
+const Tabs = TabsPrimitive.Root
+
+const TabsList = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.List>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.List
+    ref={ref}
+    className={cn(
+      "inline-flex h-10 items-center justify-center rounded-md bg-muted p-1 text-muted-foreground",
+      className
+    )}
+    {...props}
+  />
+))
+TabsList.displayName = TabsPrimitive.List.displayName
+
+const TabsTrigger = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-background data-[state=active]:text-foreground data-[state=active]:shadow-sm",
+      className
+    )}
+    {...props}
+  />
+))
+TabsTrigger.displayName = TabsPrimitive.Trigger.displayName
+
+const TabsContent = React.forwardRef<
+  React.ElementRef<typeof TabsPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <TabsPrimitive.Content
+    ref={ref}
+    className={cn(
+      "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+      className
+    )}
+    {...props}
+  />
+))
+TabsContent.displayName = TabsPrimitive.Content.displayName
+
+export { Tabs, TabsList, TabsTrigger, TabsContent }
\ No newline at end of file
diff --git a/frontend/src/config/contracts.ts b/frontend/src/config/contracts.ts
index 1894c9c..e7c0740 100644
--- a/frontend/src/config/contracts.ts
+++ b/frontend/src/config/contracts.ts
@@ -26,15 +26,15 @@ export enum ContractName {
 // Multi-chain contract addresses
 export const MULTI_CHAIN_ADDRESSES: Record<SupportedChainId, Partial<Record<ContractName, string>>> = {
   [SupportedChainId.HEDERA_TESTNET]: {
-    [ContractName.MOCK_AUSDC]: "0x2Ec140Ba967BD9d2B5C0C138F22E20A530beFaF4",
-    [ContractName.MOCK_CUSDT]: "0xbc20b977781705589EC578aC7d5680Af821D4c1c",
-    [ContractName.UNISWAP_V2_FACTORY]: "0x0310c9Cf82c2b0a426F2a5e09d1d670B31442a63",
-    [ContractName.WETH]: "0x86840528937f5f1578601d3d31Bc7cFF6A540009",
-    [ContractName.RISK_VAULT]: "0x78a9bCbA870A367559258AAAC5b7e533cF9C0EB7",
-    [ContractName.UNISWAP_V2_ROUTER]: "0x80E7C7932059ce5E67506B0BC25971B8209e003f",
-    [ContractName.JUNIOR_TOKEN]: "0xc3e818236440461916BF75C91bd28Bb27bEa746e",
-    [ContractName.SENIOR_TOKEN]: "0x9c6A5C213F5CB326186E876C3e37ec8F73768b2B",
-    [ContractName.SENIOR_JUNIOR_PAIR]: "0xb6368834321662839717dbd3dea511525B8382B5",
+    [ContractName.MOCK_AUSDC]: "0xc6461cf8E77b40293d90c9670FcC2Da04346Df1A",
+    [ContractName.MOCK_CUSDT]: "0xe786547f22F29E477B51135b24A39E937d291d17",
+    [ContractName.UNISWAP_V2_FACTORY]: "0x3e83552ED9bF1418Bf50fbc7071C87361Ce156b5",
+    [ContractName.WETH]: "0xED6eF615b61D37a5E1cce5D5Aaddc1064Fb9fA07",
+    [ContractName.RISK_VAULT]: "0x86840DBAE8aF63780ffFB2990aADDF5C78aeb184",
+    [ContractName.UNISWAP_V2_ROUTER]: "0xBA659094Ffd44F3CCcFffd7c172cB42f0aD362b0",
+    [ContractName.JUNIOR_TOKEN]: "0x2DDd2DD26A3d90d4a67F02A69728B386B1461710",
+    [ContractName.SENIOR_TOKEN]: "0xC5F805bBD905803e5Ec1280827068B9889978cF3",
+    [ContractName.SENIOR_JUNIOR_PAIR]: "0x40C4F4B6fB472bFE986134A2A99C691E4323b09E",
   },
   [SupportedChainId.FLOW_TESTNET]: {
     [ContractName.MOCK_AUSDC]: "0x27448B112B42c930915bF3953A691c80BdcE7208",
@@ -238,23 +238,26 @@ export function getChainDeploymentStatus(chainId: SupportedChainId): Record<Cont
 
 // Phase enum matching the smart contract
 export enum Phase {
-  DEPOSIT = 0,
-  COVERAGE = 1,
-  CLAIMS = 2,
-  FINAL_CLAIMS = 3,
+  ACTIVE = 0,
+  CLAIMS = 1,
+  FINAL_CLAIMS = 2,
 }
 
 export const PHASE_NAMES = {
-  [Phase.DEPOSIT]: "Deposit Period",
-  [Phase.COVERAGE]: "Coverage Period", 
-  [Phase.CLAIMS]: "Claims Period",
+  [Phase.ACTIVE]: "Active Period",
+  [Phase.CLAIMS]: "Claims Period", 
   [Phase.FINAL_CLAIMS]: "Final Claims Period",
 } as const;
 
+// Utility function to get phase name from BigInt
+export function getPhaseNameFromBigInt(phase: bigint | undefined): string {
+  if (phase === undefined) return 'Loading...';
+  return PHASE_NAMES[Number(phase) as Phase] || `Unknown Phase (${phase.toString()})`;
+}
+
 // Phase durations in seconds (matching smart contract)
 export const PHASE_DURATIONS = {
-  [Phase.DEPOSIT]: 2 * 24 * 60 * 60, // 2 days
-  [Phase.COVERAGE]: 3 * 24 * 60 * 60, // 3 days
+  [Phase.ACTIVE]: 5 * 24 * 60 * 60, // 5 days
   [Phase.CLAIMS]: 1 * 24 * 60 * 60, // 1 day
   [Phase.FINAL_CLAIMS]: 1 * 24 * 60 * 60, // 1 day
 } as const;
diff --git a/frontend/src/context/PrivyWeb3Context.tsx b/frontend/src/context/PrivyWeb3Context.tsx
index b1fd575..f9f3e47 100644
--- a/frontend/src/context/PrivyWeb3Context.tsx
+++ b/frontend/src/context/PrivyWeb3Context.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useState, useCallback, useEffect, ReactNode } from 'react';
+import React, { createContext, useContext, useState, useCallback, useEffect, useRef, ReactNode } from 'react';
 import { PrivyProvider, usePrivy, useWallets } from '@privy-io/react-auth';
 import { ethers, BrowserProvider, Contract, Signer } from 'ethers';
 import { toast } from '@/components/ui/sonner';
@@ -38,7 +38,7 @@ interface VaultInfo {
   cUSDTBalance: bigint;
   totalTokensIssued: bigint;
   emergencyMode: boolean;
-  currentPhase: Phase;
+  currentPhase: bigint;
   phaseStartTime: bigint;
   cycleStartTime: bigint;
   timeRemaining: bigint;
@@ -101,15 +101,15 @@ interface Web3ContextType {
     path: string[],
   ) => Promise<string>;
 
-  addLiquidity: (
+  stakeRiskTokens: (
     tokenAAmount: string,
     tokenBAmount: string,
     tokenA: string,
     tokenB: string,
   ) => Promise<void>;
 
-  removeLiquidity: (
-    lpTokenAmount: string,
+  unstakeRiskTokens: (
+    stakedTokenAmount: string,
     tokenA: string,
     tokenB: string,
   ) => Promise<void>;
@@ -143,7 +143,7 @@ const Web3Context = createContext<Web3ContextType>({
     cUSDTBalance: 0n,
     totalTokensIssued: 0n,
     emergencyMode: false,
-    currentPhase: Phase.DEPOSIT,
+    currentPhase: Phase.ACTIVE,
     phaseStartTime: 0n,
     cycleStartTime: 0n,
     timeRemaining: 0n,
@@ -160,14 +160,15 @@ const Web3Context = createContext<Web3ContextType>({
   emergencyWithdraw: async () => {},
   toggleEmergencyMode: async () => {},
   forcePhaseTransition: async () => {},
+  forcePhaseTransitionImmediate: async () => {},
   startNewCycle: async () => {},
   refreshData: async () => {},
   approveToken: async () => {},
   calculateWithdrawalAmounts: async () => ({ aUSDC: 0n, cUSDT: 0n }),
   swapExactTokensForTokens: async () => {},
   getAmountsOut: async () => "0",
-  addLiquidity: async () => {},
-  removeLiquidity: async () => {},
+  stakeRiskTokens: async () => {},
+  unstakeRiskTokens: async () => {},
   getPairReserves: async () => ({ reserve0: 0n, reserve1: 0n }),
   getTokenBalance: async () => 0n,
 });
@@ -197,7 +198,7 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     cUSDTBalance: 0n,
     totalTokensIssued: 0n,
     emergencyMode: false,
-    currentPhase: Phase.DEPOSIT,
+    currentPhase: 0n,
     phaseStartTime: 0n,
     cycleStartTime: 0n,
     timeRemaining: 0n,
@@ -205,6 +206,10 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
   
   const [seniorTokenAddress, setSeniorTokenAddress] = useState<string | null>(null);
   const [juniorTokenAddress, setJuniorTokenAddress] = useState<string | null>(null);
+  
+  // Add ref to track last refresh time for debouncing
+  const lastRefreshTime = useRef<number>(0);
+  const isRefreshing = useRef<boolean>(false);
 
   // Initial state values for cleanup
   const initialBalances: TokenBalances = {
@@ -220,7 +225,7 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     cUSDTBalance: 0n,
     totalTokensIssued: 0n,
     emergencyMode: false,
-    currentPhase: Phase.DEPOSIT,
+    currentPhase: 0n,
     phaseStartTime: 0n,
     cycleStartTime: 0n,
     timeRemaining: 0n,
@@ -353,27 +358,77 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     setupNetworkListener();
   }, [ready, authenticated, wallets, logout]);
 
-  // Load contract data
+  // Load contract data for initial connection
   const loadContractData = async (provider: BrowserProvider, signer: Signer, chainId: SupportedChainId) => {
     try {
+      const userAddress = await signer.getAddress();
+      
+      // Get all contract addresses
       const vaultAddress = getContractAddress(chainId, ContractName.RISK_VAULT);
-      if (!vaultAddress) {
-        console.warn('Risk vault not deployed on this chain');
+      const aUSDCAddress = getContractAddress(chainId, ContractName.MOCK_AUSDC);
+      const cUSDTAddress = getContractAddress(chainId, ContractName.MOCK_CUSDT);
+      const pairAddress = getContractAddress(chainId, ContractName.SENIOR_JUNIOR_PAIR);
+      
+      if (!vaultAddress || !aUSDCAddress || !cUSDTAddress || !pairAddress) {
+        console.warn('Some contracts not available on current chain');
         return;
       }
-
+      
+      // Create contract instances
       const vaultContract = new Contract(vaultAddress, RISK_VAULT_ABI, provider);
+      const aUSDCContract = new Contract(aUSDCAddress, ERC20_ABI, provider);
+      const cUSDTContract = new Contract(cUSDTAddress, ERC20_ABI, provider);
+      const pairContract = new Contract(pairAddress, ERC20_ABI, provider);
+      
+      console.log('🚀 Loading initial data...');
       
-      // Get token addresses
-      const [seniorAddr, juniorAddr] = await Promise.all([
+      // Fetch everything in parallel - simple and fast
+      const [
+        seniorAddr,
+        juniorAddr,
+        protocolStatus,
+        phaseInfo,
+        vaultBalances,
+        userTokenBalances,
+        aUSDCBalance,
+        cUSDTBalance,
+        lpBalance,
+      ] = await Promise.all([
         vaultContract.seniorToken(),
         vaultContract.juniorToken(),
+        vaultContract.getProtocolStatus(),
+        vaultContract.getPhaseInfo(),
+        vaultContract.getVaultBalances(),
+        vaultContract.getUserTokenBalances(userAddress),
+        aUSDCContract.balanceOf(userAddress),
+        cUSDTContract.balanceOf(userAddress),
+        pairContract.balanceOf(userAddress),
       ]);
+      
+      console.log('✅ Initial data loaded');
+      
+      // Set all state at once
       setSeniorTokenAddress(seniorAddr);
       setJuniorTokenAddress(juniorAddr);
       
-      // Load balances and vault info
-      await refreshData();
+      setVaultInfo({
+        aUSDCBalance: vaultBalances.aUSDCVaultBalance,
+        cUSDTBalance: vaultBalances.cUSDTVaultBalance,
+        totalTokensIssued: protocolStatus.totalTokens,
+        emergencyMode: protocolStatus.emergency,
+        currentPhase: protocolStatus.phase,
+        phaseStartTime: phaseInfo.phaseStart,
+        cycleStartTime: phaseInfo.cycleStart,
+        timeRemaining: phaseInfo.timeRemaining,
+      });
+      
+      setBalances({
+        seniorTokens: userTokenBalances.seniorBalance,
+        juniorTokens: userTokenBalances.juniorBalance,
+        aUSDC: aUSDCBalance,
+        cUSDT: cUSDTBalance,
+        lpTokens: lpBalance,
+      });
     } catch (error) {
       console.error('Error loading contract data:', error);
       toast.error('Failed to load contract data for this network');
@@ -424,137 +479,80 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     }
   };
 
-  // Refresh all data
+  // Refresh data (simpler version)
   const refreshData = useCallback(async () => {
     if (!provider || !signer || !address || !currentChain) {
-      console.log('⏭️ Skipping refresh - missing provider, signer, address, or currentChain');
       return;
     }
     
-    // Check if network is consistent before proceeding
-    const networkChainId = await provider.getNetwork().then(n => Number(n.chainId)).catch(() => null);
-    if (networkChainId && networkChainId !== currentChain) {
-      console.log(`⚠️ Network mismatch detected: provider=${networkChainId}, context=${currentChain}. Skipping refresh.`);
+    // Simple debouncing
+    const now = Date.now();
+    if (now - lastRefreshTime.current < 500 || isRefreshing.current) {
       return;
     }
     
-    console.log(`🔄 Refreshing data for chain ${currentChain} (${getChainConfig(currentChain)?.chainName})`);
+    isRefreshing.current = true;
+    lastRefreshTime.current = now;
     
     try {
+      // Get contract addresses
       const vaultAddress = getCurrentChainAddress(ContractName.RISK_VAULT);
-      if (!vaultAddress) {
-        console.warn('Risk vault not available on current chain');
-        return;
-      }
-
-      console.log(`📄 Using vault contract at: ${vaultAddress}`);
-      const vaultContract = new Contract(vaultAddress, RISK_VAULT_ABI, provider);
-      
-      // Get vault info with detailed logging
-      console.log('📊 Fetching vault contract data...');
-      let userTokenBalances: any;
-      try {
-        const [
-          protocolStatus,
-          phaseInfo,
-          vaultBalances,
-          userTokenBalancesResult,
-        ] = await Promise.all([
-          vaultContract.getProtocolStatus(),
-          vaultContract.getPhaseInfo(),
-          vaultContract.getVaultBalances(),
-          vaultContract.getUserTokenBalances(address),
-        ]);
-        
-        userTokenBalances = userTokenBalancesResult;
-        console.log('✅ Vault contract data fetched successfully');
-        
-        setVaultInfo({
-          aUSDCBalance: vaultBalances.aUSDCVaultBalance,
-          cUSDTBalance: vaultBalances.cUSDTVaultBalance,
-          totalTokensIssued: protocolStatus.totalTokens,
-          emergencyMode: protocolStatus.emergency,
-          currentPhase: protocolStatus.phase,
-          phaseStartTime: phaseInfo.phaseStart,
-          cycleStartTime: phaseInfo.cycleStart,
-          timeRemaining: phaseInfo.timeRemaining,
-        });
-      } catch (vaultError) {
-        if (vaultError.code === 'NETWORK_ERROR') {
-          console.log('🔄 Network change detected in vault calls, skipping...');
-          return;
-        }
-        if (vaultError.code === 'CALL_EXCEPTION' && currentChain === 296) {
-          console.log('⚠️ Hedera RPC issue detected in vault calls, skipping...');
-          return;
-        }
-        console.error('❌ Vault contract calls failed:', vaultError);
-        throw vaultError;
-      }
-      
-      // Get user token balances
       const aUSDCAddress = getCurrentChainAddress(ContractName.MOCK_AUSDC);
       const cUSDTAddress = getCurrentChainAddress(ContractName.MOCK_CUSDT);
       const pairAddress = getCurrentChainAddress(ContractName.SENIOR_JUNIOR_PAIR);
-
-      if (!aUSDCAddress || !cUSDTAddress || !pairAddress) {
-        console.warn('Some token contracts not available on current chain');
+      
+      if (!vaultAddress || !aUSDCAddress || !cUSDTAddress || !pairAddress) {
         return;
       }
-
-      console.log(`💰 Fetching token balances...`);
-      console.log(`  aUSDC: ${aUSDCAddress}`);
-      console.log(`  cUSDT: ${cUSDTAddress}`);
-      console.log(`  Pair: ${pairAddress}`);
-
+      
+      // Create contract instances
+      const vaultContract = new Contract(vaultAddress, RISK_VAULT_ABI, provider);
       const aUSDCContract = new Contract(aUSDCAddress, ERC20_ABI, provider);
       const cUSDTContract = new Contract(cUSDTAddress, ERC20_ABI, provider);
       const pairContract = new Contract(pairAddress, ERC20_ABI, provider);
       
-      try {
-        const [aUSDCBalance, cUSDTBalance, lpBalance] = await Promise.all([
-          aUSDCContract.balanceOf(address),
-          cUSDTContract.balanceOf(address),
-          pairContract.balanceOf(address),
-        ]);
-        
-        console.log('✅ Token balances fetched successfully');
-        
-        setBalances({
-          seniorTokens: userTokenBalances.seniorBalance,
-          juniorTokens: userTokenBalances.juniorBalance,
-          aUSDC: aUSDCBalance,
-          cUSDT: cUSDTBalance,
-          lpTokens: lpBalance,
-        });
-      } catch (tokenError) {
-        if (tokenError.code === 'NETWORK_ERROR') {
-          console.log('🔄 Network change detected in token calls, skipping...');
-          return;
-        }
-        if (tokenError.code === 'CALL_EXCEPTION' && currentChain === 296) {
-          console.log('⚠️ Hedera RPC issue detected in token calls, skipping...');
-          return;
-        }
-        console.error('❌ Token balance calls failed:', tokenError);
-        throw tokenError;
-      }
-    } catch (error) {
-      if (error.code === 'NETWORK_ERROR') {
-        console.log('🔄 Network change detected in main refresh, skipping...');
-        return;
-      }
-      if (error.code === 'CALL_EXCEPTION' && currentChain === 296) {
-        console.log('⚠️ Hedera RPC rate limiting detected, skipping refresh...');
-        return;
-      }
-      console.error('💥 Error refreshing data on chain', currentChain, ':', error);
-      console.error('Error details:', {
-        message: error.message,
-        code: error.code,
-        reason: error.reason
+      // Fetch all data in parallel (token addresses already loaded, so skip them)
+      const [
+        protocolStatus,
+        phaseInfo,
+        vaultBalances,
+        userTokenBalances,
+        aUSDCBalance,
+        cUSDTBalance,
+        lpBalance,
+      ] = await Promise.all([
+        vaultContract.getProtocolStatus(),
+        vaultContract.getPhaseInfo(),
+        vaultContract.getVaultBalances(),
+        vaultContract.getUserTokenBalances(address),
+        aUSDCContract.balanceOf(address),
+        cUSDTContract.balanceOf(address),
+        pairContract.balanceOf(address),
+      ]);
+      
+      // Update state
+      setVaultInfo({
+        aUSDCBalance: vaultBalances.aUSDCVaultBalance,
+        cUSDTBalance: vaultBalances.cUSDTVaultBalance,
+        totalTokensIssued: protocolStatus.totalTokens,
+        emergencyMode: protocolStatus.emergency,
+        currentPhase: protocolStatus.phase,
+        phaseStartTime: phaseInfo.phaseStart,
+        cycleStartTime: phaseInfo.cycleStart,
+        timeRemaining: phaseInfo.timeRemaining,
+      });
+      
+      setBalances({
+        seniorTokens: userTokenBalances.seniorBalance,
+        juniorTokens: userTokenBalances.juniorBalance,
+        aUSDC: aUSDCBalance,
+        cUSDT: cUSDTBalance,
+        lpTokens: lpBalance,
       });
-      toast.error(`Failed to refresh data on ${getChainConfig(currentChain)?.chainName || 'unknown network'}`);
+    } catch (error) {
+      console.error('Error refreshing data:', error);
+    } finally {
+      isRefreshing.current = false;
     }
   }, [provider, signer, address, currentChain, getCurrentChainAddress]);
 
@@ -1032,7 +1030,7 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     }
   };
 
-  const addLiquidity = async (tokenAAmount: string, tokenBAmount: string, tokenA: string, tokenB: string) => {
+  const stakeRiskTokens = async (tokenAAmount: string, tokenBAmount: string, tokenA: string, tokenB: string) => {
     if (!signer || !address) {
       toast.error('Please connect your wallet');
       return;
@@ -1041,13 +1039,68 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     try {
       const amountADesired = ethers.parseEther(tokenAAmount);
       const amountBDesired = ethers.parseEther(tokenBAmount);
-      const amountAMin = amountADesired * 95n / 100n; // 5% slippage
-      const amountBMin = amountBDesired * 95n / 100n; // 5% slippage
       const deadline = Math.floor(Date.now() / 1000) + 60 * 20; // 20 minutes
 
-      // Approve both tokens
+      // Check token balances first
       const tokenAContract = new Contract(tokenA, ERC20_ABI, signer);
       const tokenBContract = new Contract(tokenB, ERC20_ABI, signer);
+      
+      const balanceA = await tokenAContract.balanceOf(address);
+      const balanceB = await tokenBContract.balanceOf(address);
+
+      // Use actual balance if requested amount is very close (within 0.01% difference)
+      let finalAmountADesired = amountADesired;
+      let finalAmountBDesired = amountBDesired;
+
+      if (balanceA < amountADesired) {
+        const diff = amountADesired - balanceA;
+        const diffPercentage = (diff * 10000n) / amountADesired; // 0.01% = 1 basis point
+        
+        if (diffPercentage <= 1n) { // If difference is <= 0.01%, use available balance
+          finalAmountADesired = balanceA;
+          console.log(`Adjusting tokenA amount from ${ethers.formatEther(amountADesired)} to ${ethers.formatEther(balanceA)} due to precision`);
+        } else {
+          let symbolA = 'Token A';
+          try {
+            symbolA = await tokenAContract.symbol();
+          } catch (e) {
+            if (tokenA === getCurrentChainAddress(ContractName.SENIOR_TOKEN)) {
+              symbolA = 'SENIOR';
+            } else if (tokenA === getCurrentChainAddress(ContractName.JUNIOR_TOKEN)) {
+              symbolA = 'JUNIOR';
+            }
+          }
+          toast.error(`Insufficient ${symbolA} balance. Required: ${ethers.formatEther(amountADesired)}, Available: ${ethers.formatEther(balanceA)}`);
+          return;
+        }
+      }
+
+      if (balanceB < amountBDesired) {
+        const diff = amountBDesired - balanceB;
+        const diffPercentage = (diff * 10000n) / amountBDesired; // 0.01% = 1 basis point
+        
+        if (diffPercentage <= 1n) { // If difference is <= 0.01%, use available balance
+          finalAmountBDesired = balanceB;
+          console.log(`Adjusting tokenB amount from ${ethers.formatEther(amountBDesired)} to ${ethers.formatEther(balanceB)} due to precision`);
+        } else {
+          let symbolB = 'Token B';
+          try {
+            symbolB = await tokenBContract.symbol();
+          } catch (e) {
+            if (tokenB === getCurrentChainAddress(ContractName.SENIOR_TOKEN)) {
+              symbolB = 'SENIOR';
+            } else if (tokenB === getCurrentChainAddress(ContractName.JUNIOR_TOKEN)) {
+              symbolB = 'JUNIOR';
+            }
+          }
+          toast.error(`Insufficient ${symbolB} balance. Required: ${ethers.formatEther(amountBDesired)}, Available: ${ethers.formatEther(balanceB)}`);
+          return;
+        }
+      }
+
+      // Update amounts and slippage calculations with final amounts
+      const amountAMin = finalAmountADesired * 95n / 100n; // 5% slippage
+      const amountBMin = finalAmountBDesired * 95n / 100n; // 5% slippage
 
       const routerAddress = getCurrentChainAddress(ContractName.UNISWAP_V2_ROUTER);
       if (!routerAddress) {
@@ -1058,8 +1111,9 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
       const allowanceA = await tokenAContract.allowance(address, routerAddress);
       const allowanceB = await tokenBContract.allowance(address, routerAddress);
 
-      if (allowanceA < amountADesired) {
-        const approveTx = await tokenAContract.approve(routerAddress, amountADesired);
+      if (allowanceA < finalAmountADesired) {
+        // Approve max amount to avoid future approval transactions
+        const approveTx = await tokenAContract.approve(routerAddress, ethers.MaxUint256);
         let symbolA = 'Token A';
         try {
           symbolA = await tokenAContract.symbol();
@@ -1075,8 +1129,9 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
         await approveTx.wait();
       }
 
-      if (allowanceB < amountBDesired) {
-        const approveTx = await tokenBContract.approve(routerAddress, amountBDesired);
+      if (allowanceB < finalAmountBDesired) {
+        // Approve max amount to avoid future approval transactions
+        const approveTx = await tokenBContract.approve(routerAddress, ethers.MaxUint256);
         let symbolB = 'Token B';
         try {
           symbolB = await tokenBContract.symbol();
@@ -1092,41 +1147,41 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
         await approveTx.wait();
       }
 
-      // Add liquidity
+      // Stake risk tokens
       const router = new Contract(routerAddress, UNISWAP_V2_ROUTER_ABI, signer);
       const tx = await router.addLiquidity(
         tokenA,
         tokenB,
-        amountADesired,
-        amountBDesired,
+        finalAmountADesired,
+        finalAmountBDesired,
         amountAMin,
         amountBMin,
         address,
         deadline,
       );
 
-      toast.info('Adding liquidity...');
+      toast.info('Staking risk tokens...');
       await tx.wait();
-      toast.success('Liquidity added');
+      toast.success('Risk tokens staked');
       
       await refreshData();
     } catch (error: any) {
-      console.error('Failed to add liquidity:', error);
-      toast.error(error.reason || 'Failed to add liquidity');
+      console.error('Failed to stake risk tokens:', error);
+      toast.error(error.reason || 'Failed to stake risk tokens');
     }
   };
 
-  const removeLiquidity = async (lpTokenAmount: string, tokenA: string, tokenB: string) => {
+  const unstakeRiskTokens = async (stakedTokenAmount: string, tokenA: string, tokenB: string) => {
     if (!signer || !address) {
       toast.error('Please connect your wallet');
       return;
     }
 
     try {
-      const lpAmountWei = ethers.parseEther(lpTokenAmount);
+      const stakedAmountWei = ethers.parseEther(stakedTokenAmount);
       const deadline = Math.floor(Date.now() / 1000) + 60 * 20; // 20 minutes
 
-      // Approve LP tokens
+      // Approve staked tokens
       const pairAddress = getCurrentChainAddress(ContractName.SENIOR_JUNIOR_PAIR);
       const routerAddress = getCurrentChainAddress(ContractName.UNISWAP_V2_ROUTER);
 
@@ -1138,32 +1193,32 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
       const pairContract = new Contract(pairAddress, ERC20_ABI, signer);
       const allowance = await pairContract.allowance(address, routerAddress);
 
-      if (allowance < lpAmountWei) {
-        const approveTx = await pairContract.approve(routerAddress, lpAmountWei);
-        toast.info('Approving LP tokens...');
+      if (allowance < stakedAmountWei) {
+        const approveTx = await pairContract.approve(routerAddress, stakedAmountWei);
+        toast.info('Approving Staked tokens...');
         await approveTx.wait();
       }
 
-      // Remove liquidity
+      // Unstake risk tokens
       const router = new Contract(routerAddress, UNISWAP_V2_ROUTER_ABI, signer);
       const tx = await router.removeLiquidity(
         tokenA,
         tokenB,
-        lpAmountWei,
+        stakedAmountWei,
         0, // amountAMin (accept any amount)
         0, // amountBMin (accept any amount)
         address,
         deadline,
       );
 
-      toast.info('Removing liquidity...');
+      toast.info('Unstaking risk tokens...');
       await tx.wait();
-      toast.success('Liquidity removed');
+      toast.success('Risk tokens unstaked');
       
       await refreshData();
     } catch (error: any) {
-      console.error('Failed to remove liquidity:', error);
-      toast.error(error.reason || 'Failed to remove liquidity');
+      console.error('Failed to unstake risk tokens:', error);
+      toast.error(error.reason || 'Failed to unstake risk tokens');
     }
   };
 
@@ -1225,8 +1280,8 @@ const InnerWeb3Provider: React.FC<{ children: ReactNode }> = ({ children }) => {
     swapExactTokensForTokens,
     getAmountsOut,
     getTokenBalance,
-    addLiquidity,
-    removeLiquidity,
+    stakeRiskTokens,
+    unstakeRiskTokens,
     getPairReserves,
   };
 
diff --git a/frontend/src/hooks/use-toast.ts b/frontend/src/hooks/use-toast.ts
index 6ecbae0..8af9735 100644
--- a/frontend/src/hooks/use-toast.ts
+++ b/frontend/src/hooks/use-toast.ts
@@ -1,3 +1,3 @@
 import { toast } from "@/components/ui/sonner";
 
-export { toast };
+export { toast };
\ No newline at end of file
diff --git a/frontend/src/hooks/usePortfolioCalculations.ts b/frontend/src/hooks/usePortfolioCalculations.ts
new file mode 100644
index 0000000..143ecd5
--- /dev/null
+++ b/frontend/src/hooks/usePortfolioCalculations.ts
@@ -0,0 +1,54 @@
+import { useWeb3 } from '@/context/PrivyWeb3Context';
+import { ethers } from 'ethers';
+
+export const usePortfolioCalculations = (seniorPrice: string, juniorPrice: string) => {
+  const { balances, vaultInfo } = useWeb3();
+
+  const formatTokenAmount = (amount: bigint) => ethers.formatEther(amount);
+  const formatNumber = (num: number, decimals = 2) => num.toFixed(decimals);
+
+  // Calculated values
+  const seniorBalance = Number(formatTokenAmount(balances.seniorTokens));
+  const juniorBalance = Number(formatTokenAmount(balances.juniorTokens));
+  const aUSDCBalance = Number(formatTokenAmount(balances.aUSDC));
+  const cUSDTBalance = Number(formatTokenAmount(balances.cUSDT));
+  const lpBalance = Number(formatTokenAmount(balances.lpTokens));
+
+  const totalPortfolioValue =
+    (seniorBalance * parseFloat(seniorPrice)) +
+    (juniorBalance * parseFloat(juniorPrice));
+
+  const protocolTVL = (Number(vaultInfo.aUSDCBalance) + Number(vaultInfo.cUSDTBalance)) / 1e18;
+  const userSharePercent = vaultInfo.totalTokensIssued > 0n
+    ? ((seniorBalance + juniorBalance) / (Number(vaultInfo.totalTokensIssued) / 1e18) * 100)
+    : 0;
+
+  // Risk Assessment
+  const getRiskProfile = () => {
+    const totalTokens = seniorBalance + juniorBalance;
+    if (totalTokens === 0) return { level: 'None', color: 'slate', percentage: 0 };
+
+    const seniorRatio = seniorBalance / totalTokens;
+    if (seniorRatio >= 0.8) return { level: 'Conservative', color: 'blue', percentage: seniorRatio * 100 };
+    if (seniorRatio >= 0.6) return { level: 'Moderate', color: 'purple', percentage: seniorRatio * 100 };
+    if (seniorRatio >= 0.4) return { level: 'Balanced', color: 'green', percentage: seniorRatio * 100 };
+    if (seniorRatio >= 0.2) return { level: 'Growth', color: 'yellow', percentage: seniorRatio * 100 };
+    return { level: 'Aggressive', color: 'red', percentage: seniorRatio * 100 };
+  };
+
+  const riskProfile = getRiskProfile();
+
+  return {
+    formatTokenAmount,
+    formatNumber,
+    seniorBalance,
+    juniorBalance,
+    aUSDCBalance,
+    cUSDTBalance,
+    lpBalance,
+    totalPortfolioValue,
+    protocolTVL,
+    userSharePercent,
+    riskProfile,
+  };
+};
\ No newline at end of file
diff --git a/frontend/src/hooks/usePricing.ts b/frontend/src/hooks/usePricing.ts
new file mode 100644
index 0000000..9791695
--- /dev/null
+++ b/frontend/src/hooks/usePricing.ts
@@ -0,0 +1,103 @@
+import { useState, useEffect } from 'react';
+import { useWeb3 } from '@/context/PrivyWeb3Context';
+import { ContractName, getContractAddress } from '@/config/contracts';
+import { ethers } from 'ethers';
+
+export const usePricing = () => {
+  const {
+    seniorTokenAddress,
+    juniorTokenAddress,
+    getAmountsOut,
+    getPairReserves,
+    currentChain,
+  } = useWeb3();
+
+  const [seniorPrice, setSeniorPrice] = useState('1.00');
+  const [juniorPrice, setJuniorPrice] = useState('1.00');
+  const [poolReserves, setPoolReserves] = useState({ senior: '0', junior: '0' });
+
+  useEffect(() => {
+    const fetchTokenPrices = async () => {
+      if (!seniorTokenAddress || !juniorTokenAddress || !getAmountsOut || !currentChain) return;
+      
+      try {
+        // Get pool reserves to calculate proper AMM pricing
+        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
+        const reserves = await getPairReserves(pairAddress);
+        const seniorReserve = parseFloat(ethers.formatEther(reserves.reserve0));
+        const juniorReserve = parseFloat(ethers.formatEther(reserves.reserve1));
+        
+        // Calculate prices directly from Uniswap AMM reserves
+        const seniorPriceInJunior = juniorReserve / seniorReserve;
+        const juniorPriceInSenior = seniorReserve / juniorReserve;
+        
+        try {
+          // Get price of 1 SENIOR in terms of JUNIOR
+          const seniorToJuniorPath = [seniorTokenAddress, juniorTokenAddress];
+          const seniorPrice1Unit = await getAmountsOut('1', seniorToJuniorPath);
+          
+          // Get price of 1 JUNIOR in terms of SENIOR
+          const juniorToSeniorPath = [juniorTokenAddress, seniorTokenAddress];
+          const juniorPrice1Unit = await getAmountsOut('1', juniorToSeniorPath);
+          
+          setSeniorPrice(parseFloat(seniorPrice1Unit).toFixed(2));
+          setJuniorPrice(parseFloat(juniorPrice1Unit).toFixed(2));
+        } catch (error) {
+          console.error('Error getting AMM prices:', error);
+          // Fallback to reserve-based calculation
+          setSeniorPrice(seniorPriceInJunior.toFixed(2));
+          setJuniorPrice(juniorPriceInSenior.toFixed(2));
+        }
+      } catch (error) {
+        console.error('Error fetching token prices:', error);
+        setSeniorPrice('1.00');
+        setJuniorPrice('1.00');
+      }
+    };
+
+    const fetchPoolReserves = async () => {
+      if (!getPairReserves || !currentChain) return;
+      
+      try {
+        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
+        const reserves = await getPairReserves(pairAddress);
+        
+        const seniorReserve = ethers.formatEther(reserves.reserve0);
+        const juniorReserve = ethers.formatEther(reserves.reserve1);
+        
+        // Only update if values have changed significantly
+        const currentSenior = parseFloat(poolReserves.senior);
+        const currentJunior = parseFloat(poolReserves.junior);
+        const newSenior = parseFloat(seniorReserve);
+        const newJunior = parseFloat(juniorReserve);
+        
+        if (Math.abs(currentSenior - newSenior) > 0.01 || Math.abs(currentJunior - newJunior) > 0.01) {
+          setPoolReserves({
+            senior: seniorReserve,
+            junior: juniorReserve,
+          });
+        }
+      } catch (error) {
+        console.error('Error fetching pool reserves:', error);
+        if (poolReserves.senior === '0' && poolReserves.junior === '0') {
+          setPoolReserves({ senior: '0', junior: '0' });
+        }
+      }
+    };
+
+    fetchTokenPrices();
+    fetchPoolReserves();
+    const interval = setInterval(() => {
+      fetchTokenPrices();
+      fetchPoolReserves();
+    }, 30000);
+    
+    return () => clearInterval(interval);
+  }, [seniorTokenAddress, juniorTokenAddress, getAmountsOut, getPairReserves, currentChain, poolReserves.senior, poolReserves.junior]);
+
+  return {
+    seniorPrice,
+    juniorPrice,
+    poolReserves,
+  };
+};
\ No newline at end of file
diff --git a/frontend/src/pages/Admin.tsx b/frontend/src/pages/Admin.tsx
index 773aef9..3403015 100644
--- a/frontend/src/pages/Admin.tsx
+++ b/frontend/src/pages/Admin.tsx
@@ -143,34 +143,21 @@ const Admin = () => {
               <div className="p-4 bg-slate-700/50 rounded-lg backdrop-blur-sm">
                 <p className="text-sm text-slate-400 mb-2">Phase Progression:</p>
                 <div className="flex items-center space-x-2 text-sm">
-                  <span className={vaultInfo.currentPhase === Phase.DEPOSIT ? 'font-bold text-white' : 'text-slate-300'}>
-                    Deposit (2d)
+                  <span className={Number(vaultInfo.currentPhase) === Phase.ACTIVE ? 'font-bold text-white' : 'text-slate-300'}>
+                    Active Period (5d)
                   </span>
                   <span className="text-slate-400">→</span>
-                  <span className={vaultInfo.currentPhase === Phase.COVERAGE ? 'font-bold text-white' : 'text-slate-300'}>
-                    Coverage (3d)
+                  <span className={Number(vaultInfo.currentPhase) === Phase.CLAIMS ? 'font-bold text-white' : 'text-slate-300'}>
+                    Claims Period (1d)
                   </span>
                   <span className="text-slate-400">→</span>
-                  <span className={vaultInfo.currentPhase === Phase.CLAIMS ? 'font-bold text-white' : 'text-slate-300'}>
-                    Claims (1d)
-                  </span>
-                  <span className="text-slate-400">→</span>
-                  <span className={vaultInfo.currentPhase === Phase.FINAL_CLAIMS ? 'font-bold text-white' : 'text-slate-300'}>
-                    Final Claims (1d)
+                  <span className={Number(vaultInfo.currentPhase) === Phase.FINAL_CLAIMS ? 'font-bold text-white' : 'text-slate-300'}>
+                    Final Claims Period (1d)
                   </span>
                 </div>
               </div>
 
               <div className="space-y-2">
-                <Button
-                  onClick={forcePhaseTransition}
-                  variant="outline"
-                  className="w-full bg-slate-700 hover:bg-slate-600 text-white border-slate-600 hover:border-slate-500"
-                >
-                  <RefreshCw className="mr-2 h-4 w-4" />
-                  Force Phase Transition (Time Check)
-                </Button>
-                
                 <Button
                   onClick={forcePhaseTransitionImmediate}
                   variant="outline"
@@ -180,7 +167,21 @@ const Admin = () => {
                   Force Phase Transition (Immediate)
                 </Button>
 
-                {vaultInfo.currentPhase === Phase.FINAL_CLAIMS && (
+                <Button
+                  onClick={startNewCycle}
+                  variant="default"
+                  disabled={Number(vaultInfo.currentPhase) !== Phase.FINAL_CLAIMS}
+                  className={`w-full ${
+                    Number(vaultInfo.currentPhase) === Phase.FINAL_CLAIMS
+                      ? 'bg-gradient-to-r from-green-600 to-teal-600 hover:from-green-700 hover:to-teal-700'
+                      : 'bg-slate-600 cursor-not-allowed opacity-50'
+                  }`}
+                >
+                  <PlayCircle className="mr-2 h-4 w-4" />
+                  Restart Cycle
+                </Button>
+
+                {Number(vaultInfo.currentPhase) === Phase.FINAL_CLAIMS && (
                   <Button
                     onClick={startNewCycle}
                     variant="default"
@@ -192,10 +193,10 @@ const Admin = () => {
                 )}
               </div>
 
-              {vaultInfo.currentPhase !== Phase.FINAL_CLAIMS && (
+              {Number(vaultInfo.currentPhase) !== Phase.FINAL_CLAIMS && (
                 <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
                   <AlertDescription>
-                    New cycles can only be started from the Final Claims phase
+                    Cycle restart is only available from the Final Claims phase
                   </AlertDescription>
                 </Alert>
               )}
diff --git a/frontend/src/pages/Advanced.tsx b/frontend/src/pages/Advanced.tsx
deleted file mode 100644
index 7286098..0000000
--- a/frontend/src/pages/Advanced.tsx
+++ /dev/null
@@ -1,939 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useWeb3 } from '@/context/PrivyWeb3Context';
-import Navbar from '@/components/Navbar';
-import PhaseDisplay from '@/components/PhaseDisplay';
-import Trade from '@/components/Trade';
-import SmartLiquiditySuggestion from '@/components/SmartLiquiditySuggestion';
-import StatCard from '@/components/StatCard';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import { Info, DollarSign, Coins, Shield, AlertCircle, RefreshCw, Droplets, Minus, Activity, Settings, BarChart3 } from 'lucide-react';
-import { Phase, ContractName, getContractAddress, SupportedChainId } from '@/config/contracts';
-import { ethers } from 'ethers';
-
-const Advanced = () => {
-  const {
-    isConnected,
-    balances,
-    vaultInfo,
-    depositAsset,
-    withdraw,
-    emergencyWithdraw,
-    getAmountsOut,
-    seniorTokenAddress,
-    juniorTokenAddress,
-    addLiquidity,
-    removeLiquidity,
-    getPairReserves,
-    currentChain,
-    isUnsupportedChain,
-  } = useWeb3();
-
-  const [depositAmount, setDepositAmount] = useState('');
-  const [depositAssetType, setDepositAssetType] = useState<'aUSDC' | 'cUSDT'>('aUSDC');
-  const [emergencyAmount, setEmergencyAmount] = useState('');
-  const [preferredAsset, setPreferredAsset] = useState<'aUSDC' | 'cUSDT'>('aUSDC');
-  const [seniorPrice, setSeniorPrice] = useState('0.98');
-  const [juniorPrice, setJuniorPrice] = useState('1.05');
-  const [pricesLoading, setPricesLoading] = useState(false);
-  
-  // Pool reserves state
-  const [poolReserves, setPoolReserves] = useState({ senior: '0', junior: '0' });
-  
-  // Liquidity management state
-  const [liquiditySeniorAmount, setLiquiditySeniorAmount] = useState('');
-  const [liquidityJuniorAmount, setLiquidityJuniorAmount] = useState('');
-  const [removeLiquidityAmount, setRemoveLiquidityAmount] = useState('');
-  const [showLiquiditySuggestion, setShowLiquiditySuggestion] = useState(false);
-  const [liquidityMode, setLiquidityMode] = useState<'manual' | 'optimal'>('optimal');
-  
-  // New redemption state
-  const [selectedWithdrawAsset, setSelectedWithdrawAsset] = useState<'aUSDC' | 'cUSDT' | null>(null);
-  const [withdrawAssetAmount, setWithdrawAssetAmount] = useState('');
-  const [calculatedTokenAmounts, setCalculatedTokenAmounts] = useState({ senior: '0', junior: '0' });
-  const [effectivePhase, setEffectivePhase] = useState<Phase>(Phase.DEPOSIT);
-
-  // Format token amounts for display
-  const formatTokenAmount = (amount: bigint) => {
-    return ethers.formatEther(amount);
-  };
-
-  // Fetch token prices and pool reserves from Uniswap pair
-  useEffect(() => {
-    const fetchTokenPrices = async () => {
-      if (!seniorTokenAddress || !juniorTokenAddress || !getAmountsOut || !currentChain) return;
-      
-      setPricesLoading(true);
-      try {
-        // Get pool reserves to calculate proper AMM pricing
-        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
-        const reserves = await getPairReserves(pairAddress);
-        const seniorReserve = parseFloat(ethers.formatEther(reserves.reserve0));
-        const juniorReserve = parseFloat(ethers.formatEther(reserves.reserve1));
-        
-        // Calculate prices directly from Uniswap AMM reserves
-        // In a Uniswap pair, price = other_reserve / this_reserve
-        const seniorPriceInJunior = juniorReserve / seniorReserve;
-        const juniorPriceInSenior = seniorReserve / juniorReserve;
-        
-        // For USD pricing, we need to establish a base.
-        // Let's use getAmountsOut to get actual market prices
-        try {
-          // Get price of 1 SENIOR in terms of JUNIOR
-          const seniorToJuniorPath = [seniorTokenAddress, juniorTokenAddress];
-          const seniorPrice1Unit = await getAmountsOut('1', seniorToJuniorPath);
-          
-          // Get price of 1 JUNIOR in terms of SENIOR
-          const juniorToSeniorPath = [juniorTokenAddress, seniorTokenAddress];
-          const juniorPrice1Unit = await getAmountsOut('1', juniorToSeniorPath);
-          
-          setSeniorPrice(parseFloat(seniorPrice1Unit).toFixed(2));
-          setJuniorPrice(parseFloat(juniorPrice1Unit).toFixed(2));
-        } catch (error) {
-          console.error('Error getting AMM prices:', error);
-          // Fallback to reserve-based calculation
-          setSeniorPrice(seniorPriceInJunior.toFixed(2));
-          setJuniorPrice(juniorPriceInSenior.toFixed(2));
-        }
-      } catch (error) {
-        console.error('Error fetching token prices:', error);
-        // Keep default prices on error (equal weighting)
-        setSeniorPrice('1.00');
-        setJuniorPrice('1.00');
-      } finally {
-        setPricesLoading(false);
-      }
-    };
-
-    const fetchPoolReserves = async () => {
-      if (!getPairReserves || !currentChain) return;
-      
-      try {
-        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
-        const reserves = await getPairReserves(pairAddress);
-        
-        // Format reserves from wei to ether
-        const seniorReserve = ethers.formatEther(reserves.reserve0);
-        const juniorReserve = ethers.formatEther(reserves.reserve1);
-        
-        // Only update if values have changed significantly (avoid micro-updates)
-        const currentSenior = parseFloat(poolReserves.senior);
-        const currentJunior = parseFloat(poolReserves.junior);
-        const newSenior = parseFloat(seniorReserve);
-        const newJunior = parseFloat(juniorReserve);
-        
-        if (Math.abs(currentSenior - newSenior) > 0.01 || Math.abs(currentJunior - newJunior) > 0.01) {
-          setPoolReserves({
-            senior: seniorReserve,
-            junior: juniorReserve,
-          });
-        }
-      } catch (error) {
-        console.error('Error fetching pool reserves:', error);
-        // Only reset if we don't have valid data
-        if (poolReserves.senior === '0' && poolReserves.junior === '0') {
-          setPoolReserves({ senior: '0', junior: '0' });
-        }
-      }
-    };
-
-    fetchTokenPrices();
-    fetchPoolReserves();
-    const interval = setInterval(() => {
-      fetchTokenPrices();
-      fetchPoolReserves();
-    }, 30000); // Update every 30 seconds to reduce twitching
-    
-    return () => clearInterval(interval);
-  }, [seniorTokenAddress, juniorTokenAddress, getAmountsOut, getPairReserves, currentChain]);
-
-
-  // Calculate optimal token amounts when user selects asset and amount
-  useEffect(() => {
-    const calculateOptimalTokens = () => {
-      if (!selectedWithdrawAsset || !withdrawAssetAmount || parseFloat(withdrawAssetAmount) <= 0) {
-        setCalculatedTokenAmounts({ senior: '0', junior: '0' });
-        return;
-      }
-
-      const targetAmount = parseFloat(withdrawAssetAmount);
-      const seniorBalance = parseFloat(formatTokenAmount(balances.seniorTokens));
-      const juniorBalance = parseFloat(formatTokenAmount(balances.juniorTokens));
-
-      let seniorToUse = 0;
-      let juniorToUse = 0;
-
-      // Handle case where phase is not loaded yet - default to DEPOSIT phase logic
-      // Convert bigint to number for comparison
-      const currentPhase = vaultInfo.currentPhase !== undefined ? Number(vaultInfo.currentPhase) : Phase.DEPOSIT;
-      setEffectivePhase(currentPhase);
-
-      if (currentPhase === Phase.DEPOSIT) {
-        // Deposit phase: equal amounts required  
-        const requiredPerToken = targetAmount / 2; // Each token contributes half
-        const maxPossible = Math.min(seniorBalance, juniorBalance);
-        const actualPerToken = Math.min(requiredPerToken, maxPossible);
-        seniorToUse = actualPerToken;
-        juniorToUse = actualPerToken;
-      } else if (currentPhase === Phase.CLAIMS) {
-        // Claims phase: senior tokens only
-        seniorToUse = Math.min(targetAmount, seniorBalance);
-        juniorToUse = 0;
-      } else {
-        // Other phases: prefer junior tokens first
-        if (juniorBalance >= targetAmount) {
-          juniorToUse = targetAmount;
-          seniorToUse = 0;
-        } else {
-          juniorToUse = juniorBalance;
-          seniorToUse = Math.min(targetAmount - juniorBalance, seniorBalance);
-        }
-      }
-
-      setCalculatedTokenAmounts({
-        senior: seniorToUse.toFixed(6),
-        junior: juniorToUse.toFixed(6),
-      });
-    };
-
-    calculateOptimalTokens();
-  }, [selectedWithdrawAsset, withdrawAssetAmount, balances.seniorTokens, balances.juniorTokens, vaultInfo.currentPhase]);
-
-  const handleDeposit = async () => {
-    if (!depositAmount || parseFloat(depositAmount) <= 0) return;
-    await depositAsset(depositAssetType, depositAmount);
-    setDepositAmount('');
-  };
-
-
-  const handleOptimalWithdraw = async () => {
-    if (!selectedWithdrawAsset || !withdrawAssetAmount || parseFloat(withdrawAssetAmount) <= 0) return;
-    
-    const { senior, junior } = calculatedTokenAmounts;
-    if (parseFloat(senior) <= 0 && parseFloat(junior) <= 0) return;
-    
-    await withdraw(senior, junior);
-    setSelectedWithdrawAsset(null);
-    setWithdrawAssetAmount('');
-    setCalculatedTokenAmounts({ senior: '0', junior: '0' });
-  };
-
-  const handleEmergencyWithdraw = async () => {
-    if (!emergencyAmount || parseFloat(emergencyAmount) <= 0) return;
-    await emergencyWithdraw(emergencyAmount, preferredAsset);
-    setEmergencyAmount('');
-  };
-
-  const handleAddLiquidity = async () => {
-    if (!liquiditySeniorAmount || !liquidityJuniorAmount || !seniorTokenAddress || !juniorTokenAddress) return;
-    if (parseFloat(liquiditySeniorAmount) <= 0 || parseFloat(liquidityJuniorAmount) <= 0) return;
-    
-    await addLiquidity(liquiditySeniorAmount, liquidityJuniorAmount, seniorTokenAddress, juniorTokenAddress);
-    setLiquiditySeniorAmount('');
-    setLiquidityJuniorAmount('');
-    setShowLiquiditySuggestion(false);
-  };
-
-  const handleOptimalLiquidity = () => {
-    const seniorBalance = parseFloat(formatTokenAmount(balances.seniorTokens));
-    const juniorBalance = parseFloat(formatTokenAmount(balances.juniorTokens));
-    const poolSenior = parseFloat(poolReserves.senior);
-    const poolJunior = parseFloat(poolReserves.junior);
-    
-    if (poolSenior > 0 && poolJunior > 0) {
-      // Calculate optimal amounts based on pool ratio
-      const poolRatio = poolSenior / poolJunior;
-      const userRatio = seniorBalance / juniorBalance;
-      
-      let optimalSenior: number, optimalJunior: number;
-      
-      if (userRatio > poolRatio) {
-        // User has more senior relative to pool ratio
-        optimalJunior = juniorBalance;
-        optimalSenior = Math.min(optimalJunior * poolRatio, seniorBalance);
-      } else {
-        // User has more junior relative to pool ratio
-        optimalSenior = seniorBalance;
-        optimalJunior = Math.min(optimalSenior / poolRatio, juniorBalance);
-      }
-      
-      setLiquiditySeniorAmount(optimalSenior.toFixed(6));
-      setLiquidityJuniorAmount(optimalJunior.toFixed(6));
-    } else {
-      // If no pool reserves, use equal amounts
-      const maxAmount = Math.min(seniorBalance, juniorBalance);
-      setLiquiditySeniorAmount(maxAmount.toFixed(6));
-      setLiquidityJuniorAmount(maxAmount.toFixed(6));
-    }
-  };
-
-
-  const handleRemoveLiquidity = async () => {
-    if (!removeLiquidityAmount || !seniorTokenAddress || !juniorTokenAddress) return;
-    if (parseFloat(removeLiquidityAmount) <= 0) return;
-    
-    await removeLiquidity(removeLiquidityAmount, seniorTokenAddress, juniorTokenAddress);
-    setRemoveLiquidityAmount('');
-  };
-
-  // Calculate total portfolio value based on risk token holdings and current market prices
-  const seniorTokenAmount = parseFloat(formatTokenAmount(balances.seniorTokens));
-  const juniorTokenAmount = parseFloat(formatTokenAmount(balances.juniorTokens));
-  
-  const totalPortfolioValue = 
-    (seniorTokenAmount * parseFloat(seniorPrice)) +
-    (juniorTokenAmount * parseFloat(juniorPrice));
-
-  return (
-    <div className="min-h-screen bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
-      {/* Animated background elements */}
-      <div className="absolute inset-0 overflow-hidden">
-        <div className="absolute -top-40 -right-40 w-80 h-80 bg-blue-500/10 rounded-full blur-3xl animate-pulse"></div>
-        <div className="absolute top-40 -left-40 w-80 h-80 bg-purple-500/10 rounded-full blur-3xl animate-pulse delay-1000"></div>
-        <div className="absolute bottom-40 right-20 w-60 h-60 bg-green-500/10 rounded-full blur-3xl animate-pulse delay-2000"></div>
-      </div>
-      
-      <Navbar />
-
-      <div className="relative z-10 container mx-auto px-6 py-8">
-        <div className="mb-8">
-          <div className="flex items-center justify-between">
-            <div>
-              <h1 className="text-3xl font-bold text-white mb-2 flex items-center">
-                <Settings className="w-8 h-8 mr-3 text-purple-400" />
-                Advanced Trading
-              </h1>
-              <p className="text-slate-300">
-                Complete control over protocol operations, manual trading, and liquidity management
-              </p>
-            </div>
-            <div className="flex items-center text-slate-400 text-sm">
-              <RefreshCw className={`w-4 h-4 mr-2 ${pricesLoading ? 'animate-spin' : ''}`} />
-              Real-time data
-            </div>
-          </div>
-        </div>
-
-        {/* Connection Status */}
-        {!isConnected && (
-          <Alert className="mb-6 bg-slate-800/50 border-slate-700 text-slate-300">
-            <AlertCircle className="h-4 w-4" />
-            <AlertDescription>
-              Please connect your wallet to interact with advanced protocol features
-            </AlertDescription>
-          </Alert>
-        )}
-
-        {/* Phase Display */}
-        <div className="mb-8">
-          <PhaseDisplay />
-        </div>
-
-        {/* Advanced Portfolio Overview */}
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6 mb-8">
-          <StatCard
-            title="Portfolio Value"
-            value={`$${totalPortfolioValue.toFixed(2)}`}
-            icon={<DollarSign className="h-5 w-5" />}
-            description={`${seniorTokenAmount.toFixed(2)} SENIOR + ${juniorTokenAmount.toFixed(2)} JUNIOR`}
-            className="transition-all duration-300"
-          />
-          <StatCard
-            title="SENIOR Price"
-            value={`$${seniorPrice}`}
-            icon={<Shield className="h-5 w-5" />}
-            description="Priority claims token"
-            className="transition-all duration-300"
-          />
-          <StatCard
-            title="JUNIOR Price"
-            value={`$${juniorPrice}`}
-            icon={<Coins className="h-5 w-5" />}
-            description="Higher yield token"
-            className="transition-all duration-300"
-          />
-          <StatCard
-            title="Pool Liquidity"
-            value={poolReserves.senior === '0' && poolReserves.junior === '0' ? 'Loading...' : `$${((parseFloat(poolReserves.senior)) + (parseFloat(poolReserves.junior))).toLocaleString('en-US', { maximumFractionDigits: 0 })}`}
-            icon={<Activity className="h-5 w-5" />}
-            description={`${(parseFloat(poolReserves.senior) / 1000).toFixed(3)}K SENIOR / ${(parseFloat(poolReserves.junior) / 1000).toFixed(3)}K JUNIOR`}
-            className="transition-all duration-300"
-          />
-        </div>
-
-        {/* Manual Risk Trading */}
-        <div className="mb-8">
-          <Trade />
-        </div>
-
-        {/* Advanced Protocol Actions */}
-        <div className="mb-8">
-          <div className="flex justify-between items-center mb-4">
-            <h2 className="text-xl font-semibold text-white flex items-center">
-              <BarChart3 className="w-6 h-6 mr-2" />
-              Advanced Protocol Actions
-            </h2>
-          </div>
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-            {/* Issue Risk Tokens */}
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white">Issue Risk Tokens</CardTitle>
-                <CardDescription className="text-slate-300">
-                  Deposit assets to receive CM-SENIOR and CM-JUNIOR tokens
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                {Number(vaultInfo.currentPhase) !== Phase.DEPOSIT ? (
-                  <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-                    <AlertCircle className="h-4 w-4" />
-                    <AlertDescription>
-                      Deposits are only allowed during the Deposit phase. Current phase: {Phase[vaultInfo.currentPhase]}
-                    </AlertDescription>
-                  </Alert>
-                ) : (
-                  <>
-                    <div>
-                      <Label className="text-slate-300 mb-3 block">Select Asset</Label>
-                      <div className="grid grid-cols-2 gap-3">
-                        <button
-                          onClick={() => setDepositAssetType('aUSDC')}
-                          className={`p-3 rounded-lg border transition-all ${
-                            depositAssetType === 'aUSDC'
-                              ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                              : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                          }`}
-                        >
-                          <div className="text-center">
-                            <div className="font-semibold">aUSDC</div>
-                            <div className="text-sm opacity-80">Balance: {formatTokenAmount(balances.aUSDC)}</div>
-                          </div>
-                        </button>
-                        <button
-                          onClick={() => setDepositAssetType('cUSDT')}
-                          className={`p-3 rounded-lg border transition-all ${
-                            depositAssetType === 'cUSDT'
-                              ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                              : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                          }`}
-                        >
-                          <div className="text-center">
-                            <div className="font-semibold">cUSDT</div>
-                            <div className="text-sm opacity-80">Balance: {formatTokenAmount(balances.cUSDT)}</div>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                    <div>
-                      <Label htmlFor="deposit-amount" className="text-slate-300">Amount</Label>
-                      <Input
-                        id="deposit-amount"
-                        type="number"
-                        placeholder="0.0"
-                        value={depositAmount}
-                        onChange={(e) => setDepositAmount(e.target.value)}
-                        disabled={!isConnected}
-                        className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                      />
-                    </div>
-                    <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-                      <Info className="h-4 w-4" />
-                      <AlertDescription>
-                        You will receive {depositAmount ? (parseFloat(depositAmount) / 2) : '0'} CM-SENIOR and {depositAmount ? (parseFloat(depositAmount) / 2) : '0'} CM-JUNIOR tokens
-                      </AlertDescription>
-                    </Alert>
-                    <Button 
-                      onClick={handleDeposit} 
-                      disabled={!isConnected || !depositAmount || parseFloat(depositAmount) <= 0 || Number(vaultInfo.currentPhase) !== Phase.DEPOSIT}
-                      className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
-                    >
-                      Deposit {depositAssetType}
-                    </Button>
-                  </>
-                )}
-              </CardContent>
-            </Card>
-
-            {/* Optimal Asset Redemption */}
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white">Optimal Asset Redemption</CardTitle>
-                <CardDescription className="text-slate-300">
-                  Choose target asset and amount - system calculates optimal token usage
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                {/* Asset Selection */}
-                <div>
-                  <Label className="text-slate-300 mb-3 block">Target Asset</Label>
-                  <div className="grid grid-cols-2 gap-3">
-                    <button
-                      onClick={() => setSelectedWithdrawAsset('aUSDC')}
-                      className={`p-3 rounded-lg border transition-all ${
-                        selectedWithdrawAsset === 'aUSDC'
-                          ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                          : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                      }`}
-                    >
-                      <div className="text-center">
-                        <div className="font-semibold">aUSDC</div>
-                        <div className="text-sm opacity-80">Aave USDC</div>
-                      </div>
-                    </button>
-                    <button
-                      onClick={() => setSelectedWithdrawAsset('cUSDT')}
-                      className={`p-3 rounded-lg border transition-all ${
-                        selectedWithdrawAsset === 'cUSDT'
-                          ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                          : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                      }`}
-                    >
-                      <div className="text-center">
-                        <div className="font-semibold">cUSDT</div>
-                        <div className="text-sm opacity-80">Compound USDT</div>
-                      </div>
-                    </button>
-                  </div>
-                </div>
-
-                {/* Amount Input */}
-                {selectedWithdrawAsset && (
-                  <div>
-                    <Label htmlFor="withdraw-amount" className="text-slate-300">
-                      Target Amount ({selectedWithdrawAsset})
-                    </Label>
-                    <Input
-                      id="withdraw-amount"
-                      type="number"
-                      placeholder="0.0"
-                      value={withdrawAssetAmount}
-                      onChange={(e) => setWithdrawAssetAmount(e.target.value)}
-                      disabled={!isConnected}
-                      className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                    />
-                  </div>
-                )}
-
-                {/* Automatic Token Allocation Display */}
-                {selectedWithdrawAsset && withdrawAssetAmount && parseFloat(withdrawAssetAmount) > 0 && (
-                  <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-                    <Info className="h-4 w-4" />
-                    <AlertDescription>
-                      <div className="space-y-2">
-                        <div className="font-semibold">Optimal Token Allocation:</div>
-                        <div className="text-sm space-y-1">
-                          <div>Senior Tokens: {calculatedTokenAmounts.senior}</div>
-                          <div>Junior Tokens: {calculatedTokenAmounts.junior}</div>
-                          <div className="text-xs text-slate-400 mt-2">
-                            {effectivePhase === Phase.DEPOSIT
-                              ? 'Deposit phase: Using equal amounts of senior and junior tokens'
-                              : effectivePhase === Phase.CLAIMS
-                              ? 'Claims phase: Using senior tokens only'
-                              : 'Using max junior tokens first, then senior tokens'}
-                          </div>
-                        </div>
-                      </div>
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                <Button 
-                  onClick={handleOptimalWithdraw} 
-                  disabled={!isConnected || !selectedWithdrawAsset || !withdrawAssetAmount || parseFloat(withdrawAssetAmount) <= 0}
-                  className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
-                >
-                  Redeem Optimally
-                </Button>
-              </CardContent>
-            </Card>
-
-            {/* Add Liquidity */}
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white flex items-center">
-                  <Droplets className="w-5 h-5 mr-2" />
-                  Add Liquidity
-                </CardTitle>
-                <CardDescription className="text-slate-300">
-                  Provide liquidity to earn trading fees. Choose optimal or manual mode.
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                {/* Mode Selection */}
-                <div>
-                  <Label className="text-slate-300 mb-3 block">Liquidity Mode</Label>
-                  <div className="grid grid-cols-2 gap-3">
-                    <button
-                      onClick={() => setLiquidityMode('optimal')}
-                      className={`p-3 rounded-lg border transition-all ${
-                        liquidityMode === 'optimal'
-                          ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                          : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                      }`}
-                    >
-                      <div className="text-center">
-                        <div className="font-semibold">Optimal</div>
-                        <div className="text-sm opacity-80">Auto-calculate amounts</div>
-                      </div>
-                    </button>
-                    <button
-                      onClick={() => setLiquidityMode('manual')}
-                      className={`p-3 rounded-lg border transition-all ${
-                        liquidityMode === 'manual'
-                          ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                          : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                      }`}
-                    >
-                      <div className="text-center">
-                        <div className="font-semibold">Manual</div>
-                        <div className="text-sm opacity-80">Set custom amounts</div>
-                      </div>
-                    </button>
-                  </div>
-                </div>
-
-                {liquidityMode === 'optimal' ? (
-                  <div className="space-y-4">
-                    {/* Available Tokens Display */}
-                    <div className="p-4 bg-slate-700/30 rounded-lg border border-slate-600">
-                      <div className="flex items-center justify-between">
-                        <div>
-                          <p className="text-white font-medium">Available tokens:</p>
-                          <p className="text-slate-300 text-sm">
-                            {seniorTokenAmount.toFixed(4)} SENIOR + {juniorTokenAmount.toFixed(4)} JUNIOR
-                          </p>
-                          <p className="text-slate-300 text-xs opacity-80">
-                            Will add optimal amounts to match pool ratio
-                          </p>
-                        </div>
-                      </div>
-                    </div>
-
-                    {/* Quick Actions */}
-                    <div className="space-y-3">
-                      <Button
-                        onClick={handleOptimalLiquidity}
-                        disabled={!isConnected || (seniorTokenAmount <= 0 && juniorTokenAmount <= 0)}
-                        className="w-full bg-blue-600/20 border border-blue-500 text-blue-300 hover:bg-blue-600/30"
-                      >
-                        Preview Optimal Amounts
-                      </Button>
-                      
-                      {(liquiditySeniorAmount || liquidityJuniorAmount) && (
-                        <Button
-                          onClick={handleAddLiquidity}
-                          disabled={!isConnected || !liquiditySeniorAmount || !liquidityJuniorAmount}
-                          className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
-                        >
-                          <Droplets className="w-4 h-4 mr-2" />
-                          Add Liquidity
-                        </Button>
-                      )}
-                    </div>
-
-                    {/* Show calculated amounts */}
-                    {(liquiditySeniorAmount || liquidityJuniorAmount) && (
-                      <Alert className="bg-blue-900/20 border-blue-600 text-blue-300">
-                        <Info className="h-4 w-4" />
-                        <AlertDescription>
-                          <div className="space-y-1">
-                            <div className="font-semibold">Ready to add:</div>
-                            <div className="text-sm">
-                              {liquiditySeniorAmount} SENIOR + {liquidityJuniorAmount} JUNIOR
-                            </div>
-                            <div className="text-xs opacity-80">
-                              These amounts match the current pool ratio for optimal liquidity provision
-                            </div>
-                          </div>
-                        </AlertDescription>
-                      </Alert>
-                    )}
-                  </div>
-                ) : (
-                  <div className="space-y-4">
-                    {/* Manual Input */}
-                    <div className="grid grid-cols-2 gap-4">
-                      <div>
-                        <Label className="text-slate-300">SENIOR Amount</Label>
-                        <Input
-                          type="number"
-                          placeholder="0.0"
-                          value={liquiditySeniorAmount}
-                          onChange={(e) => setLiquiditySeniorAmount(e.target.value)}
-                          disabled={!isConnected}
-                          className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                        />
-                        <p className="text-sm text-slate-400 mt-1">
-                          Balance: {formatTokenAmount(balances.seniorTokens)}
-                        </p>
-                      </div>
-                      
-                      <div>
-                        <Label className="text-slate-300">JUNIOR Amount</Label>
-                        <Input
-                          type="number"
-                          placeholder="0.0"
-                          value={liquidityJuniorAmount}
-                          onChange={(e) => setLiquidityJuniorAmount(e.target.value)}
-                          disabled={!isConnected}
-                          className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                        />
-                        <p className="text-sm text-slate-400 mt-1">
-                          Balance: {formatTokenAmount(balances.juniorTokens)}
-                        </p>
-                      </div>
-                    </div>
-
-                    {liquiditySeniorAmount && liquidityJuniorAmount && (
-                      <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-                        <Info className="h-4 w-4" />
-                        <AlertDescription>
-                          You'll receive LP tokens proportional to your share of the pool
-                        </AlertDescription>
-                      </Alert>
-                    )}
-
-                    <Button
-                      onClick={handleAddLiquidity}
-                      disabled={!isConnected || !liquiditySeniorAmount || !liquidityJuniorAmount || parseFloat(liquiditySeniorAmount) <= 0 || parseFloat(liquidityJuniorAmount) <= 0}
-                      className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
-                    >
-                      Add Liquidity
-                    </Button>
-                  </div>
-                )}
-              </CardContent>
-            </Card>
-
-            {/* Remove Liquidity */}
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white flex items-center">
-                  <Minus className="w-5 h-5 mr-2" />
-                  Remove Liquidity
-                </CardTitle>
-                <CardDescription className="text-slate-300">
-                  Remove liquidity from the SENIOR/JUNIOR pool
-                </CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                <div className="space-y-2">
-                  <Label className="text-slate-300">LP Token Amount</Label>
-                  <Input
-                    type="number"
-                    placeholder="0.0"
-                    value={removeLiquidityAmount}
-                    onChange={(e) => setRemoveLiquidityAmount(e.target.value)}
-                    disabled={!isConnected}
-                    className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                  />
-                  <p className="text-sm text-slate-400 mt-1">
-                    LP Balance: {formatTokenAmount(balances.lpTokens)}
-                  </p>
-                </div>
-
-                {removeLiquidityAmount && parseFloat(removeLiquidityAmount) > 0 && (
-                  <Alert className="bg-slate-700/50 border-slate-600 text-slate-300">
-                    <Info className="h-4 w-4" />
-                    <AlertDescription>
-                      You'll receive proportional amounts of SENIOR and JUNIOR tokens
-                    </AlertDescription>
-                  </Alert>
-                )}
-
-                <Button
-                  onClick={handleRemoveLiquidity}
-                  disabled={!isConnected || !removeLiquidityAmount || parseFloat(removeLiquidityAmount) <= 0}
-                  className="w-full bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700"
-                >
-                  Remove Liquidity
-                </Button>
-              </CardContent>
-            </Card>
-
-            {/* Emergency Withdrawal */}
-            {vaultInfo.emergencyMode && (
-              <Card className="bg-red-900/20 border-red-700 backdrop-blur-sm md:col-span-2">
-                <CardHeader>
-                  <CardTitle className="text-red-400">Emergency Withdrawal</CardTitle>
-                  <CardDescription className="text-red-300">
-                    Emergency mode is active. Senior token holders can withdraw with preferred asset.
-                  </CardDescription>
-                </CardHeader>
-                <CardContent className="space-y-4">
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                    <div>
-                      <Label htmlFor="emergency-amount" className="text-slate-300">CM-SENIOR Amount</Label>
-                      <Input
-                        id="emergency-amount"
-                        type="number"
-                        placeholder="0.0"
-                        value={emergencyAmount}
-                        onChange={(e) => setEmergencyAmount(e.target.value)}
-                        disabled={!isConnected}
-                        className="bg-slate-700/50 border-slate-600 text-white placeholder-slate-400"
-                      />
-                    </div>
-                    <div>
-                      <Label className="text-slate-300 mb-3 block">Preferred Asset</Label>
-                      <div className="grid grid-cols-2 gap-3">
-                        <button
-                          onClick={() => setPreferredAsset('aUSDC')}
-                          className={`p-3 rounded-lg border transition-all ${
-                            preferredAsset === 'aUSDC'
-                              ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                              : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                          }`}
-                        >
-                          <div className="text-center">
-                            <div className="font-semibold">aUSDC</div>
-                            <div className="text-sm opacity-80">Aave USDC</div>
-                          </div>
-                        </button>
-                        <button
-                          onClick={() => setPreferredAsset('cUSDT')}
-                          className={`p-3 rounded-lg border transition-all ${
-                            preferredAsset === 'cUSDT'
-                              ? 'bg-blue-600/20 border-blue-500 text-blue-400'
-                              : 'bg-slate-700/50 border-slate-600 text-slate-300 hover:bg-slate-700'
-                          }`}
-                        >
-                          <div className="text-center">
-                            <div className="font-semibold">cUSDT</div>
-                            <div className="text-sm opacity-80">Compound USDT</div>
-                          </div>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                  <Button 
-                    onClick={handleEmergencyWithdraw} 
-                    disabled={!isConnected || !emergencyAmount}
-                    variant="destructive"
-                    className="w-full bg-red-600 hover:bg-red-700"
-                  >
-                    Emergency Withdraw
-                  </Button>
-                </CardContent>
-              </Card>
-            )}
-          </div>
-        </div>
-
-        {/* Smart Liquidity Suggestion */}
-        <SmartLiquiditySuggestion
-          isVisible={showLiquiditySuggestion}
-          seniorValue={seniorTokenAmount}
-          juniorValue={juniorTokenAmount}
-          isExecuting={false}
-          isConnected={isConnected}
-          onAddLiquidity={handleAddLiquidity}
-          onDismiss={() => setShowLiquiditySuggestion(false)}
-        />
-
-        {/* Advanced Portfolio Analytics */}
-        <div className="mb-8">
-          <div className="flex justify-between items-center mb-4">
-            <h2 className="text-xl font-semibold text-white">Advanced Portfolio Analytics</h2>
-          </div>
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white">Current Positions</CardTitle>
-                <CardDescription className="text-slate-300">Detailed breakdown of your holdings</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                  <div className="flex items-center space-x-3">
-                    <div className="w-8 h-8 bg-blue-600 rounded-full flex items-center justify-center">
-                      <Shield className="w-4 h-4 text-white" />
-                    </div>
-                    <div>
-                      <p className="text-white font-medium">SENIOR</p>
-                      <p className="text-slate-400 text-sm">Priority claims</p>
-                    </div>
-                  </div>
-                  <div className="text-right">
-                    <p className="text-white font-medium">{formatTokenAmount(balances.seniorTokens)}</p>
-                    <p className="text-slate-400 text-sm">Value: ${(seniorTokenAmount * parseFloat(seniorPrice)).toFixed(2)}</p>
-                  </div>
-                </div>
-                
-                <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                  <div className="flex items-center space-x-3">
-                    <div className="w-8 h-8 bg-amber-600 rounded-full flex items-center justify-center">
-                      <Coins className="w-4 h-4 text-white" />
-                    </div>
-                    <div>
-                      <p className="text-white font-medium">JUNIOR</p>
-                      <p className="text-slate-400 text-sm">Higher upside</p>
-                    </div>
-                  </div>
-                  <div className="text-right">
-                    <p className="text-white font-medium">{formatTokenAmount(balances.juniorTokens)}</p>
-                    <p className="text-slate-400 text-sm">Value: ${(juniorTokenAmount * parseFloat(juniorPrice)).toFixed(2)}</p>
-                  </div>
-                </div>
-                
-                <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                  <div className="flex items-center space-x-3">
-                    <div className="w-8 h-8 bg-purple-600 rounded-full flex items-center justify-center">
-                      <Droplets className="w-4 h-4 text-white" />
-                    </div>
-                    <div>
-                      <p className="text-white font-medium">LP TOKENS</p>
-                      <p className="text-slate-400 text-sm">Liquidity provider</p>
-                    </div>
-                  </div>
-                  <div className="text-right">
-                    <p className="text-white font-medium">{formatTokenAmount(balances.lpTokens)}</p>
-                    <p className="text-slate-400 text-sm">Pool share</p>
-                  </div>
-                </div>
-              </CardContent>
-            </Card>
-
-            <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-              <CardHeader>
-                <CardTitle className="text-white">Protocol Status</CardTitle>
-                <CardDescription className="text-slate-300">Current protocol information</CardDescription>
-              </CardHeader>
-              <CardContent className="space-y-4">
-                <div className="flex justify-between items-center">
-                  <span className="text-slate-300">Current Phase:</span>
-                  <span className="text-white font-medium">{vaultInfo.currentPhase !== undefined ? Phase[vaultInfo.currentPhase] : 'Loading...'}</span>
-                </div>
-                
-                <div className="flex justify-between items-center">
-                  <span className="text-slate-300">Emergency Mode:</span>
-                  <span className={`font-medium ${vaultInfo.emergencyMode ? 'text-red-400' : 'text-green-400'}`}>
-                    {vaultInfo.emergencyMode ? '🚨 Active' : '✅ Inactive'}
-                  </span>
-                </div>
-                
-                <div className="flex justify-between items-center">
-                  <span className="text-slate-300">Total TVL:</span>
-                  <span className="text-white font-medium">${((Number(vaultInfo.aUSDCBalance) + Number(vaultInfo.cUSDTBalance)) / 1e18).toFixed(2)}</span>
-                </div>
-                
-                <div className="flex justify-between items-center">
-                  <span className="text-slate-300">Your Share:</span>
-                  <span className="text-white font-medium">
-                    {vaultInfo.totalTokensIssued > 0n 
-                      ? ((seniorTokenAmount + juniorTokenAmount) / (Number(vaultInfo.totalTokensIssued) / 1e18) * 100).toFixed(2) 
-                      : '0.00'}%
-                  </span>
-                </div>
-              </CardContent>
-            </Card>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default React.memo(Advanced);
\ No newline at end of file
diff --git a/frontend/src/pages/Dashboard.tsx b/frontend/src/pages/Dashboard.tsx
index 849fef8..6903b74 100644
--- a/frontend/src/pages/Dashboard.tsx
+++ b/frontend/src/pages/Dashboard.tsx
@@ -1,281 +1,388 @@
-import React, { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import React, { useState } from 'react';
 import { useWeb3 } from '@/context/PrivyWeb3Context';
 import Navbar from '@/components/Navbar';
-import PhaseDisplay from '@/components/PhaseDisplay';
-import QuickTrade from '@/components/QuickTrade';
-import StatCard from '@/components/StatCard';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Card, CardContent } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import { DollarSign, Coins, Shield, AlertCircle, RefreshCw, Activity, ArrowRight, Droplets } from 'lucide-react';
-import { Phase, ContractName, getContractAddress, SupportedChainId } from '@/config/contracts';
-import { ethers } from 'ethers';
+import { Badge } from '@/components/ui/badge';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import {
+  Shield,
+  TrendingUp,
+  DollarSign,
+  Clock,
+  RefreshCw,
+} from 'lucide-react';
+import { Phase, getPhaseNameFromBigInt } from '@/config/contracts';
+import StatCard from '@/components/StatCard';
+
+// Import custom hooks
+import { usePricing } from '@/hooks/usePricing';
+import { usePortfolioCalculations } from '@/hooks/usePortfolioCalculations';
+
+// Import dashboard components
+import PortfolioOverview from '@/components/dashboard/PortfolioOverview';
+import DepositStrategies from '@/components/dashboard/DepositStrategies';
+import PositionManagement from '@/components/dashboard/PositionManagement';
+import AdvancedFeatures from '@/components/dashboard/AdvancedFeatures';
+import MarketOverview from '@/components/dashboard/MarketOverview';
 
 const Dashboard = () => {
   const {
     isConnected,
-    balances,
     vaultInfo,
+    depositAsset,
+    withdraw,
+    emergencyWithdraw,
+    swapExactTokensForTokens,
     getAmountsOut,
     seniorTokenAddress,
     juniorTokenAddress,
-    getPairReserves,
-    currentChain,
-    isUnsupportedChain,
+    stakeRiskTokens,
+    unstakeRiskTokens,
+    refreshData,
+    getTokenBalance,
   } = useWeb3();
 
-  const [seniorPrice, setSeniorPrice] = useState('0.98');
-  const [juniorPrice, setJuniorPrice] = useState('1.05');
-  const [pricesLoading, setPricesLoading] = useState(false);
-  
-  // Pool reserves state
-  const [poolReserves, setPoolReserves] = useState({ senior: '0', junior: '0' });
+  // Custom hooks for pricing and calculations
+  const { seniorPrice, juniorPrice, poolReserves } = usePricing();
+  const {
+    formatNumber,
+    seniorBalance,
+    juniorBalance,
+    aUSDCBalance,
+    cUSDTBalance,
+    lpBalance,
+    totalPortfolioValue,
+    protocolTVL,
+    userSharePercent,
+    riskProfile,
+  } = usePortfolioCalculations(seniorPrice, juniorPrice);
 
-  // Format token amounts for display
-  const formatTokenAmount = (amount: bigint) => {
-    return ethers.formatEther(amount);
-  };
+  // State Management
+  const [activeTab, setActiveTab] = useState('overview');
+  const [isExecuting, setIsExecuting] = useState(false);
+  const [isRebalancing, setIsRebalancing] = useState(false);
+  const [isWithdrawing, setIsWithdrawing] = useState(false);
 
-  // Fetch token prices and pool reserves from Uniswap pair
-  useEffect(() => {
-    const fetchTokenPrices = async () => {
-      if (!seniorTokenAddress || !juniorTokenAddress || !getAmountsOut || !currentChain) return;
-      
-      setPricesLoading(true);
-      try {
-        // Get pool reserves to calculate proper AMM pricing
-        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
-        const reserves = await getPairReserves(pairAddress);
-        const seniorReserve = parseFloat(ethers.formatEther(reserves.reserve0));
-        const juniorReserve = parseFloat(ethers.formatEther(reserves.reserve1));
-        
-        // Calculate prices directly from Uniswap AMM reserves
-        // In a Uniswap pair, price = other_reserve / this_reserve
-        const seniorPriceInJunior = juniorReserve / seniorReserve;
-        const juniorPriceInSenior = seniorReserve / juniorReserve;
-        
-        // For USD pricing, we need to establish a base.
-        // Let's use getAmountsOut to get actual market prices
-        try {
-          // Get price of 1 SENIOR in terms of JUNIOR
-          const seniorToJuniorPath = [seniorTokenAddress, juniorTokenAddress];
-          const seniorPrice1Unit = await getAmountsOut('1', seniorToJuniorPath);
-          
-          // Get price of 1 JUNIOR in terms of SENIOR
-          const juniorToSeniorPath = [juniorTokenAddress, seniorTokenAddress];
-          const juniorPrice1Unit = await getAmountsOut('1', juniorToSeniorPath);
-          
-          setSeniorPrice(parseFloat(seniorPrice1Unit).toFixed(2));
-          setJuniorPrice(parseFloat(juniorPrice1Unit).toFixed(2));
-        } catch (error) {
-          console.error('Error getting AMM prices:', error);
-          // Fallback to reserve-based calculation
-          setSeniorPrice(seniorPriceInJunior.toFixed(2));
-          setJuniorPrice(juniorPriceInSenior.toFixed(2));
-        }
-      } catch (error) {
-        console.error('Error fetching token prices:', error);
-        // Keep default prices on error (equal weighting)
-        setSeniorPrice('1.00');
-        setJuniorPrice('1.00');
-      } finally {
-        setPricesLoading(false);
-      }
-    };
-
-    const fetchPoolReserves = async () => {
-      if (!getPairReserves || !currentChain) return;
-      
-      try {
-        const pairAddress = getContractAddress(currentChain, ContractName.SENIOR_JUNIOR_PAIR);
-        const reserves = await getPairReserves(pairAddress);
-        
-        // Format reserves from wei to ether
-        const seniorReserve = ethers.formatEther(reserves.reserve0);
-        const juniorReserve = ethers.formatEther(reserves.reserve1);
-        
-        // Only update if values have changed significantly (avoid micro-updates)
-        const currentSenior = parseFloat(poolReserves.senior);
-        const currentJunior = parseFloat(poolReserves.junior);
-        const newSenior = parseFloat(seniorReserve);
-        const newJunior = parseFloat(juniorReserve);
-        
-        if (Math.abs(currentSenior - newSenior) > 0.01 || Math.abs(currentJunior - newJunior) > 0.01) {
-          setPoolReserves({
-            senior: seniorReserve,
-            junior: juniorReserve,
-          });
+  // Strategy execution
+  const executeStrategy = async (strategy: 'safety' | 'upside' | 'balanced', amount: string, asset: 'aUSDC' | 'cUSDT') => {
+    if (!amount || parseFloat(amount) <= 0) return;
+
+    setIsExecuting(true);
+    try {
+      // First deposit to get tokens
+      await depositAsset(asset, amount);
+
+      if (strategy === 'safety') {
+        // Convert all junior to senior
+        const freshJuniorBalance = await getTokenBalance(juniorTokenAddress!);
+        if (Number(freshJuniorBalance) > 0) {
+          const path = [juniorTokenAddress!, seniorTokenAddress!];
+          const balanceString = formatNumber(Number(freshJuniorBalance) / 1e18, 18);
+          const estimate = await getAmountsOut(balanceString, path);
+          const minOutput = (parseFloat(estimate) * 0.95).toFixed(18);
+          await swapExactTokensForTokens(balanceString, minOutput, path);
         }
-      } catch (error) {
-        console.error('Error fetching pool reserves:', error);
-        // Only reset if we don't have valid data
-        if (poolReserves.senior === '0' && poolReserves.junior === '0') {
-          setPoolReserves({ senior: '0', junior: '0' });
+      } else if (strategy === 'upside') {
+        // Convert all senior to junior
+        const freshSeniorBalance = await getTokenBalance(seniorTokenAddress!);
+        if (Number(freshSeniorBalance) > 0) {
+          const path = [seniorTokenAddress!, juniorTokenAddress!];
+          const balanceString = formatNumber(Number(freshSeniorBalance) / 1e18, 18);
+          const estimate = await getAmountsOut(balanceString, path);
+          const minOutput = (parseFloat(estimate) * 0.95).toFixed(18);
+          await swapExactTokensForTokens(balanceString, minOutput, path);
         }
       }
-    };
-
-    fetchTokenPrices();
-    fetchPoolReserves();
-    const interval = setInterval(() => {
-      fetchTokenPrices();
-      fetchPoolReserves();
-    }, 30000); // Update every 30 seconds to reduce twitching
-    
-    return () => clearInterval(interval);
-  }, [seniorTokenAddress, juniorTokenAddress, getAmountsOut, getPairReserves, currentChain]);
-
-  // Calculate total portfolio value based on risk token holdings and current market prices
-  const seniorTokenAmount = parseFloat(formatTokenAmount(balances.seniorTokens));
-  const juniorTokenAmount = parseFloat(formatTokenAmount(balances.juniorTokens));
-  
-  const totalPortfolioValue = 
-    (seniorTokenAmount * parseFloat(seniorPrice)) +
-    (juniorTokenAmount * parseFloat(juniorPrice));
+      // For balanced, keep 50/50 split from deposit
+
+      await refreshData();
+    } catch (error) {
+      console.error('Strategy execution failed:', error);
+    } finally {
+      setIsExecuting(false);
+    }
+  };
+
+  // Rebalancing handler
+  const handleRebalance = async (targetPercent: number) => {
+    if (!seniorTokenAddress || !juniorTokenAddress || !swapExactTokensForTokens || !getAmountsOut) return;
+
+    const currentSeniorPercent = riskProfile.percentage;
+    const percentDiff = targetPercent - currentSeniorPercent;
+
+    if (Math.abs(percentDiff) < 1) return;
+
+    setIsRebalancing(true);
+    try {
+      let amountIn: string;
+      let path: string[];
+
+      if (targetPercent === 100) {
+        amountIn = juniorBalance.toFixed(18);
+        path = [juniorTokenAddress, seniorTokenAddress];
+      } else if (targetPercent === 0) {
+        amountIn = seniorBalance.toFixed(18);
+        path = [seniorTokenAddress, juniorTokenAddress];
+      } else if (percentDiff > 0) {
+        const totalTokens = seniorBalance + juniorBalance;
+        const targetSeniorAmount = (totalTokens * targetPercent) / 100;
+        const seniorNeeded = targetSeniorAmount - seniorBalance;
+        const juniorToSwap = Math.min(seniorNeeded / parseFloat(juniorPrice), juniorBalance);
+        amountIn = juniorToSwap.toFixed(18);
+        path = [juniorTokenAddress, seniorTokenAddress];
+      } else {
+        const totalTokens = seniorBalance + juniorBalance;
+        const targetJuniorAmount = (totalTokens * (100 - targetPercent)) / 100;
+        const juniorNeeded = targetJuniorAmount - juniorBalance;
+        const seniorToSwap = Math.min(juniorNeeded * parseFloat(juniorPrice), seniorBalance);
+        amountIn = seniorToSwap.toFixed(18);
+        path = [seniorTokenAddress, juniorTokenAddress];
+      }
+
+      if (parseFloat(amountIn) > 0) {
+        const amountsOut = await getAmountsOut(amountIn, path);
+        const minAmountOut = (parseFloat(amountsOut) * 0.95).toFixed(18);
+        await swapExactTokensForTokens(amountIn, minAmountOut, path);
+      }
+
+      await refreshData();
+    } catch (error) {
+      console.error('Rebalancing failed:', error);
+    } finally {
+      setIsRebalancing(false);
+    }
+  };
+
+  // Withdrawal handler
+  const handleWithdraw = async (amount: string) => {
+    if (!amount || parseFloat(amount) <= 0) return;
+
+    setIsWithdrawing(true);
+    try {
+      // Simplified withdrawal logic - withdraws proportionally to both aUSDC and cUSDT
+      const halfAmount = (parseFloat(amount) / 2).toFixed(6);
+      await withdraw(halfAmount, halfAmount);
+      await refreshData();
+    } catch (error) {
+      console.error('Withdrawal failed:', error);
+    } finally {
+      setIsWithdrawing(false);
+    }
+  };
+
+  // Risk token staking handlers
+  const handleStakeRiskTokens = async (seniorAmount: string, juniorAmount: string) => {
+    if (!seniorTokenAddress || !juniorTokenAddress) return;
+    setIsExecuting(true);
+    try {
+      await stakeRiskTokens(seniorAmount, juniorAmount, seniorTokenAddress, juniorTokenAddress);
+      await refreshData();
+    } catch (error) {
+      console.error('Stake risk tokens failed:', error);
+    } finally {
+      setIsExecuting(false);
+    }
+  };
+
+  const handleUnstakeRiskTokens = async (amount: string) => {
+    if (!seniorTokenAddress || !juniorTokenAddress) return;
+    setIsExecuting(true);
+    try {
+      await unstakeRiskTokens(amount, seniorTokenAddress, juniorTokenAddress);
+      await refreshData();
+    } catch (error) {
+      console.error('Unstake risk tokens failed:', error);
+    } finally {
+      setIsExecuting(false);
+    }
+  };
+
+  const handleEmergencyWithdraw = async (amount: string, asset: 'aUSDC' | 'cUSDT') => {
+    setIsExecuting(true);
+    try {
+      await emergencyWithdraw(amount, asset);
+      await refreshData();
+    } catch (error) {
+      console.error('Emergency withdrawal failed:', error);
+    } finally {
+      setIsExecuting(false);
+    }
+  };
+
+  if (!isConnected) {
+    return (
+      <div className="min-h-screen bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
+        <Navbar />
+        <div className="container mx-auto px-6 py-20">
+          <Card className="max-w-md mx-auto bg-slate-800/50 border-slate-700">
+            <CardContent className="p-8 text-center">
+              <Shield className="w-16 h-16 mx-auto mb-4 text-blue-400" />
+              <h2 className="text-xl font-semibold text-white mb-2">Connect Your Wallet</h2>
+              <p className="text-slate-400 mb-6">
+                Connect to start earning yield with risk management
+              </p>
+            </CardContent>
+          </Card>
+        </div>
+      </div>
+    );
+  }
 
   return (
     <div className="min-h-screen bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
-      {/* Animated background elements */}
+      {/* Animated background */}
       <div className="absolute inset-0 overflow-hidden">
         <div className="absolute -top-40 -right-40 w-80 h-80 bg-blue-500/10 rounded-full blur-3xl animate-pulse"></div>
         <div className="absolute top-40 -left-40 w-80 h-80 bg-purple-500/10 rounded-full blur-3xl animate-pulse delay-1000"></div>
         <div className="absolute bottom-40 right-20 w-60 h-60 bg-green-500/10 rounded-full blur-3xl animate-pulse delay-2000"></div>
       </div>
-      
+
       <Navbar />
 
-      <div className="relative z-10 container mx-auto px-6 py-8">
-        <div className="mb-8">
-          <div className="flex items-center justify-between">
+      <div className="relative z-10 container mx-auto px-4 md:px-6 py-4 md:py-8">
+        {/* Header */}
+        <div className="mb-6 md:mb-8">
+          <div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
             <div>
-              <h1 className="text-3xl font-bold text-white mb-2">
-                Trading Dashboard
-              </h1>
-              <p className="text-slate-300">
-                Smart trading with one-click deposit and risk management
+              <h1 className="text-2xl md:text-3xl font-bold text-white mb-2">Portfolio Dashboard</h1>
+              <p className="text-slate-300 text-sm md:text-base">
+                Smart risk management with tradeable insurance tokens
               </p>
             </div>
-            <div className="flex items-center text-slate-400 text-sm">
-              <RefreshCw className={`w-4 h-4 mr-2 ${pricesLoading ? 'animate-spin' : ''}`} />
-              Real-time data
+            <div className="flex flex-col sm:flex-row items-start sm:items-center gap-3 sm:gap-4">
+              <Badge
+                variant="outline"
+                className={`border-${riskProfile.color}-500 text-${riskProfile.color}-400 text-xs md:text-sm`}
+              >
+                {riskProfile.level} Risk Profile
+              </Badge>
+              <Button 
+                variant="outline" 
+                size="sm" 
+                onClick={refreshData}
+                className="border-slate-600 bg-slate-800/50 text-slate-300 hover:bg-slate-700 hover:text-white"
+              >
+                <RefreshCw className="w-4 h-4 mr-2" />
+                Refresh
+              </Button>
             </div>
           </div>
         </div>
 
-        {/* Connection Status */}
-        {!isConnected && (
-          <Alert className="mb-6 bg-slate-800/50 border-slate-700 text-slate-300">
-            <AlertCircle className="h-4 w-4" />
-            <AlertDescription>
-              Please connect your wallet to interact with the protocol
-            </AlertDescription>
-          </Alert>
-        )}
+        {/* Key Metrics Row */}
+        <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 md:gap-6 mb-6 md:mb-8">
+          <StatCard
+            title="Portfolio Value"
+            value={`$${formatNumber(totalPortfolioValue)}`}
+            description={`Available: $${formatNumber(aUSDCBalance + cUSDTBalance)} (aUSDC + cUSDT)`}
+            icon={<DollarSign className="w-8 h-8 text-green-400" />}
+            className="text-white"
+          />
 
+          <StatCard
+            title="Senior Tokens"
+            value={formatNumber(seniorBalance)}
+            description={`$${formatNumber(seniorBalance * parseFloat(seniorPrice))} value`}
+            icon={<Shield className="w-8 h-8 text-blue-400" />}
+            className="text-blue-400"
+          />
 
-        {/* Quick Trade - Hero Section */}
-        <div className="mb-8">
-          <QuickTrade />
+          <StatCard
+            title="Junior Tokens"
+            value={formatNumber(juniorBalance)}
+            description={`$${formatNumber(juniorBalance * parseFloat(juniorPrice))} value`}
+            icon={<TrendingUp className="w-8 h-8 text-amber-400" />}
+            className="text-amber-400"
+          />
+
+          <StatCard
+            title="Protocol Phase"
+            value={getPhaseNameFromBigInt(vaultInfo.currentPhase)}
+            description={`TVL: $${formatNumber(protocolTVL, 0)}`}
+            icon={<Clock className="w-8 h-8 text-purple-400" />}
+            className="text-white"
+          />
         </div>
-        
-                {/* Portfolio Overview */}
-        <div className="mb-8">
-          <div className="flex justify-between items-center mb-4">
-            <h2 className="text-xl font-semibold text-white">Your Portfolio</h2>
-            <div className="text-sm text-slate-400">Current positions and protocol status</div>
-          </div>
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-          <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-            <CardHeader>
-              <CardTitle className="text-white">Your Positions</CardTitle>
-              <CardDescription className="text-slate-300">Current risk token holdings</CardDescription>
-            </CardHeader>
-            <CardContent className="space-y-4">
-              <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                <div className="flex items-center space-x-3">
-                  <div className="w-8 h-8 bg-blue-600 rounded-full flex items-center justify-center">
-                    <Shield className="w-4 h-4 text-white" />
-                  </div>
-                  <div>
-                    <p className="text-white font-medium">SENIOR</p>
-                    <p className="text-slate-400 text-sm">Priority claims</p>
-                  </div>
-                </div>
-                <div className="text-right">
-                  <p className="text-white font-medium">{formatTokenAmount(balances.seniorTokens)}</p>
-                  <p className="text-slate-400 text-sm">Value: ${(seniorTokenAmount * parseFloat(seniorPrice)).toFixed(2)}</p>
-                </div>
-              </div>
-              
-              <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                <div className="flex items-center space-x-3">
-                  <div className="w-8 h-8 bg-amber-600 rounded-full flex items-center justify-center">
-                    <Coins className="w-4 h-4 text-white" />
-                  </div>
-                  <div>
-                    <p className="text-white font-medium">JUNIOR</p>
-                    <p className="text-slate-400 text-sm">Higher upside</p>
-                  </div>
-                </div>
-                <div className="text-right">
-                  <p className="text-white font-medium">{formatTokenAmount(balances.juniorTokens)}</p>
-                  <p className="text-slate-400 text-sm">Value: ${(juniorTokenAmount * parseFloat(juniorPrice)).toFixed(2)}</p>
-                </div>
-              </div>
-              
-              <div className="flex justify-between items-center p-3 bg-slate-700/30 rounded-lg">
-                <div className="flex items-center space-x-3">
-                  <div className="w-8 h-8 bg-purple-600 rounded-full flex items-center justify-center">
-                    <Droplets className="w-4 h-4 text-white" />
-                  </div>
-                  <div>
-                    <p className="text-white font-medium">LP TOKENS</p>
-                    <p className="text-slate-400 text-sm">Liquidity provider</p>
-                  </div>
-                </div>
-                <div className="text-right">
-                  <p className="text-white font-medium">{formatTokenAmount(balances.lpTokens)}</p>
-                  <p className="text-slate-400 text-sm">Pool share</p>
-                </div>
-              </div>
-            </CardContent>
-          </Card>
 
-          <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
-            <CardHeader>
-              <CardTitle className="text-white">Protocol Status</CardTitle>
-              <CardDescription className="text-slate-300">Current protocol information</CardDescription>
-            </CardHeader>
-            <CardContent className="space-y-4">
-              <div className="flex justify-between items-center">
-                <span className="text-slate-300">Current Phase:</span>
-                <span className="text-white font-medium">{vaultInfo.currentPhase !== undefined ? Phase[vaultInfo.currentPhase] : 'Loading...'}</span>
-              </div>
-              
-              <div className="flex justify-between items-center">
-                <span className="text-slate-300">Emergency Mode:</span>
-                <span className={`font-medium ${vaultInfo.emergencyMode ? 'text-red-400' : 'text-green-400'}`}>
-                  {vaultInfo.emergencyMode ? '🚨 Active' : '✅ Inactive'}
-                </span>
-              </div>
-              
-              <div className="flex justify-between items-center">
-                <span className="text-slate-300">Total TVL:</span>
-                <span className="text-white font-medium">${((Number(vaultInfo.aUSDCBalance) + Number(vaultInfo.cUSDTBalance)) / 1e18).toFixed(2)}</span>
-              </div>
-              
-              <div className="flex justify-between items-center">
-                <span className="text-slate-300">Your Share:</span>
-                <span className="text-white font-medium">
-                  {vaultInfo.totalTokensIssued > 0n 
-                    ? ((seniorTokenAmount + juniorTokenAmount) / (Number(vaultInfo.totalTokensIssued) / 1e18) * 100).toFixed(2) 
-                    : '0.00'}%
-                </span>
-              </div>
-            </CardContent>
-          </Card>
-          </div>
+        {/* Main Content Tabs */}
+        <Tabs value={activeTab} onValueChange={setActiveTab} className="space-y-4 md:space-y-6">
+          <TabsList className="grid w-full grid-cols-2 md:grid-cols-4 bg-slate-800/80 border border-slate-600">
+            <TabsTrigger value="overview" className="data-[state=active]:bg-slate-700 data-[state=active]:text-white text-slate-300 font-medium">Overview</TabsTrigger>
+            <TabsTrigger value="deposit" className="data-[state=active]:bg-slate-700 data-[state=active]:text-white text-slate-300 font-medium">Deposit & Trade</TabsTrigger>
+            <TabsTrigger value="manage" className="data-[state=active]:bg-slate-700 data-[state=active]:text-white text-slate-300 font-medium">Manage Positions</TabsTrigger>
+            <TabsTrigger value="advanced" className="data-[state=active]:bg-slate-700 data-[state=active]:text-white text-slate-300 font-medium">Staking</TabsTrigger>
+          </TabsList>
+
+          {/* Overview Tab */}
+          <TabsContent value="overview" className="space-y-4 md:space-y-6">
+            <PortfolioOverview
+              seniorBalance={seniorBalance}
+              juniorBalance={juniorBalance}
+              lpBalance={lpBalance}
+              seniorPrice={seniorPrice}
+              juniorPrice={juniorPrice}
+              riskProfile={riskProfile}
+              formatNumber={formatNumber}
+              protocolTVL={protocolTVL}
+              userSharePercent={userSharePercent}
+              vaultInfo={vaultInfo}
+              onTabChange={setActiveTab}
+            />
+          </TabsContent>
+
+          {/* Deposit & Trade Tab */}
+          <TabsContent value="deposit" className="space-y-4 md:space-y-6">
+            <DepositStrategies
+              aUSDCBalance={aUSDCBalance}
+              cUSDTBalance={cUSDTBalance}
+              formatNumber={formatNumber}
+              isExecuting={isExecuting}
+              onExecuteStrategy={executeStrategy}
+              seniorPrice={seniorPrice}
+              juniorPrice={juniorPrice}
+            />
+          </TabsContent>
+
+          {/* Manage Positions Tab */}
+          <TabsContent value="manage" className="space-y-4 md:space-y-6">
+            <PositionManagement
+              riskProfile={riskProfile}
+              totalPortfolioValue={totalPortfolioValue}
+              formatNumber={formatNumber}
+              isRebalancing={isRebalancing}
+              isWithdrawing={isWithdrawing}
+              onRebalance={handleRebalance}
+              onWithdraw={handleWithdraw}
+              vaultInfo={vaultInfo}
+            />
+          </TabsContent>
+
+          {/* Advanced Tab */}
+          <TabsContent value="advanced" className="space-y-4 md:space-y-6">
+            <AdvancedFeatures
+              seniorBalance={seniorBalance}
+              juniorBalance={juniorBalance}
+              lpBalance={lpBalance}
+              formatNumber={formatNumber}
+              isExecuting={isExecuting}
+              vaultInfo={vaultInfo}
+              onStakeRiskTokens={handleStakeRiskTokens}
+              onUnstakeRiskTokens={handleUnstakeRiskTokens}
+              onEmergencyWithdraw={handleEmergencyWithdraw}
+            />
+          </TabsContent>
+        </Tabs>
+
+        {/* Market Overview - Always Visible at Bottom */}
+        <div className="mt-6 md:mt-8">
+          <MarketOverview
+            seniorPrice={seniorPrice}
+            juniorPrice={juniorPrice}
+            poolReserves={poolReserves}
+            protocolTVL={protocolTVL}
+            formatNumber={formatNumber}
+          />
         </div>
       </div>
     </div>
diff --git a/frontend/src/pages/Index.tsx b/frontend/src/pages/Index.tsx
index 61c2115..1376b05 100644
--- a/frontend/src/pages/Index.tsx
+++ b/frontend/src/pages/Index.tsx
@@ -4,11 +4,11 @@ import Logo from '@/assets/images/CoverMax.svg';
 import { Button } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import { Badge } from '@/components/ui/badge';
-import { 
-  Shield, 
-  TrendingUp, 
-  Clock, 
-  ArrowRight, 
+import {
+  Shield,
+  TrendingUp,
+  Clock,
+  ArrowRight,
   Zap,
   BarChart3,
   Globe
@@ -68,8 +68,25 @@ const Index = () => {
               <img src={Logo} alt="CoverMax" className="h-8 w-auto" />
               <span className="text-xl font-bold text-white">CoverMax</span>
             </Link>
-            
+
             <div className="flex items-center space-x-6">
+              <Button
+                variant="ghost"
+                asChild
+                className="text-slate-300 hover:text-white hover:bg-slate-800"
+              >
+                <Link to="/widget-demo">Widget Demo</Link>
+              </Button>
+
+              <Button
+                variant="ghost"
+                asChild
+                className="text-slate-300 hover:text-white hover:bg-slate-800"
+              >
+                <a href="https://covermax.gitbook.io/covermax" target="_blank" rel="noopener noreferrer">
+                  Docs
+                </a>
+              </Button>
 
               <Button asChild className="bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700">
                 <Link to="/dashboard">
@@ -90,7 +107,7 @@ const Index = () => {
               <Globe className="w-4 h-4 mr-2" />
               Live on Blockchain
             </Badge>
-            
+
             <h1 className="text-5xl md:text-7xl font-bold text-white mb-6 leading-tight">
               Turn Insurance Risk Into
               <br />
@@ -99,10 +116,10 @@ const Index = () => {
               </span>
             </h1>
             <p className="text-lg text-blue-300 mb-4 font-semibold">
-              For safety-first users and high-upside seekers—choose your risk, earn your yield.
+              Deposit anytime. Withdraw anytime. Trade your risk on Uniswap.
             </p>
             <p className="text-xl text-slate-300 mb-8 leading-relaxed max-w-2xl mx-auto">
-              Deposit your assets → Get risk tokens → Trade them on Uniswap.
+              Coverage in one seamless experience.
               <br />
               <span className="text-blue-400 font-medium">Senior tokens = safety first. Junior tokens = higher upside.</span>
             </p>
@@ -153,7 +170,7 @@ const Index = () => {
               <div>
                 <div className="text-xl font-bold text-blue-300">For Safety-First Users</div>
                 <div className="text-slate-300 text-base">
-                  <span className="text-blue-400 font-medium">Benefit:</span> Deposit yield tokens, sell of your risk tokens to get "insured-yield", and withdraw from unharmed with priority during emergencies.
+                  <span className="text-blue-400 font-medium">Benefit:</span> Deposit yield tokens anytime, sell your risk tokens to get "insured-yield", and withdraw with priority during emergencies.
                 </div>
               </div>
             </Card>
@@ -162,7 +179,7 @@ const Index = () => {
               <div>
                 <div className="text-xl font-bold text-amber-300">For High-Upside Seekers</div>
                 <div className="text-slate-300 text-base">
-                  <span className="text-amber-400 font-medium">Benefit:</span> Deposit yield tokens, arbitrage the risk tokens, and manage the Junior Tokens for higher yield still with flexible risk exposure.<br />
+                  <span className="text-amber-400 font-medium">Benefit:</span> Deposit yield tokens anytime, arbitrage risk tokens, and manage Junior Tokens for higher yield with flexible risk exposure.
 
                 </div>
               </div>
@@ -189,9 +206,9 @@ const Index = () => {
                 <h3 className="text-lg font-semibold text-white mb-2">Deposit</h3>
                 <p className="text-slate-400 text-sm">Put in aUSDC/cUSDT</p>
               </div>
-              
+
               <ArrowRight className="w-8 h-8 text-slate-600 rotate-90 md:rotate-0" />
-              
+
               <div className="text-center">
                 <div className="w-16 h-16 bg-gradient-to-r from-purple-600 to-pink-600 rounded-full flex items-center justify-center text-white text-xl font-bold mx-auto mb-4">
                   2
@@ -199,9 +216,9 @@ const Index = () => {
                 <h3 className="text-lg font-semibold text-white mb-2">Get Tokens</h3>
                 <p className="text-slate-400 text-sm">Receive senior + junior</p>
               </div>
-              
+
               <ArrowRight className="w-8 h-8 text-slate-600 rotate-90 md:rotate-0" />
-              
+
               <div className="text-center">
                 <div className="w-16 h-16 bg-gradient-to-r from-pink-600 to-red-600 rounded-full flex items-center justify-center text-white text-xl font-bold mx-auto mb-4">
                   3
@@ -210,7 +227,7 @@ const Index = () => {
                 <p className="text-slate-400 text-sm">Buy/sell on Uniswap</p>
               </div>
             </div>
-            
+
             <div className="text-center mt-12">
               <p className="text-lg text-slate-300">
                 <span className="text-blue-400 font-medium">Why?</span> Because now you can buy/sell insurance risk like any other token.
@@ -255,7 +272,7 @@ const Index = () => {
               </p>
             </Card>
           </div>
-          
+
           <div className="text-center mt-8">
             <p className="text-slate-400">
               Both types are tradeable on Uniswap • Adjust your risk anytime
@@ -278,7 +295,7 @@ const Index = () => {
             <p className="text-slate-300 text-lg mb-8 max-w-2xl mx-auto">
               Turn your DeFi assets into tradeable risk tokens.
             </p>
-            
+
 
             <div className="flex flex-col sm:flex-row items-center justify-center gap-4">
               <Button size="lg" asChild className="bg-gradient-to-r from-blue-600 to-purple-600 hover:from-blue-700 hover:to-purple-700 text-lg px-8 py-6">
@@ -293,6 +310,37 @@ const Index = () => {
         </div>
       </section>
 
+      {/* Partners Section */}
+      <section className="relative z-10 py-20 bg-slate-800/30">
+        <div className="container mx-auto px-6">
+          <div className="text-center mb-12">
+            <h2 className="text-3xl md:text-4xl font-bold text-white mb-4">
+              Our Supporters
+            </h2>
+            <p className="text-slate-300 text-lg">
+              Backed by leading organizations in the blockchain ecosystem
+            </p>
+          </div>
+
+          <div className="flex flex-wrap items-center justify-center gap-12 max-w-5xl mx-auto">
+            <div className="flex items-center justify-center">
+              <img
+                src="/New_CBT_Standalone.png"
+                alt="CBT Partner"
+                className="h-20 md:h-24 w-auto object-contain filter brightness-0 invert opacity-80 hover:opacity-100 transition-opacity"
+              />
+            </div>
+            <div className="flex items-center justify-center">
+              <img
+                src="/UCLIE_logo_black.png"
+                alt="UCLIE Partner"
+                className="h-20 md:h-24 w-auto object-contain filter brightness-0 invert opacity-80 hover:opacity-100 transition-opacity"
+              />
+            </div>
+          </div>
+        </div>
+      </section>
+
       {/* Footer */}
       <footer className="relative z-10 border-t border-slate-700/50 bg-slate-900/80 backdrop-blur-xl py-12">
         <div className="container mx-auto px-6">
@@ -307,7 +355,7 @@ const Index = () => {
                 Built for the future of protected finance.
               </p>
             </div>
-            
+
             <div>
               <h4 className="font-semibold text-white mb-4">Protocol</h4>
               <div className="space-y-2">
@@ -316,7 +364,7 @@ const Index = () => {
                 <Link to="/admin" className="block text-slate-400 hover:text-white transition-colors">Analytics</Link>
               </div>
             </div>
-            
+
             <div>
               <h4 className="font-semibold text-white mb-4">Resources</h4>
               <div className="space-y-2">
@@ -326,7 +374,7 @@ const Index = () => {
               </div>
             </div>
           </div>
-          
+
           <div className="border-t border-slate-700/50 mt-12 pt-8 flex flex-col md:flex-row justify-between items-center">
             <p className="text-slate-400 mb-4 md:mb-0">
               © {new Date().getFullYear()} CoverMax Protocol. Decentralized and open source.
@@ -343,4 +391,4 @@ const Index = () => {
   );
 };
 
-export default Index;
\ No newline at end of file
+export default Index;
diff --git a/frontend/src/pages/WidgetDemo.tsx b/frontend/src/pages/WidgetDemo.tsx
new file mode 100644
index 0000000..bc3e1b7
--- /dev/null
+++ b/frontend/src/pages/WidgetDemo.tsx
@@ -0,0 +1,197 @@
+import React, { useState, useCallback } from 'react';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
+import { Button } from '@/components/ui/button';
+import { Badge } from '@/components/ui/badge';
+import { Separator } from '@/components/ui/separator';
+import PredictionMarketWidget from '@/components/PredictionMarketWidget';
+import Logo from '@/assets/images/CoverMax.svg';
+import { Link } from 'react-router-dom';
+import { useWeb3 } from '@/context/PrivyWeb3Context';
+import NetworkSelector from '@/components/NetworkSelector';
+import { Zap, TrendingUp, DollarSign, Target, Brain } from 'lucide-react';
+
+interface ProtocolDemo {
+  name: string;
+  logo: string;
+  supportedAssets: ('aUSDC' | 'cUSDT')[];
+}
+
+const demoProtocols: ProtocolDemo[] = [
+  {
+    name: 'Aave',
+    logo: '🏦',
+    supportedAssets: ['aUSDC']  // Aave only supports aUSDC
+  },
+  {
+    name: 'Compound',
+    logo: '🏛️',
+    supportedAssets: ['cUSDT']  // Compound only supports cUSDT
+  }
+];
+
+const WidgetDemo: React.FC = () => {
+  const [currentOdds, setCurrentOdds] = useState({ hack: 1.02, safe: 1.25 });
+  const [seniorPrice, setSeniorPrice] = useState('1.00');
+  const [juniorPrice, setJuniorPrice] = useState('1.00');
+  const [aiRecommendation, setAiRecommendation] = useState<{ betType: 'hack' | 'safe'; confidence: number } | null>(null);
+  const { isConnected, address, connectWallet, disconnectWallet, vaultInfo, balances } = useWeb3();
+
+  // Use Aave as the default protocol
+  const selectedProtocol = demoProtocols[0];
+
+  // Format address for display
+  const formatAddress = (addr: string) => {
+    return `${addr.slice(0, 6)}...${addr.slice(-4)}`;
+  };
+
+  // Memoize the callback to prevent infinite re-renders
+  const handleOddsUpdate = useCallback((odds: { hack: number; safe: number }, senior: string, junior: string) => {
+    setCurrentOdds(odds);
+    setSeniorPrice(senior);
+    setJuniorPrice(junior);
+  }, []);
+
+  return (
+    <div className="min-h-screen bg-gradient-to-br from-slate-900 via-slate-800 to-slate-900">
+      {/* Animated background elements */}
+      <div className="absolute inset-0 overflow-hidden">
+        <div className="absolute -top-40 -right-40 w-80 h-80 bg-blue-500/10 rounded-full blur-3xl animate-pulse"></div>
+        <div className="absolute top-40 -left-40 w-80 h-80 bg-purple-500/10 rounded-full blur-3xl animate-pulse delay-1000"></div>
+        <div className="absolute bottom-40 right-20 w-60 h-60 bg-green-500/10 rounded-full blur-3xl animate-pulse delay-2000"></div>
+      </div>
+
+      {/* Isolated Header - With Clickable Logo */}
+      <div className="relative z-10 border-b border-slate-700/50 bg-slate-900/80 backdrop-blur-xl py-4 px-6">
+        <div className="container mx-auto flex justify-between items-center">
+          {/* Clickable Logo and Title */}
+          <div className="flex items-center space-x-2">
+            <Link to="/" className="flex items-center space-x-2">
+              <img src={Logo} alt="CoverMax Logo" className="h-8 w-auto" />
+              <span className="font-bold text-xl text-white">CoverMax</span>
+            </Link>
+            <span className="text-slate-400 text-sm ml-2">Widget Demo</span>
+          </div>
+
+          {/* Wallet Connection */}
+          <div className="flex items-center space-x-3">
+            <NetworkSelector />
+            {!isConnected ? (
+              <Button
+                variant="outline"
+                className="text-slate-300 hover:text-white hover:bg-slate-700 px-4 py-2 text-sm font-medium border-slate-600 hover:border-slate-500 bg-slate-800/50"
+                onClick={connectWallet}
+              >
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-4 h-4 mr-2">
+                  <path strokeLinecap="round" strokeLinejoin="round" d="M21 12a2.25 2.25 0 0 0-2.25-2.25H15a3 3 0 1 1-6 0H5.25A2.25 2.25 0 0 0 3 12m18 0v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6m18 0V9M3 12V9m18 0a2.25 2.25 0 0 0-2.25-2.25H13.5m-9 0a2.25 2.25 0 0 0-2.25 2.25m18 0V6a2.25 2.25 0 0 0-2.25-2.25H5.25A2.25 2.25 0 0 0 3 6v3" />
+                </svg>
+                Connect Wallet
+              </Button>
+            ) : (
+              <Button
+                variant="outline"
+                className="text-slate-300 hover:text-white hover:bg-slate-700 px-4 py-2 text-sm font-medium border-slate-600 hover:border-slate-500 bg-slate-800/50"
+                onClick={disconnectWallet}
+              >
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor" className="w-4 h-4 mr-2">
+                  <path strokeLinecap="round" strokeLinejoin="round" d="M21 12a2.25 2.25 0 0 0-2.25-2.25H15a3 3 0 1 1-6 0H5.25A2.25 2.25 0 0 0 3 12m18 0v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6m18 0V9M3 12V9m18 0a2.25 2.25 0 0 0-2.25-2.25H13.5m-9 0a2.25 2.25 0 0 0-2.25 2.25m18 0V6a2.25 2.25 0 0 0-2.25-2.25H5.25A2.25 2.25 0 0 0 3 6v3" />
+                </svg>
+                {formatAddress(address!)}
+              </Button>
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div className="relative z-10 container mx-auto px-6 py-8">
+        {/* Header */}
+        <div className="text-center mb-12">
+          <h1 className="text-4xl font-bold text-white mb-4">
+            Smart DeFi Insurance Made Simple
+          </h1>
+          <p className="text-slate-300 text-xl max-w-3xl mx-auto mb-6 leading-relaxed">
+            Get <span className="text-purple-400 font-semibold">AI-powered recommendations</span> that analyze your portfolio to suggest optimal protection or yield strategies.
+            No complex insurance jargon - just smart betting with real returns.
+          </p>
+          <div className="flex justify-center items-center gap-6 text-sm">
+            <div className="flex items-center gap-2 text-green-400">
+              <div className="w-2 h-2 bg-green-400 rounded-full animate-pulse"></div>
+              <span className="font-medium">Live Protocol</span>
+            </div>
+            <div className="flex items-center gap-2 text-purple-400">
+              <div className="w-2 h-2 bg-purple-400 rounded-full"></div>
+              <span className="font-medium">AI-Powered</span>
+            </div>
+            <div className="flex items-center gap-2 text-blue-400">
+              <div className="w-2 h-2 bg-blue-400 rounded-full"></div>
+              <span className="font-medium">Real Returns</span>
+            </div>
+            {isConnected && (
+              <div className="flex items-center gap-2 text-amber-400">
+                <div className="w-2 h-2 bg-amber-400 rounded-full"></div>
+                <span className="font-medium">Connected</span>
+              </div>
+            )}
+          </div>
+        </div>
+
+        {/* Main Widget Demo */}
+        <div className="max-w-md mx-auto mb-12">
+          <PredictionMarketWidget
+            protocolName={selectedProtocol.name}
+            protocolLogo={selectedProtocol.logo}
+            timeframe="7 days"
+            minBet="10"
+            maxPayout="1000"
+            supportedAssets={selectedProtocol.supportedAssets}
+            onOddsUpdate={handleOddsUpdate}
+            aiRecommendation={aiRecommendation}
+          />
+        </div>
+
+        {/* Key Features */}
+        <div className="grid md:grid-cols-3 gap-6 mb-12">
+          <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
+            <CardHeader>
+              <CardTitle className="text-white text-lg flex items-center gap-2">
+                <Brain className="h-5 w-5 text-purple-400" />
+                AI Analysis
+              </CardTitle>
+            </CardHeader>
+            <CardContent className="text-slate-300">
+              <p className="text-sm">AI analyzes your wallet composition and market conditions to recommend optimal betting strategies.</p>
+            </CardContent>
+          </Card>
+
+          <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
+            <CardHeader>
+              <CardTitle className="text-white text-lg flex items-center gap-2">
+                <Target className="h-5 w-5 text-green-400" />
+                Smart Positioning
+              </CardTitle>
+            </CardHeader>
+            <CardContent className="text-slate-300">
+              <p className="text-sm">Recommendations consider your existing positions to avoid over-concentration and optimize returns.</p>
+            </CardContent>
+          </Card>
+
+          <Card className="bg-slate-800/50 border-slate-700 backdrop-blur-sm">
+            <CardHeader>
+              <CardTitle className="text-white text-lg flex items-center gap-2">
+                <DollarSign className="h-5 w-5 text-blue-400" />
+                Expected Value
+              </CardTitle>
+            </CardHeader>
+            <CardContent className="text-slate-300">
+              <p className="text-sm">Real-time calculations show mathematical edge and profit potential for each betting opportunity.</p>
+            </CardContent>
+          </Card>
+        </div>
+
+
+      </div>
+    </div>
+  );
+};
+
+export default WidgetDemo;
+
diff --git a/ignition/deployments/chain-296/deployed_addresses.json b/ignition/deployments/chain-296/deployed_addresses.json
index 098fd79..956dd4c 100644
--- a/ignition/deployments/chain-296/deployed_addresses.json
+++ b/ignition/deployments/chain-296/deployed_addresses.json
@@ -1,11 +1,11 @@
 {
-  "RiskTokenModule#MockAUSDC": "0x2Ec140Ba967BD9d2B5C0C138F22E20A530beFaF4",
-  "RiskTokenModule#MockCUSDT": "0xbc20b977781705589EC578aC7d5680Af821D4c1c",
-  "RiskTokenModule#UniswapV2Factory": "0x0310c9Cf82c2b0a426F2a5e09d1d670B31442a63",
-  "RiskTokenModule#WETH": "0x86840528937f5f1578601d3d31Bc7cFF6A540009",
-  "RiskTokenModule#RiskVault": "0x78a9bCbA870A367559258AAAC5b7e533cF9C0EB7",
-  "RiskTokenModule#UniswapV2Router02": "0x80E7C7932059ce5E67506B0BC25971B8209e003f",
-  "RiskTokenModule#juniorTokenContract": "0xc3e818236440461916BF75C91bd28Bb27bEa746e",
-  "RiskTokenModule#seniorTokenContract": "0x9c6A5C213F5CB326186E876C3e37ec8F73768b2B",
-  "RiskTokenModule#UniswapV2Pair": "0xb6368834321662839717dbd3dea511525B8382B5"
+  "RiskTokenModule#MockAUSDC": "0xc6461cf8E77b40293d90c9670FcC2Da04346Df1A",
+  "RiskTokenModule#MockCUSDT": "0xe786547f22F29E477B51135b24A39E937d291d17",
+  "RiskTokenModule#UniswapV2Factory": "0x3e83552ED9bF1418Bf50fbc7071C87361Ce156b5",
+  "RiskTokenModule#WETH": "0xED6eF615b61D37a5E1cce5D5Aaddc1064Fb9fA07",
+  "RiskTokenModule#RiskVault": "0x86840DBAE8aF63780ffFB2990aADDF5C78aeb184",
+  "RiskTokenModule#UniswapV2Router02": "0xBA659094Ffd44F3CCcFffd7c172cB42f0aD362b0",
+  "RiskTokenModule#juniorTokenContract": "0x2DDd2DD26A3d90d4a67F02A69728B386B1461710",
+  "RiskTokenModule#seniorTokenContract": "0xC5F805bBD905803e5Ec1280827068B9889978cF3",
+  "RiskTokenModule#UniswapV2Pair": "0x40C4F4B6fB472bFE986134A2A99C691E4323b09E"
 }
diff --git a/test/RiskVault.comprehensive.test.ts b/test/RiskVault.comprehensive.test.ts
index 9a246ba..f0a9802 100644
--- a/test/RiskVault.comprehensive.test.ts
+++ b/test/RiskVault.comprehensive.test.ts
@@ -17,8 +17,7 @@ describe("RiskVault - Comprehensive Tests", function () {
   let user3: SignerWithAddress;
 
   // Phase durations
-  const DEPOSIT_PHASE_DURATION = 2 * 24 * 60 * 60; // 2 days
-  const COVERAGE_PHASE_DURATION = 3 * 24 * 60 * 60; // 3 days
+  const ACTIVE_PHASE_DURATION = 5 * 24 * 60 * 60; // 5 days (was DEPOSIT + COVERAGE)
   const CLAIMS_PHASE_DURATION = 1 * 24 * 60 * 60; // 1 day
   const FINAL_CLAIMS_DURATION = 1 * 24 * 60 * 60; // 1 day
 
@@ -71,7 +70,7 @@ describe("RiskVault - Comprehensive Tests", function () {
       expect(await vault.owner()).to.equal(owner.address);
       expect(await vault.emergencyMode()).to.equal(false);
       expect(await vault.totalTokensIssued()).to.equal(0);
-      expect(await vault.currentPhase()).to.equal(0); // DEPOSIT phase
+      expect(await vault.currentPhase()).to.equal(0); // ACTIVE phase
     });
 
     it("Should create and own the risk tokens", async function () {
@@ -83,10 +82,10 @@ describe("RiskVault - Comprehensive Tests", function () {
       expect(await juniorToken.symbol()).to.equal("CM-JUNIOR");
     });
 
-    it("Should start in DEPOSIT phase with correct timestamps", async function () {
+    it("Should start in ACTIVE phase with correct timestamps", async function () {
       const phaseInfo = await vault.getPhaseInfo();
       const currentTime = await time.latest();
-      expect(phaseInfo.phase).to.equal(0); // DEPOSIT
+      expect(phaseInfo.phase).to.equal(0); // ACTIVE
       expect(phaseInfo.phaseStart).to.be.closeTo(currentTime, 50);
       expect(phaseInfo.cycleStart).to.be.closeTo(currentTime, 50);
     });
@@ -100,40 +99,35 @@ describe("RiskVault - Comprehensive Tests", function () {
 
   describe("Phase Management", function () {
     describe("Automatic Phase Transitions", function () {
-      it("Should transition from DEPOSIT to COVERAGE after 2 days", async function () {
-        expect(await vault.currentPhase()).to.equal(0); // DEPOSIT
+      it("Should transition from ACTIVE to CLAIMS after 5 days", async function () {
+        expect(await vault.currentPhase()).to.equal(0); // ACTIVE
         
-        // Move time forward by 2 days
-        await time.increase(DEPOSIT_PHASE_DURATION);
+        // Move time forward by 5 days
+        await time.increase(ACTIVE_PHASE_DURATION);
         
         // Trigger phase update manually
         await vault.forcePhaseTransition();
         
-        expect(await vault.currentPhase()).to.equal(1); // COVERAGE
+        expect(await vault.currentPhase()).to.equal(1); // CLAIMS
       });
 
       it("Should transition through all phases with correct timing", async function () {
-        // Start in DEPOSIT
+        // Start in ACTIVE
         expect(await vault.currentPhase()).to.equal(0);
         
-        // Move to COVERAGE
-        await time.increase(DEPOSIT_PHASE_DURATION);
-        await vault.forcePhaseTransition();
-        expect(await vault.currentPhase()).to.equal(1); // COVERAGE
-        
         // Move to CLAIMS
-        await time.increase(COVERAGE_PHASE_DURATION);
+        await time.increase(ACTIVE_PHASE_DURATION);
         await vault.forcePhaseTransition();
-        expect(await vault.currentPhase()).to.equal(2); // CLAIMS
+        expect(await vault.currentPhase()).to.equal(1); // CLAIMS
         
         // Move to FINAL_CLAIMS
         await time.increase(CLAIMS_PHASE_DURATION);
         await vault.forcePhaseTransition();
-        expect(await vault.currentPhase()).to.equal(3); // FINAL_CLAIMS
+        expect(await vault.currentPhase()).to.equal(2); // FINAL_CLAIMS
       });
 
       it("Should emit PhaseTransitioned events", async function () {
-        await time.increase(DEPOSIT_PHASE_DURATION);
+        await time.increase(ACTIVE_PHASE_DURATION);
         await expect(vault.forcePhaseTransition())
           .to.emit(vault, "PhaseTransitioned")
           .withArgs(0, 1, await time.latest() + 1);
@@ -142,16 +136,13 @@ describe("RiskVault - Comprehensive Tests", function () {
 
     describe("Manual Phase Transitions", function () {
       it("Should allow owner to force immediate phase transition", async function () {
-        expect(await vault.currentPhase()).to.equal(0); // DEPOSIT
-        
-        await vault.connect(owner).forcePhaseTransitionImmediate();
-        expect(await vault.currentPhase()).to.equal(1); // COVERAGE
+        expect(await vault.currentPhase()).to.equal(0); // ACTIVE
         
         await vault.connect(owner).forcePhaseTransitionImmediate();
-        expect(await vault.currentPhase()).to.equal(2); // CLAIMS
+        expect(await vault.currentPhase()).to.equal(1); // CLAIMS
         
         await vault.connect(owner).forcePhaseTransitionImmediate();
-        expect(await vault.currentPhase()).to.equal(3); // FINAL_CLAIMS
+        expect(await vault.currentPhase()).to.equal(2); // FINAL_CLAIMS
       });
 
       it("Should only allow owner to force transitions", async function () {
@@ -163,7 +154,6 @@ describe("RiskVault - Comprehensive Tests", function () {
     describe("Cycle Management", function () {
       it("Should start new cycle after FINAL_CLAIMS phase ends", async function () {
         // Move through all phases
-        await vault.forcePhaseTransitionImmediate(); // COVERAGE
         await vault.forcePhaseTransitionImmediate(); // CLAIMS
         await vault.forcePhaseTransitionImmediate(); // FINAL_CLAIMS
         
@@ -174,9 +164,9 @@ describe("RiskVault - Comprehensive Tests", function () {
         await expect(vault.startNewCycle())
           .to.emit(vault, "CycleStarted")
           .to.emit(vault, "PhaseTransitioned")
-          .withArgs(3, 0, await time.latest() + 1);
+          .withArgs(2, 0, await time.latest() + 1);
         
-        expect(await vault.currentPhase()).to.equal(0); // Back to DEPOSIT
+        expect(await vault.currentPhase()).to.equal(0); // Back to ACTIVE
       });
 
       it("Should not allow new cycle if not in FINAL_CLAIMS", async function () {
@@ -185,7 +175,6 @@ describe("RiskVault - Comprehensive Tests", function () {
 
       it("Should not allow new cycle if FINAL_CLAIMS hasn't ended", async function () {
         // Move to FINAL_CLAIMS
-        await vault.forcePhaseTransitionImmediate(); // COVERAGE
         await vault.forcePhaseTransitionImmediate(); // CLAIMS
         await vault.forcePhaseTransitionImmediate(); // FINAL_CLAIMS
         
@@ -201,8 +190,8 @@ describe("RiskVault - Comprehensive Tests", function () {
     describe("Phase Information", function () {
       it("Should return correct phase info", async function () {
         const phaseInfo = await vault.getPhaseInfo();
-        expect(phaseInfo.phase).to.equal(0); // DEPOSIT
-        expect(phaseInfo.timeRemaining).to.be.closeTo(DEPOSIT_PHASE_DURATION, 50);
+        expect(phaseInfo.phase).to.equal(0); // ACTIVE
+        expect(phaseInfo.timeRemaining).to.be.closeTo(ACTIVE_PHASE_DURATION, 50);
       });
 
       it("Should return correct protocol status", async function () {
@@ -211,17 +200,17 @@ describe("RiskVault - Comprehensive Tests", function () {
         expect(status.emergency).to.equal(false);
         expect(status.totalTokens).to.equal(0);
         expect(status.phase).to.equal(0);
-        expect(status.phaseEndTime).to.be.closeTo(currentTime + DEPOSIT_PHASE_DURATION, 50);
+        expect(status.phaseEndTime).to.be.closeTo(currentTime + ACTIVE_PHASE_DURATION, 50);
       });
 
       it("Should update time remaining correctly", async function () {
-        await time.increase(DEPOSIT_PHASE_DURATION / 2);
+        await time.increase(ACTIVE_PHASE_DURATION / 2);
         const phaseInfo = await vault.getPhaseInfo();
-        expect(phaseInfo.timeRemaining).to.be.closeTo(DEPOSIT_PHASE_DURATION / 2, 50);
+        expect(phaseInfo.timeRemaining).to.be.closeTo(ACTIVE_PHASE_DURATION / 2, 50);
       });
 
       it("Should show zero time remaining when phase should transition", async function () {
-        await time.increase(DEPOSIT_PHASE_DURATION + 100);
+        await time.increase(ACTIVE_PHASE_DURATION + 100);
         const phaseInfo = await vault.getPhaseInfo();
         expect(phaseInfo.timeRemaining).to.equal(0);
       });
@@ -230,7 +219,7 @@ describe("RiskVault - Comprehensive Tests", function () {
 
   describe("Deposit Functionality", function () {
     describe("Basic Deposits", function () {
-      it("Should allow deposits during DEPOSIT phase", async function () {
+      it("Should allow deposits during ACTIVE phase", async function () {
         const tx = await vault.connect(user1).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT);
         
         await expect(tx)
@@ -294,20 +283,24 @@ describe("RiskVault - Comprehensive Tests", function () {
         ).to.be.revertedWithCustomError(vault, "UnsupportedAsset");
       });
 
-      it("Should revert deposits during non-DEPOSIT phases", async function () {
-        // Move to COVERAGE phase
+      it("Should allow deposits during any phase", async function () {
+        // Move to CLAIMS phase
         await vault.forcePhaseTransitionImmediate();
         
+        // Should allow deposit during CLAIMS phase
+        await ausdc.connect(user1).approve(await vault.getAddress(), DEPOSIT_AMOUNT);
         await expect(
           vault.connect(user1).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT)
-        ).to.be.revertedWithCustomError(vault, "InvalidPhaseForDeposit");
+        ).to.not.be.reverted;
         
-        // Move to CLAIMS phase
+        // Move to FINAL_CLAIMS phase
         await vault.forcePhaseTransitionImmediate();
         
+        // Should allow deposit during FINAL_CLAIMS phase
+        await ausdc.connect(user2).approve(await vault.getAddress(), DEPOSIT_AMOUNT);
         await expect(
-          vault.connect(user1).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT)
-        ).to.be.revertedWithCustomError(vault, "InvalidPhaseForDeposit");
+          vault.connect(user2).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT)
+        ).to.not.be.reverted;
       });
 
       it("Should revert deposits during emergency mode", async function () {
diff --git a/test/RiskVault.integration.test.ts b/test/RiskVault.integration.test.ts
index 49418f2..ab14397 100644
--- a/test/RiskVault.integration.test.ts
+++ b/test/RiskVault.integration.test.ts
@@ -19,8 +19,7 @@ describe("RiskVault - Integration Tests", function () {
   let mixedInvestor: SignerWithAddress;
 
   // Phase durations
-  const DEPOSIT_PHASE_DURATION = 2 * 24 * 60 * 60; // 2 days
-  const COVERAGE_PHASE_DURATION = 3 * 24 * 60 * 60; // 3 days
+  const ACTIVE_PHASE_DURATION = 5 * 24 * 60 * 60; // 5 days (merged deposit + coverage)
   const CLAIMS_PHASE_DURATION = 1 * 24 * 60 * 60; // 1 day
   const FINAL_CLAIMS_DURATION = 1 * 24 * 60 * 60; // 1 day
 
@@ -71,25 +70,17 @@ describe("RiskVault - Integration Tests", function () {
       expect(await vault.getTotalValueLocked()).to.equal(DEPOSIT_AMOUNT * 5n);
       expect(await vault.totalTokensIssued()).to.equal(DEPOSIT_AMOUNT * 5n);
 
-      // Move to COVERAGE phase
-      await time.increase(DEPOSIT_PHASE_DURATION);
-      await vault.forcePhaseTransition();
-
-      // === COVERAGE PHASE ===
-      console.log("=== COVERAGE PHASE ===");
-      expect(await vault.currentPhase()).to.equal(1); // COVERAGE
-
-      // During coverage, some users may want to exit early
+      // During active phase, some users may want to exit early
       const [seniorBal, juniorBal] = await vault.getUserTokenBalances(mixedInvestor.address);
       await vault.connect(mixedInvestor).withdraw(seniorBal / 2n, juniorBal / 2n, ZeroAddress);
 
-      // Simulate coverage period
-      await time.increase(COVERAGE_PHASE_DURATION);
+      // Move to CLAIMS phase after ACTIVE period
+      await time.increase(ACTIVE_PHASE_DURATION);
       await vault.forcePhaseTransition();
 
       // === CLAIMS PHASE ===
       console.log("=== CLAIMS PHASE ===");
-      expect(await vault.currentPhase()).to.equal(2); // CLAIMS
+      expect(await vault.currentPhase()).to.equal(1); // CLAIMS
 
       // In claims phase, users can withdraw any combination
       // Senior investors might withdraw only senior tokens
@@ -106,7 +97,7 @@ describe("RiskVault - Integration Tests", function () {
 
       // === FINAL_CLAIMS PHASE ===
       console.log("=== FINAL_CLAIMS PHASE ===");
-      expect(await vault.currentPhase()).to.equal(3); // FINAL_CLAIMS
+      expect(await vault.currentPhase()).to.equal(2); // FINAL_CLAIMS
 
       // Remaining users withdraw their tokens
       const [senior3Bal, junior3Bal] = await vault.getUserTokenBalances(seniorInvestor2.address);
@@ -274,7 +265,7 @@ describe("RiskVault - Integration Tests", function () {
       await vault.connect(seniorInvestor1).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT);
 
       // Move time to just before transition (1 hour before)
-      await time.increase(DEPOSIT_PHASE_DURATION - 3600);
+      await time.increase(ACTIVE_PHASE_DURATION - 3600);
       
       // Try deposit near end of phase - should still work as we're in DEPOSIT phase
       await vault.connect(juniorInvestor1).depositAsset(await cusdt.getAddress(), DEPOSIT_AMOUNT);
@@ -285,10 +276,11 @@ describe("RiskVault - Integration Tests", function () {
       // Trigger phase update first
       await vault.forcePhaseTransition();
 
-      // This should fail because we're no longer in DEPOSIT phase
+      // Deposits should now work even after phase transition (deposits allowed at any time)
+      await ausdc.connect(mixedInvestor).approve(await vault.getAddress(), DEPOSIT_AMOUNT);
       await expect(
         vault.connect(mixedInvestor).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT)
-      ).to.be.revertedWithCustomError(vault, "InvalidPhaseForDeposit");
+      ).to.not.be.reverted;
 
       // But withdrawals should work
       const [senior, junior] = await vault.getUserTokenBalances(seniorInvestor1.address);
diff --git a/test/RiskVault.security.test.ts b/test/RiskVault.security.test.ts
index f749077..9d128c5 100644
--- a/test/RiskVault.security.test.ts
+++ b/test/RiskVault.security.test.ts
@@ -228,20 +228,17 @@ describe("RiskVault - Security Tests", function () {
 
     it("Should handle edge cases in phase transitions", async function () {
       // Test rapid successive phase transitions
-      expect(await vault.currentPhase()).to.equal(0); // DEPOSIT
+      expect(await vault.currentPhase()).to.equal(0); // ACTIVE
       
       await vault.forcePhaseTransitionImmediate();
-      expect(await vault.currentPhase()).to.equal(1); // COVERAGE
+      expect(await vault.currentPhase()).to.equal(1); // CLAIMS
       
       await vault.forcePhaseTransitionImmediate();
-      expect(await vault.currentPhase()).to.equal(2); // CLAIMS
-      
-      await vault.forcePhaseTransitionImmediate();
-      expect(await vault.currentPhase()).to.equal(3); // FINAL_CLAIMS
+      expect(await vault.currentPhase()).to.equal(2); // FINAL_CLAIMS
       
       // Can't transition further without starting new cycle
       await vault.forcePhaseTransitionImmediate();
-      expect(await vault.currentPhase()).to.equal(3); // Still FINAL_CLAIMS
+      expect(await vault.currentPhase()).to.equal(2); // Still FINAL_CLAIMS
     });
   });
 
diff --git a/test/RiskVault.withdrawals.test.ts b/test/RiskVault.withdrawals.test.ts
index 61e6e77..1a5f723 100644
--- a/test/RiskVault.withdrawals.test.ts
+++ b/test/RiskVault.withdrawals.test.ts
@@ -115,22 +115,21 @@ describe("RiskVault - Withdrawal Tests", function () {
     });
   });
 
-  describe("Withdrawal during COVERAGE Phase", function () {
+  describe("Withdrawal during ACTIVE Phase", function () {
     beforeEach(async function () {
       await vault.connect(user1).depositAsset(await ausdc.getAddress(), DEPOSIT_AMOUNT);
       await vault.connect(user2).depositAsset(await cusdt.getAddress(), DEPOSIT_AMOUNT);
-      // Move to COVERAGE phase
-      await vault.forcePhaseTransitionImmediate();
+      // Stay in ACTIVE phase (no transition needed)
     });
 
-    it("Should allow withdrawal with equal amounts during COVERAGE", async function () {
+    it("Should allow withdrawal with equal amounts during ACTIVE", async function () {
       const [senior, junior] = await vault.getUserTokenBalances(user1.address);
       
       await expect(vault.connect(user1).withdraw(senior, junior, ZeroAddress))
         .to.emit(vault, "TokensWithdrawn");
     });
 
-    it("Should revert withdrawal with unequal amounts during COVERAGE", async function () {
+    it("Should revert withdrawal with unequal amounts during ACTIVE", async function () {
       const [senior, junior] = await vault.getUserTokenBalances(user1.address);
       
       await expect(