diff --git a/package.json b/package.json
index 84248a0..d892961 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "dev": "node server.js",
     "build": "next build --webpack",
     "start": "NODE_ENV=production node server.js",
-    "start:prod": "PORT=3005 node server.js",
+    "start:prod": "PORT=3001 node server.js",
     "lint": "eslint .",
     "lint:a11y": "eslint . --no-ignore",
     "format": "prettier --write .",
@@ -18,22 +18,22 @@
     "@chakra-ui/react": "^3.30.0",
     "@emotion/react": "^11.14.0",
     "@neondatabase/serverless": "^1.0.2",
+    "@rhinestone/module-sdk": "^0.4.0",
+    "@safe-global/api-kit": "^4.0.0",
+    "@safe-global/protocol-kit": "^6.1.1",
     "@types/react-syntax-highlighter": "^15.5.13",
     "ethers": "^6.15.0",
+    "framer-motion": "^12.23.3",
+    "jszip": "^3.10.1",
     "next": "^16.0.7",
     "next-themes": "^0.4.6",
+    "qrcode.react": "^4.2.0",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
+    "react-icons": "^5.5.0",
     "react-syntax-highlighter": "^16.1.0",
     "secrets.js-34r7h": "^2.0.2",
-    "@rhinestone/module-sdk": "^0.4.0",
-    "@safe-global/api-kit": "^4.0.0",
-    "@safe-global/protocol-kit": "^6.1.1",
-    "framer-motion": "^12.23.3",
-    "jszip": "^3.10.1",
-    "qrcode.react": "^4.2.0",
-    "react-icons": "^5.5.0",
-    "w3pk": "^0.8.6",
+    "w3pk": "^0.8.7",
     "ws": "^8.18.3"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f2a8c51..87b9128 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,8 +63,8 @@ importers:
         specifier: ^2.0.2
         version: 2.0.2
       w3pk:
-        specifier: ^0.8.6
-        version: 0.8.6(ethers@6.16.0)
+        specifier: ^0.8.7
+        version: 0.8.7(ethers@6.16.0)
       ws:
         specifier: ^8.18.3
         version: 8.18.3
@@ -3416,8 +3416,8 @@ packages:
       typescript:
         optional: true
 
-  w3pk@0.8.6:
-    resolution: {integrity: sha512-kIgTAXfkw9CZraXu/J5F57tfdOE93OA/eSCrverQBP2Uxlzyb5hkNPG7hGtEddNZiI7axhS6o+TabvC7qt46iA==}
+  w3pk@0.8.7:
+    resolution: {integrity: sha512-0IfxXaYL+0XEbq5blIhqLI6nhx2D4NHcTnpRyDJ1qnljIVWZY1DCXGYtb8YBc8uiHhZh65fquHEIr5LKPVcLJg==}
     peerDependencies:
       ethers: ^6.0.0
 
@@ -6013,7 +6013,7 @@ snapshots:
       eslint: 9.39.1
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1))(eslint@9.39.1)
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1))(eslint@9.39.1))(eslint@9.39.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.1)
       eslint-plugin-react: 7.37.5(eslint@9.39.1)
       eslint-plugin-react-hooks: 7.0.1(eslint@9.39.1)
@@ -6050,7 +6050,7 @@ snapshots:
       tinyglobby: 0.2.15
       unrs-resolver: 1.11.1
     optionalDependencies:
-      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.1)
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1))(eslint@9.39.1))(eslint@9.39.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -6065,7 +6065,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.1):
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.48.1(eslint@9.39.1)(typescript@5.9.3))(eslint@9.39.1))(eslint@9.39.1))(eslint@9.39.1):
     dependencies:
       '@rtsao/scc': 1.1.0
       array-includes: 3.1.9
@@ -7905,7 +7905,7 @@ snapshots:
       - utf-8-validate
       - zod
 
-  w3pk@0.8.6(ethers@6.16.0):
+  w3pk@0.8.7(ethers@6.16.0):
     dependencies:
       ethers: 6.16.0
     optionalDependencies:
diff --git a/src/app/api/safe/send-tx/route.ts b/src/app/api/safe/send-tx/route.ts
index a8436ad..3dfc3c2 100644
--- a/src/app/api/safe/send-tx/route.ts
+++ b/src/app/api/safe/send-tx/route.ts
@@ -12,34 +12,34 @@ const SMART_SESSIONS_MODULE = '0x00000000008bDABA73cD9815d79069c247Eb4bDA'
 /**
  * POST /api/safe/send-tx
  * Send gasless transaction from Safe wallet (relayer pays fees)
- * Body: { userAddress, safeAddress, chainId, to, amount, sessionKeyAddress, signature, userPrivateKey }
+ * Body: { ownerAddress, safeAddress, chainId, to, amount, sessionKeyAddress, signature }
  */
 
 interface TransactionParams {
   txId: string
-  userAddress: string
+  ownerAddress: string
   safeAddress: string
   chainId: number
   to: string
   amount: string
   sessionKeyAddress: string
-  signature: string
+  sessionKeySignature: string
+  ownerSignature: string
   sessionKeyValidUntil?: number
-  userPrivateKey: string
 }
 
 async function processTransactionSync(params: TransactionParams) {
   const {
     txId,
-    userAddress,
+    ownerAddress,
     safeAddress,
     chainId,
     to,
     amount,
     sessionKeyAddress,
-    signature,
+    sessionKeySignature,
+    ownerSignature,
     sessionKeyValidUntil,
-    userPrivateKey,
   } = params
 
   const statusTimestamps: {
@@ -112,7 +112,7 @@ async function processTransactionSync(params: TransactionParams) {
       data: transferData, // ERC-20 transfer call
     }
     const message = JSON.stringify(txData)
-    const recoveredAddress = ethers.verifyMessage(message, signature)
+    const recoveredAddress = ethers.verifyMessage(message, sessionKeySignature)
 
     if (recoveredAddress.toLowerCase() !== sessionKeyAddress.toLowerCase()) {
       return {
@@ -122,15 +122,16 @@ async function processTransactionSync(params: TransactionParams) {
       }
     }
 
-    console.log(`✅ Signature verified from session key ${sessionKeyAddress}`)
+    console.log(`✅ Session key signature verified from ${sessionKeyAddress}`)
 
-    const userProtocolKit = await Safe.init({
+    // Use relayer to check module status (read-only operation)
+    const protocolKit = await Safe.init({
       provider: rpcUrl,
-      signer: userPrivateKey,
+      signer: process.env.RELAYER_PRIVATE_KEY!,
       safeAddress: safeAddress,
     })
 
-    const isModuleEnabled = await userProtocolKit.isModuleEnabled(SMART_SESSIONS_MODULE)
+    const isModuleEnabled = await protocolKit.isModuleEnabled(SMART_SESSIONS_MODULE)
 
     if (isModuleEnabled) {
       console.log(`✅ Smart Sessions module is enabled on-chain`)
@@ -161,7 +162,9 @@ async function processTransactionSync(params: TransactionParams) {
     statusTimestamps.verified = Date.now()
     const verifiedDuration = (statusTimestamps.verified - statusTimestamps.started) / 1000
 
-    const safeTransaction = await userProtocolKit.createTransaction({
+    // Create Safe transaction
+    // Session key signature was already verified above
+    const safeTransaction = await protocolKit.createTransaction({
       transactions: [
         {
           to: EURO_TOKEN_ADDRESS, // Send to token contract
@@ -171,16 +174,21 @@ async function processTransactionSync(params: TransactionParams) {
       ],
     })
 
-    const signedSafeTx = await userProtocolKit.signTransaction(safeTransaction)
-    console.log(`   Transaction signed by user (owner)`)
+    // Add the owner's signature to the transaction
+    const signedSafeTx = await protocolKit.copyTransaction(safeTransaction)
 
-    const relayerProtocolKit = await Safe.init({
-      provider: rpcUrl,
-      signer: process.env.RELAYER_PRIVATE_KEY!,
-      safeAddress: safeAddress,
-    })
+    const safeSignature = {
+      signer: ownerAddress,
+      data: ownerSignature,
+      isContractSignature: false,
+      staticPart: () => ownerSignature,
+      dynamicPart: () => '',
+    }
+
+    signedSafeTx.addSignature(safeSignature as any)
+    console.log(`   Transaction signed by owner ${ownerAddress}`)
 
-    const executeTxResponse = await relayerProtocolKit.executeTransaction(signedSafeTx)
+    const executeTxResponse = await protocolKit.executeTransaction(signedSafeTx)
 
     let txHash: string | undefined
 
@@ -235,15 +243,15 @@ async function processTransactionSync(params: TransactionParams) {
 async function processTransaction(params: TransactionParams) {
   const {
     txId,
-    userAddress,
+    ownerAddress,
     safeAddress,
     chainId,
     to,
     amount,
     sessionKeyAddress,
-    signature,
+    sessionKeySignature,
+    ownerSignature,
     sessionKeyValidUntil,
-    userPrivateKey,
   } = params
 
   const statusTimestamps: {
@@ -273,7 +281,8 @@ async function processTransaction(params: TransactionParams) {
     console.log(`   Amount type: ${typeof amount}`)
     console.log(`   Chain: ${chainId}`)
     console.log(`   Session key: ${sessionKeyAddress}`)
-    console.log(`   Signature provided: ${signature ? 'Yes' : 'No'}`)
+    console.log(`   Session key signature provided: ${sessionKeySignature ? 'Yes' : 'No'}`)
+    console.log(`   Owner signature provided: ${ownerSignature ? 'Yes' : 'No'}`)
 
     // Validate amount
     const amountBigInt = BigInt(amount)
@@ -326,7 +335,7 @@ async function processTransaction(params: TransactionParams) {
       data: transferData, // ERC-20 transfer call
     }
     const message = JSON.stringify(txData)
-    const recoveredAddress = ethers.verifyMessage(message, signature)
+    const recoveredAddress = ethers.verifyMessage(message, sessionKeySignature)
 
     if (recoveredAddress.toLowerCase() !== sessionKeyAddress.toLowerCase()) {
       sendTransactionStatus(txId, 'started', {
@@ -336,17 +345,18 @@ async function processTransaction(params: TransactionParams) {
       return
     }
 
-    console.log(`✅ Signature verified from session key ${sessionKeyAddress}`)
+    console.log(`✅ Session key signature verified from ${sessionKeyAddress}`)
 
     // Check if Smart Sessions module is enabled on-chain
     try {
-      const userProtocolKit = await Safe.init({
+      // Use relayer to check module status and execute transaction
+      const protocolKit = await Safe.init({
         provider: rpcUrl,
-        signer: userPrivateKey,
+        signer: process.env.RELAYER_PRIVATE_KEY!,
         safeAddress: safeAddress,
       })
 
-      const isModuleEnabled = await userProtocolKit.isModuleEnabled(SMART_SESSIONS_MODULE)
+      const isModuleEnabled = await protocolKit.isModuleEnabled(SMART_SESSIONS_MODULE)
 
       if (isModuleEnabled) {
         console.log(`✅ Smart Sessions module is enabled on-chain`)
@@ -409,7 +419,8 @@ async function processTransaction(params: TransactionParams) {
       })
 
       // Create Safe transaction with ERC-20 transfer
-      const safeTransaction = await userProtocolKit.createTransaction({
+      // Session key signature was already verified above
+      const safeTransaction = await protocolKit.createTransaction({
         transactions: [
           {
             to: EURO_TOKEN_ADDRESS, // Send to token contract
@@ -419,18 +430,22 @@ async function processTransaction(params: TransactionParams) {
         ],
       })
 
-      // Sign with user (the owner)
-      const signedSafeTx = await userProtocolKit.signTransaction(safeTransaction)
-      console.log(`   Transaction signed by user (owner)`)
+      // Add the owner's signature to the transaction
+      const signedSafeTx = await protocolKit.copyTransaction(safeTransaction)
 
-      // Execute transaction (relayer pays gas, user signed)
-      const relayerProtocolKit = await Safe.init({
-        provider: rpcUrl,
-        signer: process.env.RELAYER_PRIVATE_KEY!,
-        safeAddress: safeAddress,
-      })
+      const safeSignature = {
+        signer: ownerAddress,
+        data: ownerSignature,
+        isContractSignature: false,
+        staticPart: () => ownerSignature,
+        dynamicPart: () => '',
+      }
+
+      signedSafeTx.addSignature(safeSignature as any)
+      console.log(`   Transaction signed by owner ${ownerAddress}`)
 
-      const executeTxResponse = await relayerProtocolKit.executeTransaction(signedSafeTx)
+      // Execute transaction (relayer pays gas)
+      const executeTxResponse = await protocolKit.executeTransaction(signedSafeTx)
 
       // Get transaction hash from the response
       let txHash: string | undefined
@@ -493,30 +508,30 @@ export async function POST(request: NextRequest) {
 
     const body = await request.json()
     const {
-      userAddress,
+      ownerAddress,
       safeAddress,
       chainId,
       to,
       amount,
       sessionKeyAddress,
-      signature,
+      sessionKeySignature,
+      ownerSignature,
       sessionKeyValidUntil,
-      userPrivateKey,
       useWebSocket, // Optional: frontend can explicitly request WebSocket mode
     } = body
 
     // Validation
-    if (!userAddress || !safeAddress || !chainId || !to || !amount || !sessionKeyAddress) {
+    if (!ownerAddress || !safeAddress || !chainId || !to || !amount || !sessionKeyAddress) {
       return NextResponse.json(
         {
           error:
-            'Missing required fields: userAddress, safeAddress, chainId, to, amount, sessionKeyAddress',
+            'Missing required fields: ownerAddress, safeAddress, chainId, to, amount, sessionKeyAddress',
         },
         { status: 400 }
       )
     }
 
-    if (!signature) {
+    if (!sessionKeySignature) {
       return NextResponse.json(
         {
           error:
@@ -526,26 +541,25 @@ export async function POST(request: NextRequest) {
       )
     }
 
+    if (!ownerSignature) {
+      return NextResponse.json(
+        {
+          error: 'Owner signature required. The Safe owner must sign the transaction hash.',
+        },
+        { status: 400 }
+      )
+    }
+
     // Validate addresses
     if (
       !/^0x[a-fA-F0-9]{40}$/.test(safeAddress) ||
       !/^0x[a-fA-F0-9]{40}$/.test(to) ||
-      !/^0x[a-fA-F0-9]{40}$/.test(sessionKeyAddress)
+      !/^0x[a-fA-F0-9]{40}$/.test(sessionKeyAddress) ||
+      !/^0x[a-fA-F0-9]{40}$/.test(ownerAddress)
     ) {
       return NextResponse.json({ error: 'Invalid Ethereum address' }, { status: 400 })
     }
 
-    if (!userPrivateKey) {
-      return NextResponse.json(
-        {
-          error: 'User private key required',
-          details:
-            'The user must provide their private key to sign this transaction as the Safe owner',
-        },
-        { status: 400 }
-      )
-    }
-
     // Check if WebSocket is available (check if server has WebSocket support)
     const hasWebSocket = typeof global !== 'undefined' && (global as any).wsConnections
 
@@ -564,15 +578,15 @@ export async function POST(request: NextRequest) {
       setTimeout(() => {
         processTransaction({
           txId,
-          userAddress,
+          ownerAddress,
           safeAddress,
           chainId,
           to,
           amount,
           sessionKeyAddress,
-          signature,
+          sessionKeySignature,
+          ownerSignature,
           sessionKeyValidUntil,
-          userPrivateKey,
         })
       }, 100) // 100ms delay to allow WebSocket connection
 
@@ -592,15 +606,15 @@ export async function POST(request: NextRequest) {
     console.log('Processing transaction synchronously (no WebSocket)')
     const result = await processTransactionSync({
       txId,
-      userAddress,
+      ownerAddress,
       safeAddress,
       chainId,
       to,
       amount,
       sessionKeyAddress,
-      signature,
+      sessionKeySignature,
+      ownerSignature,
       sessionKeyValidUntil,
-      userPrivateKey,
     })
 
     return NextResponse.json(result, { status: result.success ? 200 : 400 })
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 3163c2a..dc1c5d7 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,6 +30,8 @@ import { EURO_TOKEN_ADDRESS, ERC20_ABI } from '@/lib/constants'
 import { FaSatellite, FaQrcode } from 'react-icons/fa'
 import { brandColors } from '@/theme'
 import { useTranslation } from '@/hooks/useTranslation'
+import { OnboardingProgress, OnboardingStep } from '@/components/OnboardingProgress'
+import { setupSafeWithSessionKey } from '@/lib/safeActions'
 
 interface SessionKey {
   sessionKeyAddress: string
@@ -44,7 +46,7 @@ interface SessionKey {
 }
 
 export default function PaymentPage() {
-  const { isAuthenticated, user, deriveWallet, login } = useW3PK()
+  const { isAuthenticated, user, deriveWallet, login, signMessage } = useW3PK()
   const t = useTranslation()
 
   // State
@@ -65,6 +67,11 @@ export default function PaymentPage() {
   const [amount, setAmount] = useState('1')
   const [paymentRequestDetected, setPaymentRequestDetected] = useState(false)
 
+  // Onboarding state
+  const [isOnboarding, setIsOnboarding] = useState(false)
+  const [onboardingStep, setOnboardingStep] = useState<OnboardingStep>('deploying-safe')
+  const [onboardingError, setOnboardingError] = useState<string | undefined>()
+
   const [isRequestModalOpen, setIsRequestModalOpen] = useState(false)
   const onRequestModalOpen = () => setIsRequestModalOpen(true)
   const onRequestModalClose = () => setIsRequestModalOpen(false)
@@ -201,6 +208,60 @@ export default function PaymentPage() {
     ? Date.now() > sessionKey.permissions.validUntil * 1000
     : false
 
+  // Function to start automatic onboarding
+  const startOnboarding = async () => {
+    if (!user || !deriveWallet || !signMessage) return
+
+    try {
+      setOnboardingStep('deploying-safe')
+      setOnboardingError(undefined)
+
+      const result = await setupSafeWithSessionKey(
+        {
+          userId: user.id,
+          chainId: 10200,
+          deriveWallet,
+          signMessage,
+        },
+        {
+          onDeploying: () => {
+            setOnboardingStep('deploying-safe')
+          },
+          onDeployed: (deployResult) => {
+            setOnboardingStep('safe-deployed')
+            setSafeAddress(deployResult.safeAddress)
+          },
+          onEnablingModule: () => {
+            setOnboardingStep('enabling-module')
+          },
+          onModuleEnabled: () => {
+            setOnboardingStep('module-enabled')
+          },
+          onCreatingSessionKey: () => {
+            setOnboardingStep('creating-session-key')
+          },
+          onSessionKeyCreated: (key) => {
+            setOnboardingStep('session-key-created')
+            setSessionKey(key)
+          },
+          onError: (error) => {
+            setOnboardingError(error)
+          },
+        }
+      )
+
+      if (result.success) {
+        setOnboardingStep('complete')
+        // Wait a moment to show the complete state
+        setTimeout(() => {
+          setIsOnboarding(false)
+        }, 2000)
+      }
+    } catch (error: any) {
+      setOnboardingError(error.message || 'An error occurred during setup')
+    }
+  }
+
   // Cleanup timeout on unmount
   useEffect(() => {
     return () => {
@@ -210,27 +271,36 @@ export default function PaymentPage() {
     }
   }, [])
 
-  // Load saved Safe data from localStorage
+  // Load saved Safe data from localStorage and trigger onboarding if needed
   useEffect(() => {
-    if (isAuthenticated && user && user.ethereumAddress) {
-      const saved = localStorage.getItem(`safe_${user.id}`)
-      if (saved) {
-        const data = JSON.parse(saved)
-        setSafeAddress(data.safeAddress)
-        if (data.sessionKey) {
-          setSessionKey(data.sessionKey)
+    const loadSafeData = async () => {
+      if (isAuthenticated && user) {
+        const saved = localStorage.getItem(`safe_${user.id}`)
+        if (saved) {
+          const data = JSON.parse(saved)
+          setSafeAddress(data.safeAddress)
+          if (data.sessionKey) {
+            setSessionKey(data.sessionKey)
+          }
+        } else {
+          // No Safe found - trigger automatic onboarding
+          setIsOnboarding(true)
+          await startOnboarding()
         }
-      }
 
-      // Using user.ethereumAddress directly
-      const userAddr = user.ethereumAddress
-      setUserAddress(userAddr)
+        // Derive the owner wallet address (STANDARD + OWNER)
+        const ownerWallet = await deriveWallet('STANDARD', 'OWNER')
+        setUserAddress(ownerWallet.address)
 
-      const safeData = SafeStorage.getSafeData(userAddr, 10200)
-      if (safeData?.deploymentBlockNumber) {
-        setDeploymentBlock(safeData.deploymentBlockNumber)
+        const safeData = SafeStorage.getSafeData(ownerWallet.address, 10200)
+        if (safeData?.deploymentBlockNumber) {
+          setDeploymentBlock(safeData.deploymentBlockNumber)
+        }
       }
     }
+
+    loadSafeData()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isAuthenticated, user])
 
   useEffect(() => {
@@ -469,7 +539,7 @@ export default function PaymentPage() {
   }, [safeAddress])
 
   const getTxBaseUrl = () => {
-    if (typeof window === 'undefined') return 'https://w3pk.w3hc.org/'
+    if (typeof window === 'undefined') return 'https://shebam.w3hc.org/'
 
     // Check if we're in development (localhost)
     if (
@@ -481,7 +551,7 @@ export default function PaymentPage() {
     }
 
     // Otherwise, assume production
-    return 'https://w3pk.w3hc.org/'
+    return 'https://shebam.w3hc.org/'
   }
 
   const generatePaymentRequestUrl = (
@@ -580,23 +650,49 @@ export default function PaymentPage() {
         throw new Error('User address not available')
       }
 
-      // Derive the session key wallet to sign the transaction (using YOLO mode)
-      const sessionKeyWallet = await deriveWallet('YOLO', 'BONUS')
+      // Sign transaction with session key using STANDARD mode
+      // STANDARD mode provides convenience without exposing private keys
+      const message = JSON.stringify(txData)
+      const sessionKeySignature = await signMessage(message, {
+        mode: 'STANDARD',
+        tag: 'USER',
+        signingMethod: 'EIP191', // Use EIP-191 for session key authorization
+      })
 
-      if (!sessionKeyWallet.privateKey) {
-        throw new Error('Session key private key not available')
+      if (!sessionKeySignature) {
+        throw new Error('Failed to sign transaction with session key')
       }
 
-      // Sign with the session key's private key
-      const message = JSON.stringify(txData)
-      const sessionKeySigner = new ethers.Wallet(sessionKeyWallet.privateKey)
-      const signature = await sessionKeySigner.signMessage(message)
+      // Get owner wallet address
+      const ownerWallet = await deriveWallet('STANDARD', 'OWNER')
+
+      // Get the Safe transaction hash to sign with owner
+      const hashResponse = await fetch('/api/safe/get-tx-hash', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          safeAddress,
+          to: EURO_TOKEN_ADDRESS,
+          data: transferData,
+          value: '0',
+          chainId: 10200,
+        }),
+      })
+
+      const hashData = await hashResponse.json()
+      if (!hashData.success) {
+        throw new Error(hashData.error || 'Failed to get transaction hash')
+      }
 
-      // Get derived wallet for signing (using YOLO mode with SHEBAM tag)
-      const wallet0 = await deriveWallet('YOLO', 'SHEBAM')
+      // Sign the Safe transaction hash with OWNER wallet
+      const ownerSignature = await signMessage(hashData.txHash, {
+        mode: 'STANDARD',
+        tag: 'OWNER',
+        signingMethod: 'rawHash',
+      })
 
-      if (!wallet0.privateKey) {
-        throw new Error('Owner wallet private key not available')
+      if (!ownerSignature) {
+        throw new Error('Failed to sign transaction hash with owner wallet')
       }
 
       // Try WebSocket mode first, fall back to sync mode
@@ -604,15 +700,15 @@ export default function PaymentPage() {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
-          userAddress: wallet0.address,
+          ownerAddress: ownerWallet.address,
           safeAddress,
           chainId: 10200,
           to: recipient,
           amount: transferAmount, // Send the EUR token amount
           sessionKeyAddress: sessionKey.sessionKeyAddress,
           sessionKeyValidUntil: sessionKey.permissions.validUntil,
-          userPrivateKey: wallet0.privateKey,
-          signature,
+          sessionKeySignature, // Session key signature for validation
+          ownerSignature, // Owner signature for Safe transaction
           useWebSocket: true, // Request WebSocket mode
         }),
       })
@@ -635,9 +731,6 @@ export default function PaymentPage() {
               description: `Verified in ${update.duration?.toFixed(2)}s`,
               type: 'success',
               duration: 4000,
-              // containerStyle: {
-              //   bg: 'green.500',
-              // },
             })
 
             if (window.history && window.history.replaceState) {
@@ -674,16 +767,6 @@ export default function PaymentPage() {
             // Start showing refetch loader
             setIsRefetchingAfterConfirmation(true)
           } else if (update.status === 'confirmed') {
-            // toast({
-            //   title: '✅ Settled!',
-            //   description: `Settled onchain in ${update.duration?.toFixed(2)}s.\nTx hash: ${update.txHash?.slice(0, 10) || 'N/A'}...`,
-            //   status: 'info',
-            //   duration: 5000,
-            //   // containerStyle: {
-            //   //   bg: 'green.500',
-            //   // },
-            // })
-
             // Update the pending transaction to 'confirmed' status
             setPendingTransactions(prev =>
               prev.map(tx =>
@@ -747,18 +830,6 @@ export default function PaymentPage() {
 
         setIsSending(false)
 
-        if (data.durations?.confirmed && data.txHash) {
-          // toast({
-          //   title: '✅ Settled!',
-          //   description: `Settled onchain in ${data.durations.confirmed.toFixed(2)}s. \nTx hash: ${data.txHash?.slice(0, 10) || 'N/A'}...`,
-          //   status: 'info',
-          //   duration: 5000,
-          //   // containerStyle: {
-          //   //   bg: 'green.500',
-          //   // },
-          // })
-        }
-
         // Clear form and reload balance and transactions
         setRecipient('0x502fb0dFf6A2adbF43468C9888D1A26943eAC6D1')
         setAmount('1')
@@ -843,7 +914,13 @@ export default function PaymentPage() {
     )
   }
 
+  // Show onboarding progress if setting up Safe for first time
+  if (isOnboarding) {
+    return <OnboardingProgress currentStep={onboardingStep} error={onboardingError} />
+  }
+
   if (!safeAddress) {
+    // This should rarely be shown now since onboarding is automatic
     return (
       <Container maxW="container.md" py={20}>
         <Box textAlign="center">
@@ -868,11 +945,22 @@ export default function PaymentPage() {
     <Container maxW="container.md" py={20}>
       <VStack gap={8} align="stretch">
         {/* Header */}
-        <Box textAlign="center">
-          <Heading as="h1" size="xl" mb={2}>
-            Payment
-          </Heading>
-          <Text color="gray.400">Send and receive EUR</Text>
+        <Box>
+          <Text>
+            {t.header.intro}{' '}
+            <Text as="span" color="brand.accent">
+              {t.header.faster}
+            </Text>{' '}
+            {t.header.and}{' '}
+            <Text as="span" color="brand.accent">
+              {t.header.cheaper}
+            </Text>{' '}
+            {t.header.thanAnyExisting}{' '}
+            <Text as="span" color="brand.accent">
+              {t.header.legallyRegulated}
+            </Text>
+            {t.header.testNetwork}
+          </Text>
         </Box>
 
         {/* Send Block */}
@@ -964,8 +1052,9 @@ export default function PaymentPage() {
                 value={amount}
                 onValueChange={e => setAmount(e.value)}
                 min={0}
-                step={0.001}
+                step={1}
                 disabled={!sessionKey || isSessionKeyExpired || isSending || isCooldown}
+                width="full"
               >
                 <NumberInput.Field
                   type="text"
@@ -985,7 +1074,7 @@ export default function PaymentPage() {
               )}
             </Field>
 
-            <HStack gap={4}>
+            <HStack gap={4} justify="space-between">
               <Button
                 bg={brandColors.accent}
                 color="white"
@@ -1000,11 +1089,9 @@ export default function PaymentPage() {
               </Button>
               {!paymentRequestDetected && (
                 <Button
-                  bg={brandColors.primary}
-                  color="white"
-                  _hover={{ bg: brandColors.secondary }}
                   variant="outline"
-                  size="sm"
+                  size="lg"
+                  borderColor={brandColors.primary}
                   onClick={onRequestModalOpen}
                   disabled={!sessionKey || isSessionKeyExpired || isSending || isCooldown}
                 >
@@ -1114,11 +1201,11 @@ export default function PaymentPage() {
                         value={requestAmount}
                         onValueChange={e => setRequestAmount(e.value)}
                         min={0}
-                        step={0.001}
+                        step={1}
                       >
                         <NumberInput.Field
                           type="text"
-                          placeholder="0.00"
+                          placeholder="0"
                           fontFamily="mono"
                           onWheel={(e: any) => e.currentTarget.blur()}
                         />
@@ -1154,72 +1241,76 @@ export default function PaymentPage() {
                 )}
               </Dialog.Body>
 
-              <Dialog.Footer pt={{ base: 2, md: 4 }} gap={2} flexWrap="wrap">
+              <Dialog.Footer pt={{ base: 2, md: 4 }}>
                 {!isQRGenerated ? (
-                  <>
-                    <Button
-                      bg="blue.600"
-                      color="white"
-                      _hover={{ bg: 'blue.500' }}
-                      size={{ base: 'sm', md: 'md' }}
-                      onClick={handleRequestPayment}
-                      disabled={!requestAmount || parseFloat(requestAmount) <= 0}
-                    >
-                      <FaQrcode />
-                      Generate QR
-                    </Button>
-
-                    {isWebNFCSupported ? (
+                  <VStack align="stretch" width="full" gap={2}>
+                    <HStack gap={2} justify="flex-start">
                       <Button
-                        bg="green.600"
+                        bg={brandColors.accent}
                         color="white"
-                        _hover={{ bg: 'green.500' }}
+                        _hover={{ bg: brandColors.accent, opacity: 0.8 }}
                         size={{ base: 'sm', md: 'md' }}
-                        onClick={() => {
-                          if (!safeAddress || !requestAmount) return
-                          try {
-                            const amountInWei = ethers.parseEther(requestAmount).toString()
-                            const paymentUrl = generatePaymentRequestUrl(
-                              safeAddress,
-                              amountInWei,
-                              EURO_TOKEN_ADDRESS
-                            )
-                            writeNFC(paymentUrl)
-                          } catch (err) {
-                            toaster.create({
-                              title: 'Invalid Amount',
-                              description: 'Please enter a valid EUR amount.',
-                              type: 'error',
-                              duration: 3000,
-                            })
-                          }
-                        }}
+                        onClick={handleRequestPayment}
                         disabled={!requestAmount || parseFloat(requestAmount) <= 0}
                       >
-                        <FaSatellite />
-                        Write to NFC
+                        <FaQrcode />
+                        Generate QR
                       </Button>
-                    ) : (
-                      <Tooltip
-                        content="NFC write requires HTTPS, Android device, Chrome browser, and NDEFWriter API support. Some devices may have restricted NFC write access."
-                        showArrow={true}
-                      >
-                        <span>
-                          <Button disabled bg="gray.600" size={{ base: 'sm', md: 'md' }}>
-                            NFC Not Available
-                          </Button>
-                        </span>
-                      </Tooltip>
-                    )}
 
-                    <Button
-                      variant="ghost"
-                      size={{ base: 'sm', md: 'md' }}
-                      onClick={handleRequestModalClose}
-                    >
-                      Close
-                    </Button>
-                  </>
+                      {isWebNFCSupported ? (
+                        <Button
+                          bg="green.600"
+                          color="white"
+                          _hover={{ bg: 'green.500' }}
+                          size={{ base: 'sm', md: 'md' }}
+                          onClick={() => {
+                            if (!safeAddress || !requestAmount) return
+                            try {
+                              const amountInWei = ethers.parseEther(requestAmount).toString()
+                              const paymentUrl = generatePaymentRequestUrl(
+                                safeAddress,
+                                amountInWei,
+                                EURO_TOKEN_ADDRESS
+                              )
+                              writeNFC(paymentUrl)
+                            } catch (err) {
+                              toaster.create({
+                                title: 'Invalid Amount',
+                                description: 'Please enter a valid EUR amount.',
+                                type: 'error',
+                                duration: 3000,
+                              })
+                            }
+                          }}
+                          disabled={!requestAmount || parseFloat(requestAmount) <= 0}
+                        >
+                          <FaSatellite />
+                          Write to NFC
+                        </Button>
+                      ) : (
+                        <Tooltip
+                          content="NFC write requires HTTPS, Android device, Chrome browser, and NDEFWriter API support. Some devices may have restricted NFC write access."
+                          showArrow={true}
+                        >
+                          <span>
+                            <Button disabled bg="gray.600" size={{ base: 'sm', md: 'md' }}>
+                              NFC Not Available
+                            </Button>
+                          </span>
+                        </Tooltip>
+                      )}
+                    </HStack>
+
+                    <HStack justify="flex-end">
+                      <Button
+                        variant="ghost"
+                        size={{ base: 'sm', md: 'md' }}
+                        onClick={handleRequestModalClose}
+                      >
+                        Close
+                      </Button>
+                    </HStack>
+                  </VStack>
                 ) : (
                   <Button
                     bg={brandColors.accent}
diff --git a/src/app/safe/page.tsx b/src/app/safe/page.tsx
index 2174bdc..2c4cde7 100644
--- a/src/app/safe/page.tsx
+++ b/src/app/safe/page.tsx
@@ -20,18 +20,7 @@ import { ethers } from 'ethers'
 import { FiShield, FiKey, FiCheckCircle, FiClock, FiDollarSign } from 'react-icons/fi'
 import { useRouter } from 'next/navigation'
 import { brandColors } from '@/theme'
-
-interface SessionKey {
-  sessionKeyAddress: string
-  sessionKeyIndex: number
-  expiresAt: string
-  permissions: {
-    spendingLimit: string
-    allowedTokens: string[]
-    validAfter: number
-    validUntil: number
-  }
-}
+import { setupSafeWithSessionKey, SessionKey } from '@/lib/safeActions'
 
 type SetupStep = 'idle' | 'deploying' | 'enablingModule' | 'creatingSessionKey' | 'error'
 
@@ -46,10 +35,9 @@ export default function SafePage() {
   const [derivedAddresses, setDerivedAddresses] = useState<string[]>([])
   const [sessionKey, setSessionKey] = useState<SessionKey | null>(null)
   const [isDeploying, setIsDeploying] = useState(false)
-  const [isCreatingSession, setIsCreatingSession] = useState(false) // Can potentially be removed
+  const [isCreatingSession, setIsCreatingSession] = useState(false)
   const [isLoadingBalance, setIsLoadingBalance] = useState(false)
-  const [isEnablingModule, setIsEnablingModule] = useState(false) // Can potentially be removed
-  const [moduleEnableTxData, setModuleEnableTxData] = useState<any>(null)
+  const [isEnablingModule, setIsEnablingModule] = useState(false)
   const [isMintingEUR, setIsMintingEUR] = useState(false)
 
   // New state for the combined setup flow - Explicitly typed
@@ -81,7 +69,7 @@ export default function SafePage() {
       if (safeAddress && isAuthenticated && !safeOwner) {
         // If we have a Safe but no owner info, try to derive and verify
         try {
-          const wallet0 = await deriveWallet('YOLO', 'SHEBAM')
+          const ownerWallet = await deriveWallet('STANDARD', 'OWNER')
 
           // Check on-chain if this wallet is an owner
           const response = await fetch('/api/safe/get-owners', {
@@ -97,18 +85,18 @@ export default function SafePage() {
           if (
             data.success &&
             data.owners?.some(
-              (owner: string) => owner.toLowerCase() === wallet0.address.toLowerCase()
+              (owner: string) => owner.toLowerCase() === ownerWallet.address.toLowerCase()
             )
           ) {
             // Update localStorage with owner info
-            setSafeOwner(wallet0.address)
+            setSafeOwner(ownerWallet.address)
             const existingData = localStorage.getItem(`safe_${user?.id}`)
             const existing = existingData ? JSON.parse(existingData) : {}
             localStorage.setItem(
               `safe_${user?.id}`,
               JSON.stringify({
                 ...existing,
-                safeOwner: wallet0.address,
+                safeOwner: ownerWallet.address,
               })
             )
           } else {
@@ -170,222 +158,80 @@ export default function SafePage() {
 
   const setupSafeAndSession = async () => {
     setCurrentSetupStep('deploying')
-    setIsDeploying(true) // Maintain existing state for UI elements like loadingText
+    setIsDeploying(true)
 
     try {
-      // Step 1: Deploy Safe
-      console.log('Step 1: Deploying Safe...')
-      const wallet0 = await deriveWallet('YOLO', 'SHEBAM')
-      const wallet1 = await deriveWallet('YOLO', 'BONUS')
-      setDerivedAddresses([wallet0.address, wallet1.address])
-
-      const deployResponse = await fetch('/api/safe/deploy-safe', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          userAddress: wallet0.address,
+      // Derive addresses for UI display
+      const ownerWallet = await deriveWallet('STANDARD', 'OWNER')
+      const userWallet = await deriveWallet('STANDARD', 'USER')
+      setDerivedAddresses([ownerWallet.address, userWallet.address])
+
+      const result = await setupSafeWithSessionKey(
+        {
+          deriveWallet,
+          signMessage,
           chainId: 10200,
-        }),
-      })
-
-      const deployData = await deployResponse.json()
-
-      if (!deployData.success) {
-        throw new Error(deployData.error || 'Failed to deploy Safe')
-      }
-
-      const newSafeAddress = deployData.safeAddress
-      setSafeAddress(newSafeAddress)
-      setSafeOwner(wallet0.address)
-
-      // Save to localStorage
-      localStorage.setItem(
-        `safe_${user?.id}`,
-        JSON.stringify({
-          safeAddress: newSafeAddress,
-          safeOwner: wallet0.address,
-        })
-      )
-
-      toaster.create({
-        title: 'Safe Deployed!',
-        description: `Your Safe is ready at ${newSafeAddress.slice(0, 10)}...`,
-        type: 'success',
-        duration: 1000,
-      })
-
-      await loadBalance()
-
-      // Step 2: Create Session Key (this might require enabling the module)
-      console.log('Step 2: Creating Session Key...')
-      setCurrentSetupStep('creatingSessionKey')
-      setIsCreatingSession(true) // Maintain existing state for UI elements like loadingText
-
-      const sessionResponse = await fetch('/api/safe/create-session-key', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          userAddress: wallet0.address,
-          safeAddress: newSafeAddress,
-          chainId: 10200,
-          sessionKeyAddress: wallet1.address, // Use derived address[1] as session key
-          sessionKeyIndex: 1,
-        }),
-      })
-
-      const sessionData = await sessionResponse.json()
-
-      if (sessionData.requiresModuleEnable) {
-        // If module needs enabling, do it now
-        console.log('Module needs enabling...')
-        setModuleEnableTxData(sessionData.enableModuleTxData)
-        setCurrentSetupStep('enablingModule')
-        setIsEnablingModule(true) // Maintain existing state for UI elements like loadingText
-
-        // Step 1: Get the Safe transaction hash from the server
-        console.log('Getting Safe transaction hash to sign...')
-
-        const hashResponse = await fetch('/api/safe/get-tx-hash', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            safeAddress: newSafeAddress,
-            to: sessionData.enableModuleTxData.to,
-            data: sessionData.enableModuleTxData.data,
-            value: sessionData.enableModuleTxData.value || '0',
-            chainId: 10200,
-          }),
-        })
-
-        const hashData = await hashResponse.json()
-        if (!hashData.success) {
-          throw new Error(hashData.error || 'Failed to get transaction hash')
-        }
-
-        console.log('Transaction hash to sign:', hashData.txHash)
-
-        // Step 2: Sign the Safe transaction hash with w3pk
-        // We need to sign the raw hash directly, not with EIP-191 prefix
-        // So we use YOLO mode to get the private key and sign directly
-        console.log('Deriving wallet in YOLO mode to sign transaction...')
-        const yoloWallet = await deriveWallet('YOLO', 'SHEBAM')
-
-        if (!yoloWallet.privateKey) {
-          throw new Error('Failed to get private key in YOLO mode')
-        }
-
-        // Sign the raw Safe transaction hash directly with ethers
-        const { ethers } = await import('ethers')
-        const signingKey = new ethers.SigningKey(yoloWallet.privateKey)
-        const signature = signingKey.sign(hashData.txHash).serialized
-
-        console.log('Transaction hash signed with w3pk (YOLO mode)')
-
-        // Step 3: Send the signed hash to the server for execution
-        const executeResponse = await fetch('/api/safe/execute-tx', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            safeAddress: newSafeAddress,
-            to: sessionData.enableModuleTxData.to,
-            data: sessionData.enableModuleTxData.data,
-            value: sessionData.enableModuleTxData.value || '0',
-            ownerAddress: wallet0.address,
-            signature,
-            chainId: 10200,
-          }),
-        })
-
-        const executeResult = await executeResponse.json()
-
-        if (!executeResult.success) {
-          throw new Error(executeResult.error || 'Failed to enable module')
-        }
-
-        toaster.create({
-          title: 'Module Enabled!',
-          description: 'Smart Sessions module is now enabled on your Safe',
-          type: 'success',
-          duration: 1000,
-        })
-        setModuleEnableTxData(null)
-
-        await new Promise(resolve => setTimeout(resolve, 3000))
-
-        // Now try creating the session key again after enabling the module
-        const finalSessionResponse = await fetch('/api/safe/create-session-key', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            userAddress: wallet0.address,
-            safeAddress: newSafeAddress,
-            chainId: 10200,
-            sessionKeyAddress: wallet1.address,
-            sessionKeyIndex: 1,
-          }),
-        })
-
-        const finalSessionData = await finalSessionResponse.json()
-
-        if (!finalSessionData.success) {
-          throw new Error(
-            finalSessionData.error || 'Failed to create session key after enabling module'
-          )
+          userId: user?.id,
+        },
+        {
+          onDeploying: () => {
+            setCurrentSetupStep('deploying')
+            setIsDeploying(true)
+          },
+          onDeployed: (result) => {
+            setSafeAddress(result.safeAddress)
+            setSafeOwner(result.safeOwner)
+            toaster.create({
+              title: 'Safe Deployed!',
+              description: `Your Safe is ready at ${result.safeAddress.slice(0, 10)}...`,
+              type: 'success',
+              duration: 1000,
+            })
+            loadBalance()
+          },
+          onEnablingModule: () => {
+            setCurrentSetupStep('enablingModule')
+            setIsEnablingModule(true)
+          },
+          onModuleEnabled: () => {
+            toaster.create({
+              title: 'Module Enabled!',
+              description: 'Smart Sessions module is now enabled on your Safe',
+              type: 'success',
+              duration: 1000,
+            })
+          },
+          onCreatingSessionKey: () => {
+            setCurrentSetupStep('creatingSessionKey')
+            setIsCreatingSession(true)
+          },
+          onSessionKeyCreated: (sessionKey) => {
+            setSessionKey(sessionKey)
+            toaster.create({
+              title: 'Session Key Created!',
+              description: 'You can now send gasless transactions',
+              type: 'success',
+              duration: 5000,
+            })
+          },
+          onError: (error) => {
+            console.error('Setup error:', error)
+            setCurrentSetupStep('error')
+            toaster.create({
+              title: 'Setup Failed',
+              description: error,
+              type: 'error',
+              duration: 8000,
+            })
+          },
         }
+      )
 
-        setSessionKey(finalSessionData)
-
-        // Save session key to localStorage
-        const existingData = localStorage.getItem(`safe_${user?.id}`)
-        const existing = existingData ? JSON.parse(existingData) : {}
-        localStorage.setItem(
-          `safe_${user?.id}`,
-          JSON.stringify({
-            ...existing,
-            safeAddress: newSafeAddress,
-            sessionKey: finalSessionData,
-          })
-        )
-
-        toaster.create({
-          title: 'Session Key Created!',
-          description: 'You can now send gasless transactions',
-          type: 'success',
-          duration: 5000,
-        })
-      } else if (sessionData.success) {
-        // If module didn't need enabling, session key was created directly
-        setSessionKey(sessionData)
-
-        // Save session key to localStorage
-        const existingData = localStorage.getItem(`safe_${user?.id}`)
-        const existing = existingData ? JSON.parse(existingData) : {}
-        localStorage.setItem(
-          `safe_${user?.id}`,
-          JSON.stringify({
-            ...existing,
-            safeAddress: newSafeAddress,
-            sessionKey: sessionData,
-          })
-        )
-
-        // toast({
-        //   title: 'Session Key Created!',
-        //   description: 'You can now send gasless transactions',
-        //   status: 'success',
-        //   duration: 1000,
-        // })
+      if (result.success) {
+        router.push('/')
       } else {
-        throw new Error(sessionData.error || 'Failed to create session key')
+        setCurrentSetupStep('error')
       }
-
-      // toast({
-      //   title: 'Setup Complete!',
-      //   description: 'Your Safe and session key are ready.',
-      //   status: 'success',
-      //   duration: 5000,
-      // })
-      router.push('/')
     } catch (error: any) {
       console.error('Combined setup failed:', error)
       setCurrentSetupStep('error')
diff --git a/src/app/tx/layout.tsx b/src/app/tx/layout.tsx
index cd8b2f4..79820e0 100644
--- a/src/app/tx/layout.tsx
+++ b/src/app/tx/layout.tsx
@@ -7,7 +7,7 @@ export const metadata: Metadata = {
   openGraph: {
     title: 'Web3 payment app',
     description: 'Send and receive EUR with your Safe wallet',
-    url: 'https://w3pk.w3hc.org/tx',
+    url: 'https://sehbam.w3hc.org/tx',
     siteName: 'Shebam',
     images: [
       {
diff --git a/src/app/tx/page.tsx b/src/app/tx/page.tsx
index 9f77b7b..0f92209 100644
--- a/src/app/tx/page.tsx
+++ b/src/app/tx/page.tsx
@@ -467,7 +467,7 @@ export default function PaymentPage() {
   }, [safeAddress])
 
   const getTxBaseUrl = () => {
-    if (typeof window === 'undefined') return 'https://w3pk.w3hc.org/tx/'
+    if (typeof window === 'undefined') return 'https://shebam.w3hc.org/tx/'
 
     // Check if we're in development (localhost)
     if (
@@ -479,7 +479,7 @@ export default function PaymentPage() {
     }
 
     // Otherwise, assume production
-    return 'https://w3pk.w3hc.org/tx/'
+    return 'https://shebam.w3hc.org/tx/'
   }
 
   const generatePaymentRequestUrl = (
diff --git a/src/components/BuildVerification.tsx b/src/components/BuildVerification.tsx
index 2841807..dab8990 100644
--- a/src/components/BuildVerification.tsx
+++ b/src/components/BuildVerification.tsx
@@ -17,7 +17,7 @@ import { brandColors } from '@/theme'
 import Spinner from '@/components/Spinner'
 import { verifyBuildHash, getCurrentBuildHash } from 'w3pk'
 
-const TRUSTED_BUILD_HASH = 'bafybeiaehsrukvfhl5b4y2p75iz74ndgel3trjhvwbx5oihlcse5qbiudi' // w3pk v0.8.5
+const TRUSTED_BUILD_HASH = 'bafybeig3zio47awahzmqzg6aiezzhp5awao27mze5j2jsrebka4jupmgxm' // w3pk v0.8.5
 
 export const BuildVerification = () => {
   const [isVerifying, setIsVerifying] = useState(true)
diff --git a/src/components/OnboardingProgress.tsx b/src/components/OnboardingProgress.tsx
new file mode 100644
index 0000000..48e7801
--- /dev/null
+++ b/src/components/OnboardingProgress.tsx
@@ -0,0 +1,112 @@
+'use client'
+
+import { Box, Container, Heading, Text, VStack } from '@chakra-ui/react'
+import { brandColors } from '@/theme'
+
+export type OnboardingStep =
+  | 'deploying-safe'
+  | 'safe-deployed'
+  | 'enabling-module'
+  | 'module-enabled'
+  | 'creating-session-key'
+  | 'session-key-created'
+  | 'complete'
+
+interface OnboardingProgressProps {
+  currentStep: OnboardingStep
+  error?: string
+}
+
+const stepInfo: Record<OnboardingStep, { label: string; progress: number }> = {
+  'deploying-safe': { label: 'Deploying your onchain Safe...', progress: 20 },
+  'safe-deployed': { label: 'Onchain Safe deployed', progress: 40 },
+  'enabling-module': { label: 'Enabling session key module...', progress: 50 },
+  'module-enabled': { label: 'Session key module enabled', progress: 70 },
+  'creating-session-key': { label: 'Creating session key...', progress: 80 },
+  'session-key-created': { label: 'Session key created', progress: 95 },
+  complete: { label: 'Setup complete!', progress: 100 },
+}
+
+export function OnboardingProgress({ currentStep, error }: OnboardingProgressProps) {
+  const { label, progress } = stepInfo[currentStep]
+
+  // Calculate completed status messages to accumulate (only show completed, not in-progress)
+  const completedMessages: string[] = []
+  const stepOrder: OnboardingStep[] = [
+    'deploying-safe',
+    'safe-deployed',
+    'enabling-module',
+    'module-enabled',
+    'creating-session-key',
+    'session-key-created',
+    'complete',
+  ]
+
+  // Only show completed steps
+  const completedStepKeys: OnboardingStep[] = [
+    'safe-deployed',
+    'module-enabled',
+    'session-key-created',
+    'complete',
+  ]
+
+  const currentIndex = stepOrder.indexOf(currentStep)
+
+  // Build accumulated completed messages
+  for (const stepKey of completedStepKeys) {
+    const stepIndex = stepOrder.indexOf(stepKey)
+    // Only add if this step has been completed (not the current step unless it's complete)
+    if (stepIndex < currentIndex || currentStep === 'complete') {
+      completedMessages.push(stepInfo[stepKey].label)
+    }
+  }
+
+  return (
+    <Container maxW="container.md" py={20}>
+      <Box textAlign="center">
+        <Heading as="h1" size="xl" mb={6}>
+          Setting up your account
+        </Heading>
+
+        {error ? (
+          <Box bg="red.900" border="1px solid" borderColor="red.700" borderRadius="md" p={4} mb={6}>
+            <Text color="red.200" fontWeight="medium">
+              {error}
+            </Text>
+          </Box>
+        ) : (
+          <>
+            {/* Custom Progress Bar with brand primary color */}
+            <Box w="100%" h="10px" bg="gray.700" borderRadius="full" overflow="hidden" mb={4}>
+              <Box
+                h="100%"
+                w={`${progress}%`}
+                bg={brandColors.primary}
+                borderRadius="full"
+                transition="width 0.3s ease-in-out"
+              />
+            </Box>
+
+            {/* Current action in white under progress bar */}
+            <Text color="white" fontSize="md" mb={8} fontWeight="normal">
+              {label}
+            </Text>
+
+            {/* Accumulated completed messages */}
+            {completedMessages.length > 0 && (
+              <VStack align="stretch" gap={2} maxW="500px" mx="auto">
+                {completedMessages.map((message, index) => (
+                  <Box key={index} textAlign="left" transition="all 0.3s ease-in-out">
+                    <Text color={brandColors.accent} fontSize="sm" fontWeight="medium">
+                      {message}
+                    </Text>
+                  </Box>
+                ))}
+              </VStack>
+            )}
+          </>
+        )}
+      </Box>
+    </Container>
+  )
+}
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index de53d40..d56840f 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -4,16 +4,41 @@ import { Dialog as ChakraDialog, Portal } from '@chakra-ui/react'
 import { forwardRef } from 'react'
 
 const DialogContent = forwardRef<HTMLDivElement, any>((props, ref) => {
-  return <ChakraDialog.Content ref={ref} p={6} {...props} />
+  return (
+    <ChakraDialog.Content
+      ref={ref}
+      p={{ base: 4, md: 6 }}
+      m={{ base: 4, md: 6 }}
+      maxW={{ base: 'calc(100vw - 2rem)', md: 'md' }}
+      borderRadius="lg"
+      boxShadow="xl"
+      {...props}
+    />
+  )
 })
 
 DialogContent.displayName = 'DialogContent'
 
+const DialogPositioner = forwardRef<HTMLDivElement, any>((props, ref) => {
+  return (
+    <ChakraDialog.Positioner
+      ref={ref}
+      display="flex"
+      alignItems={{ base: 'flex-start', md: 'center' }}
+      justifyContent="center"
+      pt={{ base: '20vh', md: 0 }}
+      {...props}
+    />
+  )
+})
+
+DialogPositioner.displayName = 'DialogPositioner'
+
 export const Dialog = {
   Root: ChakraDialog.Root,
   Trigger: ChakraDialog.Trigger,
   Backdrop: ChakraDialog.Backdrop,
-  Positioner: ChakraDialog.Positioner,
+  Positioner: DialogPositioner,
   Content: DialogContent,
   Header: ChakraDialog.Header,
   Title: ChakraDialog.Title,
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index 2fe3fe6..ed84cd7 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -8,6 +8,17 @@ export const Input = forwardRef<HTMLInputElement, React.ComponentProps<typeof Ch
     <ChakraInput
       ref={ref}
       px={3}
+      py={2}
+      bg="gray.900"
+      borderColor="gray.600"
+      borderWidth="1px"
+      _hover={{ borderColor: 'gray.500' }}
+      _focus={{
+        borderColor: '#45a2f8',
+        boxShadow: '0 0 0 1px #45a2f8',
+        bg: 'gray.800'
+      }}
+      _placeholder={{ color: 'gray.500' }}
       {...props}
     />
   )
diff --git a/src/components/ui/number-input.tsx b/src/components/ui/number-input.tsx
index b5c639b..6766ce4 100644
--- a/src/components/ui/number-input.tsx
+++ b/src/components/ui/number-input.tsx
@@ -3,10 +3,33 @@
 import { NumberInput as ChakraNumberInput } from '@chakra-ui/react'
 import { forwardRef } from 'react'
 
+const NumberInputField = forwardRef<HTMLInputElement, any>((props, ref) => {
+  return (
+    <ChakraNumberInput.Input
+      ref={ref}
+      px={3}
+      py={2}
+      bg="gray.900"
+      borderColor="gray.600"
+      borderWidth="1px"
+      _hover={{ borderColor: 'gray.500' }}
+      _focus={{
+        borderColor: '#45a2f8',
+        boxShadow: '0 0 0 1px #45a2f8',
+        bg: 'gray.800'
+      }}
+      _placeholder={{ color: 'gray.500' }}
+      {...props}
+    />
+  )
+})
+
+NumberInputField.displayName = 'NumberInputField'
+
 export const NumberInput = {
   Root: ChakraNumberInput.Root,
   Label: ChakraNumberInput.Label,
-  Field: ChakraNumberInput.Input,
+  Field: NumberInputField,
   Control: ChakraNumberInput.Control,
   IncrementTrigger: ChakraNumberInput.IncrementTrigger,
   DecrementTrigger: ChakraNumberInput.DecrementTrigger,
diff --git a/src/context/W3PK.tsx b/src/context/W3PK.tsx
index 2ab8fdc..5e9c3bc 100644
--- a/src/context/W3PK.tsx
+++ b/src/context/W3PK.tsx
@@ -80,6 +80,17 @@ interface StealthAddressResult {
   viewTag: string
 }
 
+// Signing options
+type SigningMethod = 'EIP191' | 'rawHash'
+type SecurityMode = 'STANDARD' | 'STRICT' | 'YOLO'
+
+interface SignMessageOptions {
+  mode?: SecurityMode // Security mode: STANDARD, STRICT, or YOLO
+  tag?: string // Tag for derivation (default: 'MAIN')
+  requireAuth?: boolean // Force fresh authentication
+  signingMethod?: SigningMethod // Signing method: EIP191 or rawHash
+}
+
 interface W3pkType {
   isAuthenticated: boolean
   user: W3pkUser | null
@@ -87,7 +98,7 @@ interface W3pkType {
   login: () => Promise<void>
   register: (username: string) => Promise<void>
   logout: () => void
-  signMessage: (message: string) => Promise<string | null>
+  signMessage: (message: string, options?: SignMessageOptions) => Promise<string | null>
   deriveWallet: (mode?: string, tag?: string) => Promise<DerivedWallet>
   getAddress: (mode?: string, tag?: string) => Promise<string>
   getBackupStatus: () => Promise<BackupStatus>
@@ -337,13 +348,13 @@ export const W3pkProvider: React.FC<W3pkProviderProps> = ({ children }) => {
 
       console.log('[W3PK] Registration successful')
 
-      toaster.create({
-        title: 'Done! 🎉',
-        description:
-          "Your encrypted wallet has been created and stored on your device. Don't forget to back it up!",
-        type: 'success',
-        duration: 3000,
-      })
+      // toaster.create({
+      //   title: 'Done! 🎉',
+      //   description:
+      //     "Your encrypted wallet has been created and stored on your device. Don't forget to back it up!",
+      //   type: 'success',
+      //   duration: 3000,
+      // })
     } catch (error) {
       console.error('[W3PK] Registration failed:', error)
 
@@ -420,7 +431,10 @@ export const W3pkProvider: React.FC<W3pkProviderProps> = ({ children }) => {
     await w3pk.login()
   }, [w3pk])
 
-  const signMessage = async (message: string): Promise<string | null> => {
+  const signMessage = async (
+    message: string,
+    options?: SignMessageOptions
+  ): Promise<string | null> => {
     if (!user) {
       toaster.create({
         title: 'Not Authenticated',
@@ -433,10 +447,33 @@ export const W3pkProvider: React.FC<W3pkProviderProps> = ({ children }) => {
 
     try {
       await ensureAuthentication()
-      const result = await w3pk.signMessage(message)
+
+      // Build w3pk signMessage options
+      const w3pkOptions: any = {}
+
+      if (options?.mode) {
+        w3pkOptions.mode = options.mode
+      }
+
+      if (options?.tag) {
+        w3pkOptions.tag = options.tag
+      }
+
+      if (options?.requireAuth !== undefined) {
+        w3pkOptions.requireAuth = options.requireAuth
+      }
+
+      if (options?.signingMethod) {
+        w3pkOptions.signingMethod = options.signingMethod
+      }
+
+      const result = await w3pk.signMessage(message, w3pkOptions)
 
       // Extend session after successful operation for better UX
-      w3pk.extendSession()
+      // Note: STRICT mode sessions are never persisted
+      if (options?.mode !== 'STRICT') {
+        w3pk.extendSession()
+      }
 
       return result.signature
     } catch (error) {
diff --git a/src/lib/safeActions.ts b/src/lib/safeActions.ts
new file mode 100644
index 0000000..7085d22
--- /dev/null
+++ b/src/lib/safeActions.ts
@@ -0,0 +1,387 @@
+import { ethers } from 'ethers'
+
+export interface SessionKey {
+  sessionKeyAddress: string
+  sessionKeyIndex: number
+  expiresAt: string
+  permissions: {
+    spendingLimit: string
+    allowedTokens: string[]
+    validAfter: number
+    validUntil: number
+  }
+}
+
+export interface SafeDeploymentResult {
+  success: boolean
+  safeAddress: string
+  safeOwner: string
+  txHash?: string
+  deploymentBlockNumber?: number
+  error?: string
+}
+
+export interface SessionKeyCreationResult {
+  success: boolean
+  sessionKey?: SessionKey
+  requiresModuleEnable?: boolean
+  enableModuleTxData?: {
+    to: string
+    data: string
+    value: string
+  }
+  error?: string
+}
+
+type SigningMethod = 'EIP191' | 'rawHash'
+type SecurityMode = 'STANDARD' | 'STRICT' | 'YOLO'
+
+interface SignMessageOptions {
+  mode?: SecurityMode
+  tag?: string
+  requireAuth?: boolean
+  signingMethod?: SigningMethod
+}
+
+export interface SafeActionsConfig {
+  deriveWallet: (mode: string, tag: string) => Promise<{ address: string; privateKey?: string }>
+  signMessage: (message: string, options?: SignMessageOptions) => Promise<string | null>
+  chainId: number
+  userId?: string
+}
+
+/**
+ * Deploy a Safe wallet for the user
+ */
+export async function deploySafe(
+  config: SafeActionsConfig
+): Promise<SafeDeploymentResult> {
+  try {
+    const ownerWallet = await config.deriveWallet('STANDARD', 'OWNER')
+
+    const deployResponse = await fetch('/api/safe/deploy-safe', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        userAddress: ownerWallet.address,
+        chainId: config.chainId,
+      }),
+    })
+
+    const deployData = await deployResponse.json()
+
+    if (!deployData.success) {
+      return {
+        success: false,
+        safeAddress: '',
+        safeOwner: '',
+        error: deployData.error || 'Failed to deploy Safe',
+      }
+    }
+
+    const result: SafeDeploymentResult = {
+      success: true,
+      safeAddress: deployData.safeAddress,
+      safeOwner: ownerWallet.address,
+      txHash: deployData.txHash,
+      deploymentBlockNumber: deployData.deploymentBlockNumber,
+    }
+
+    // Save to localStorage if userId is provided
+    if (config.userId) {
+      localStorage.setItem(
+        `safe_${config.userId}`,
+        JSON.stringify({
+          safeAddress: result.safeAddress,
+          safeOwner: result.safeOwner,
+        })
+      )
+    }
+
+    return result
+  } catch (error: any) {
+    return {
+      success: false,
+      safeAddress: '',
+      safeOwner: '',
+      error: error.message || 'Failed to deploy Safe',
+    }
+  }
+}
+
+/**
+ * Create a session key for a Safe wallet
+ */
+export async function createSessionKey(
+  config: SafeActionsConfig,
+  safeAddress: string
+): Promise<SessionKeyCreationResult> {
+  try {
+    const ownerWallet = await config.deriveWallet('STANDARD', 'OWNER')
+    const userWallet = await config.deriveWallet('STANDARD', 'USER')
+
+    const sessionResponse = await fetch('/api/safe/create-session-key', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        userAddress: ownerWallet.address,
+        safeAddress: safeAddress,
+        chainId: config.chainId,
+        sessionKeyAddress: userWallet.address,
+        sessionKeyIndex: 1,
+      }),
+    })
+
+    const sessionData = await sessionResponse.json()
+
+    if (sessionData.requiresModuleEnable) {
+      return {
+        success: false,
+        requiresModuleEnable: true,
+        enableModuleTxData: sessionData.enableModuleTxData,
+      }
+    }
+
+    if (!sessionData.success) {
+      return {
+        success: false,
+        error: sessionData.error || 'Failed to create session key',
+      }
+    }
+
+    return {
+      success: true,
+      sessionKey: sessionData,
+    }
+  } catch (error: any) {
+    return {
+      success: false,
+      error: error.message || 'Failed to create session key',
+    }
+  }
+}
+
+/**
+ * Enable the Smart Sessions module on a Safe wallet
+ */
+export async function enableModule(
+  config: SafeActionsConfig,
+  safeAddress: string,
+  enableModuleTxData: { to: string; data: string; value: string }
+): Promise<{ success: boolean; error?: string }> {
+  try {
+    const ownerWallet = await config.deriveWallet('STANDARD', 'OWNER')
+
+    // Get the Safe transaction hash to sign
+    const hashResponse = await fetch('/api/safe/get-tx-hash', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        safeAddress: safeAddress,
+        to: enableModuleTxData.to,
+        data: enableModuleTxData.data,
+        value: enableModuleTxData.value || '0',
+        chainId: config.chainId,
+      }),
+    })
+
+    const hashData = await hashResponse.json()
+    if (!hashData.success) {
+      return {
+        success: false,
+        error: hashData.error || 'Failed to get transaction hash',
+      }
+    }
+
+    // Sign the Safe transaction hash
+    const signature = await config.signMessage(hashData.txHash, {
+      mode: 'STANDARD',
+      tag: 'OWNER',
+      signingMethod: 'rawHash',
+    })
+
+    if (!signature) {
+      return {
+        success: false,
+        error: 'Failed to sign transaction - signature is null',
+      }
+    }
+
+    // Execute the transaction
+    const executeResponse = await fetch('/api/safe/execute-tx', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        safeAddress: safeAddress,
+        to: enableModuleTxData.to,
+        data: enableModuleTxData.data,
+        value: enableModuleTxData.value || '0',
+        ownerAddress: ownerWallet.address,
+        signature,
+        chainId: config.chainId,
+      }),
+    })
+
+    const executeResult = await executeResponse.json()
+
+    if (!executeResult.success) {
+      return {
+        success: false,
+        error: executeResult.error || 'Failed to enable module',
+      }
+    }
+
+    return { success: true }
+  } catch (error: any) {
+    return {
+      success: false,
+      error: error.message || 'Failed to enable module',
+    }
+  }
+}
+
+/**
+ * Complete setup: Deploy Safe, enable module if needed, and create session key
+ */
+export async function setupSafeWithSessionKey(
+  config: SafeActionsConfig,
+  callbacks?: {
+    onDeploying?: () => void
+    onDeployed?: (result: SafeDeploymentResult) => void
+    onEnablingModule?: () => void
+    onModuleEnabled?: () => void
+    onCreatingSessionKey?: () => void
+    onSessionKeyCreated?: (sessionKey: SessionKey) => void
+    onError?: (error: string) => void
+  }
+): Promise<{
+  success: boolean
+  safeAddress?: string
+  safeOwner?: string
+  sessionKey?: SessionKey
+  error?: string
+}> {
+  try {
+    // Step 1: Deploy Safe
+    callbacks?.onDeploying?.()
+    const deployResult = await deploySafe(config)
+
+    if (!deployResult.success) {
+      callbacks?.onError?.(deployResult.error || 'Failed to deploy Safe')
+      return {
+        success: false,
+        error: deployResult.error,
+      }
+    }
+
+    callbacks?.onDeployed?.(deployResult)
+
+    // Step 2: Create Session Key (may require enabling module)
+    callbacks?.onCreatingSessionKey?.()
+    const sessionResult = await createSessionKey(config, deployResult.safeAddress)
+
+    if (sessionResult.requiresModuleEnable && sessionResult.enableModuleTxData) {
+      // Enable module
+      callbacks?.onEnablingModule?.()
+      const enableResult = await enableModule(
+        config,
+        deployResult.safeAddress,
+        sessionResult.enableModuleTxData
+      )
+
+      if (!enableResult.success) {
+        callbacks?.onError?.(enableResult.error || 'Failed to enable module')
+        return {
+          success: false,
+          safeAddress: deployResult.safeAddress,
+          safeOwner: deployResult.safeOwner,
+          error: enableResult.error,
+        }
+      }
+
+      callbacks?.onModuleEnabled?.()
+
+      // Wait a bit for the module to be fully enabled
+      await new Promise(resolve => setTimeout(resolve, 3000))
+
+      // Try creating session key again
+      callbacks?.onCreatingSessionKey?.()
+      const finalSessionResult = await createSessionKey(config, deployResult.safeAddress)
+
+      if (!finalSessionResult.success || !finalSessionResult.sessionKey) {
+        callbacks?.onError?.(
+          finalSessionResult.error || 'Failed to create session key after enabling module'
+        )
+        return {
+          success: false,
+          safeAddress: deployResult.safeAddress,
+          safeOwner: deployResult.safeOwner,
+          error: finalSessionResult.error,
+        }
+      }
+
+      // Save session key to localStorage if userId is provided
+      if (config.userId) {
+        const existingData = localStorage.getItem(`safe_${config.userId}`)
+        const existing = existingData ? JSON.parse(existingData) : {}
+        localStorage.setItem(
+          `safe_${config.userId}`,
+          JSON.stringify({
+            ...existing,
+            safeAddress: deployResult.safeAddress,
+            sessionKey: finalSessionResult.sessionKey,
+          })
+        )
+      }
+
+      callbacks?.onSessionKeyCreated?.(finalSessionResult.sessionKey)
+
+      return {
+        success: true,
+        safeAddress: deployResult.safeAddress,
+        safeOwner: deployResult.safeOwner,
+        sessionKey: finalSessionResult.sessionKey,
+      }
+    }
+
+    if (!sessionResult.success || !sessionResult.sessionKey) {
+      callbacks?.onError?.(sessionResult.error || 'Failed to create session key')
+      return {
+        success: false,
+        safeAddress: deployResult.safeAddress,
+        safeOwner: deployResult.safeOwner,
+        error: sessionResult.error,
+      }
+    }
+
+    // Save session key to localStorage if userId is provided
+    if (config.userId) {
+      const existingData = localStorage.getItem(`safe_${config.userId}`)
+      const existing = existingData ? JSON.parse(existingData) : {}
+      localStorage.setItem(
+        `safe_${config.userId}`,
+        JSON.stringify({
+          ...existing,
+          safeAddress: deployResult.safeAddress,
+          sessionKey: sessionResult.sessionKey,
+        })
+      )
+    }
+
+    callbacks?.onSessionKeyCreated?.(sessionResult.sessionKey)
+
+    return {
+      success: true,
+      safeAddress: deployResult.safeAddress,
+      safeOwner: deployResult.safeOwner,
+      sessionKey: sessionResult.sessionKey,
+    }
+  } catch (error: any) {
+    const errorMessage = error.message || 'An error occurred during setup'
+    callbacks?.onError?.(errorMessage)
+    return {
+      success: false,
+      error: errorMessage,
+    }
+  }
+}
diff --git a/src/translations/index.ts b/src/translations/index.ts
index 763e95f..1bbe706 100644
--- a/src/translations/index.ts
+++ b/src/translations/index.ts
@@ -24,6 +24,28 @@ type TranslationKeys = {
     title: string
     loginRequired: string
   }
+  header: {
+    intro: string
+    faster: string
+    and: string
+    cheaper: string
+    thanAnyExisting: string
+    onchainEuro: string
+    legallyRegulated: string
+    testNetwork: string
+    mainNetwork: string
+  }
+  onboarding: {
+    settingUp: string
+    deployingSafe: string
+    safeDeployed: string
+    enablingModule: string
+    moduleEnabled: string
+    creatingSessionKey: string
+    sessionKeyCreated: string
+    complete: string
+    error: string
+  }
 }
 
 // Define translations for each supported language
@@ -43,8 +65,8 @@ export const translations: Translations = {
     home: {
       title: 'Welcome!',
       subtitle: "It's a pleasure to have you here!",
-      greeting: 'Hello Anon!',
-      greetingSubtitle: 'Sit back, relax, and build something cool!',
+      greeting: 'Welcome!',
+      greetingSubtitle: 'Relax and enjoy life!',
     },
     navigation: {
       settings: 'Settings',
@@ -53,6 +75,30 @@ export const translations: Translations = {
       title: 'Settings',
       loginRequired: 'Please login to access your settings',
     },
+    header: {
+      intro: 'Shebam is',
+      faster: 'faster',
+      and: 'and',
+      cheaper: 'cheaper',
+      thanAnyExisting:
+        "than ANY existing payment system. We're using an onchain euro that is legally",
+      onchainEuro: 'onchain euro',
+      legallyRegulated: 'regulated',
+      testNetwork:
+        ". We're using a test network right now, but it will work exactly the same on the main network.",
+      mainNetwork: 'main network',
+    },
+    onboarding: {
+      settingUp: 'Setting up your account',
+      deployingSafe: 'Deploying your onchain Safe...',
+      safeDeployed: 'Onchain Safe deployed',
+      enablingModule: 'Enabling session key module...',
+      moduleEnabled: 'Session key module enabled',
+      creatingSessionKey: 'Creating session key...',
+      sessionKeyCreated: 'Session key created',
+      complete: 'Setup complete!',
+      error: 'An error occurred during setup',
+    },
   },
 
   // Mandarin Chinese
@@ -66,8 +112,8 @@ export const translations: Translations = {
     home: {
       title: '欢迎！',
       subtitle: '很高兴您来到这里！',
-      greeting: '你好，匿名用户！',
-      greetingSubtitle: '坐下来，放松，创造一些很酷的东西！',
+      greeting: '欢迎！',
+      greetingSubtitle: '放松并享受生活！',
     },
     navigation: {
       settings: '设置',
@@ -76,6 +122,28 @@ export const translations: Translations = {
       title: '设置',
       loginRequired: '请登录以访问您的设置',
     },
+    header: {
+      intro: 'Shebam',
+      faster: '更快',
+      and: '且',
+      cheaper: '更便宜',
+      thanAnyExisting: '比任何现有的支付系统都要好。我们使用的是合法的',
+      onchainEuro: '链上欧元',
+      legallyRegulated: '受监管',
+      testNetwork: '。我们目前使用测试网络，但在主网络上运行方式完全相同。',
+      mainNetwork: '主网络',
+    },
+    onboarding: {
+      settingUp: '设置您的账户',
+      deployingSafe: '正在部署您的链上Safe...',
+      safeDeployed: '链上Safe已部署',
+      enablingModule: '正在启用会话密钥模块...',
+      moduleEnabled: '会话密钥模块已启用',
+      creatingSessionKey: '正在创建会话密钥...',
+      sessionKeyCreated: '会话密钥已创建',
+      complete: '设置完成！',
+      error: '设置过程中发生错误',
+    },
   },
 
   // Hindi
@@ -89,8 +157,8 @@ export const translations: Translations = {
     home: {
       title: 'स्वागत है!',
       subtitle: 'आपका यहाँ स्वागत है!',
-      greeting: 'नमस्ते मित्र!',
-      greetingSubtitle: 'आराम से बैठें और कुछ शानदार बनाएं!',
+      greeting: 'स्वागत है!',
+      greetingSubtitle: 'आराम करें और जीवन का आनंद लें!',
     },
     navigation: {
       settings: 'सेटिंग्स',
@@ -99,6 +167,29 @@ export const translations: Translations = {
       title: 'सेटिंग्स',
       loginRequired: 'अपनी सेटिंग्स एक्सेस करने के लिए कृपया लॉगिन करें',
     },
+    header: {
+      intro: 'Shebam',
+      faster: 'तेज़',
+      and: 'और',
+      cheaper: 'सस्ता',
+      thanAnyExisting: 'किसी भी मौजूदा भुगतान प्रणाली से बेहतर है। हम एक कानूनी रूप से',
+      onchainEuro: 'ऑनचेन यूरो',
+      legallyRegulated: 'विनियमित',
+      testNetwork:
+        'का उपयोग कर रहे हैं। हम अभी एक टेस्ट नेटवर्क का उपयोग कर रहे हैं, लेकिन यह मुख्य नेटवर्क पर भी बिल्कुल उसी तरह काम करेगा।',
+      mainNetwork: 'मुख्य नेटवर्क',
+    },
+    onboarding: {
+      settingUp: 'अपना खाता सेट अप करना',
+      deployingSafe: 'आपका ऑनचेन Safe तैनात किया जा रहा है...',
+      safeDeployed: 'ऑनचेन Safe तैनात हो गया',
+      enablingModule: 'सत्र कुंजी मॉड्यूल सक्षम किया जा रहा है...',
+      moduleEnabled: 'सत्र कुंजी मॉड्यूल सक्षम हो गया',
+      creatingSessionKey: 'सत्र कुंजी बनाई जा रही है...',
+      sessionKeyCreated: 'सत्र कुंजी बन गई',
+      complete: 'सेटअप पूर्ण हो गया!',
+      error: 'सेटअप के दौरान एक त्रुटि हुई',
+    },
   },
 
   // Spanish
@@ -112,8 +203,8 @@ export const translations: Translations = {
     home: {
       title: '¡Bienvenido!',
       subtitle: '¡Es un placer tenerte aquí!',
-      greeting: '¡Hola Anon!',
-      greetingSubtitle: '¡Siéntate, relájate y crea algo genial!',
+      greeting: '¡Bienvenido!',
+      greetingSubtitle: '¡Relájate y disfruta de la vida!',
     },
     navigation: {
       settings: 'Configuración',
@@ -122,6 +213,30 @@ export const translations: Translations = {
       title: 'Configuración',
       loginRequired: 'Por favor inicia sesión para acceder a tu configuración',
     },
+    header: {
+      intro: 'Shebam es',
+      faster: 'más rápido',
+      and: 'y',
+      cheaper: 'más barato',
+      thanAnyExisting:
+        'que CUALQUIER sistema de pago existente. Estamos usando un euro en cadena que está legalmente',
+      onchainEuro: 'euro en cadena',
+      legallyRegulated: 'regulado',
+      testNetwork:
+        '. Estamos usando una red de prueba ahora, pero funcionará exactamente igual en la red principal.',
+      mainNetwork: 'red principal',
+    },
+    onboarding: {
+      settingUp: 'Configurando tu cuenta',
+      deployingSafe: 'Desplegando tu Safe en cadena...',
+      safeDeployed: 'Safe en cadena desplegada',
+      enablingModule: 'Habilitando módulo de clave de sesión...',
+      moduleEnabled: 'Módulo de clave de sesión habilitado',
+      creatingSessionKey: 'Creando clave de sesión...',
+      sessionKeyCreated: 'Clave de sesión creada',
+      complete: '¡Configuración completada!',
+      error: 'Ocurrió un error durante la configuración',
+    },
   },
 
   // French
@@ -135,7 +250,7 @@ export const translations: Translations = {
     home: {
       title: 'Bienvenue !',
       subtitle: "C'est un plaisir de vous avoir ici !",
-      greeting: 'Bonjour !',
+      greeting: 'Bienvenue !',
       greetingSubtitle: 'Détendez-vous et profitez de la vie !',
     },
     navigation: {
@@ -145,6 +260,30 @@ export const translations: Translations = {
       title: 'Paramètres',
       loginRequired: 'Veuillez vous connecter pour accéder à vos paramètres',
     },
+    header: {
+      intro: 'Shebam est',
+      faster: 'plus rapide',
+      and: 'et',
+      cheaper: 'moins cher',
+      thanAnyExisting:
+        "que N'IMPORTE QUEL système de paiement existant. Nous utilisons un euro onchain qui est légalement",
+      onchainEuro: 'euro en chaîne',
+      legallyRegulated: 'réglementé',
+      testNetwork:
+        '. Nous utilisons un réseau de test pour le moment, mais ça fonctionnera exactement de la même manière sur le réseau principal.',
+      mainNetwork: 'réseau principal',
+    },
+    onboarding: {
+      settingUp: 'Configuration de votre compte',
+      deployingSafe: 'Déploiement de votre Safe en chaîne...',
+      safeDeployed: 'Safe en chaîne déployé',
+      enablingModule: 'Activation du module de clé de session...',
+      moduleEnabled: 'Module de clé de session activé',
+      creatingSessionKey: 'Création de la clé de session...',
+      sessionKeyCreated: 'Clé de session créée',
+      complete: 'Configuration terminée !',
+      error: 'Une erreur est survenue lors de la configuration',
+    },
   },
 
   // Arabic
@@ -158,8 +297,8 @@ export const translations: Translations = {
     home: {
       title: 'مرحباً!',
       subtitle: 'يسعدنا وجودك هنا!',
-      greeting: 'مرحبا أيها المجهول!',
-      greetingSubtitle: 'استرخ وابنِ شيئاً رائعاً!',
+      greeting: 'مرحباً!',
+      greetingSubtitle: 'استرخ واستمتع بالحياة!',
     },
     navigation: {
       settings: 'الإعدادات',
@@ -168,6 +307,29 @@ export const translations: Translations = {
       title: 'الإعدادات',
       loginRequired: 'يرجى تسجيل الدخول للوصول إلى إعداداتك',
     },
+    header: {
+      intro: 'Shebam',
+      faster: 'أسرع',
+      and: 'و',
+      cheaper: 'أرخص',
+      thanAnyExisting: 'من أي نظام دفع موجود. نحن نستخدم يورو على السلسلة',
+      onchainEuro: 'يورو على السلسلة',
+      legallyRegulated: 'منظم قانونياً',
+      testNetwork:
+        '. نحن نستخدم شبكة تجريبية الآن، لكنها ستعمل بنفس الطريقة تماماً على الشبكة الرئيسية.',
+      mainNetwork: 'الشبكة الرئيسية',
+    },
+    onboarding: {
+      settingUp: 'إعداد حسابك',
+      deployingSafe: 'نشر Safe الخاص بك على السلسلة...',
+      safeDeployed: 'تم نشر Safe على السلسلة',
+      enablingModule: 'تمكين وحدة مفتاح الجلسة...',
+      moduleEnabled: 'تم تمكين وحدة مفتاح الجلسة',
+      creatingSessionKey: 'إنشاء مفتاح الجلسة...',
+      sessionKeyCreated: 'تم إنشاء مفتاح الجلسة',
+      complete: 'اكتمل الإعداد!',
+      error: 'حدث خطأ أثناء الإعداد',
+    },
   },
 
   // Bengali
@@ -181,8 +343,8 @@ export const translations: Translations = {
     home: {
       title: 'স্বাগতম!',
       subtitle: 'আপনাকে এখানে পেয়ে আনন্দিত!',
-      greeting: 'হ্যালো বন্ধু!',
-      greetingSubtitle: 'বসুন, আরাম করুন এবং কিছু দুর্দান্ত তৈরি করুন!',
+      greeting: 'স্বাগতম!',
+      greetingSubtitle: 'আরাম করুন এবং জীবন উপভোগ করুন!',
     },
     navigation: {
       settings: 'সেটিংস',
@@ -191,6 +353,29 @@ export const translations: Translations = {
       title: 'সেটিংস',
       loginRequired: 'আপনার সেটিংস অ্যাক্সেস করতে অনুগ্রহ করে লগইন করুন',
     },
+    header: {
+      intro: 'Shebam',
+      faster: 'দ্রুততর',
+      and: 'এবং',
+      cheaper: 'সস্তা',
+      thanAnyExisting: 'যেকোনো বিদ্যমান পেমেন্ট সিস্টেম থেকে ভালো। আমরা একটি আইনত',
+      onchainEuro: 'অনচেইন ইউরো',
+      legallyRegulated: 'নিয়ন্ত্রিত',
+      testNetwork:
+        'ব্যবহার করছি। আমরা এখন একটি টেস্ট নেটওয়ার্ক ব্যবহার করছি, তবে এটি প্রধান নেটওয়ার্কে ঠিক একইভাবে কাজ করবে।',
+      mainNetwork: 'প্রধান নেটওয়ার্ক',
+    },
+    onboarding: {
+      settingUp: 'আপনার অ্যাকাউন্ট সেট আপ করা হচ্ছে',
+      deployingSafe: 'আপনার অনচেইন Safe ডিপ্লয় করা হচ্ছে...',
+      safeDeployed: 'অনচেইন Safe ডিপ্লয় হয়েছে',
+      enablingModule: 'সেশন কী মডিউল সক্ষম করা হচ্ছে...',
+      moduleEnabled: 'সেশন কী মডিউল সক্ষম হয়েছে',
+      creatingSessionKey: 'সেশন কী তৈরি করা হচ্ছে...',
+      sessionKeyCreated: 'সেশন কী তৈরি হয়েছে',
+      complete: 'সেটআপ সম্পন্ন হয়েছে!',
+      error: 'সেটআপের সময় একটি ত্রুটি ঘটেছে',
+    },
   },
 
   // Russian
@@ -204,8 +389,8 @@ export const translations: Translations = {
     home: {
       title: 'Добро пожаловать!',
       subtitle: 'Рады видеть вас здесь!',
-      greeting: 'Привет, незнакомец!',
-      greetingSubtitle: 'Расслабьтесь и создайте что-нибудь крутое!',
+      greeting: 'Добро пожаловать!',
+      greetingSubtitle: 'Расслабьтесь и наслаждайтесь жизнью!',
     },
     navigation: {
       settings: 'Настройки',
@@ -214,6 +399,30 @@ export const translations: Translations = {
       title: 'Настройки',
       loginRequired: 'Пожалуйста, войдите, чтобы получить доступ к настройкам',
     },
+    header: {
+      intro: 'Shebam',
+      faster: 'быстрее',
+      and: 'и',
+      cheaper: 'дешевле',
+      thanAnyExisting:
+        'чем ЛЮБАЯ существующая платежная система. Мы используем евро на блокчейне, которое законно',
+      onchainEuro: 'евро на блокчейне',
+      legallyRegulated: 'регулируется',
+      testNetwork:
+        '. Мы сейчас используем тестовую сеть, но в основной сети все будет работать точно так же.',
+      mainNetwork: 'основная сеть',
+    },
+    onboarding: {
+      settingUp: 'Настройка вашего аккаунта',
+      deployingSafe: 'Развертывание вашего Safe на блокчейне...',
+      safeDeployed: 'Safe на блокчейне развернут',
+      enablingModule: 'Включение модуля ключа сеанса...',
+      moduleEnabled: 'Модуль ключа сеанса включен',
+      creatingSessionKey: 'Создание ключа сеанса...',
+      sessionKeyCreated: 'Ключ сеанса создан',
+      complete: 'Настройка завершена!',
+      error: 'Произошла ошибка при настройке',
+    },
   },
 
   // Portuguese
@@ -227,8 +436,8 @@ export const translations: Translations = {
     home: {
       title: 'Bem-vindo!',
       subtitle: 'É um prazer tê-lo aqui!',
-      greeting: 'Olá Anon!',
-      greetingSubtitle: 'Sente-se, relaxe e construa algo legal!',
+      greeting: 'Bem-vindo!',
+      greetingSubtitle: 'Relaxe e aproveite a vida!',
     },
     navigation: {
       settings: 'Configurações',
@@ -237,6 +446,30 @@ export const translations: Translations = {
       title: 'Configurações',
       loginRequired: 'Por favor faça login para acessar suas configurações',
     },
+    header: {
+      intro: 'Shebam é',
+      faster: 'mais rápido',
+      and: 'e',
+      cheaper: 'mais barato',
+      thanAnyExisting:
+        'do que QUALQUER sistema de pagamento existente. Estamos usando um euro na blockchain que é legalmente',
+      onchainEuro: 'euro na blockchain',
+      legallyRegulated: 'regulamentado',
+      testNetwork:
+        '. Estamos usando uma rede de teste agora, mas funcionará exatamente da mesma forma na rede principal.',
+      mainNetwork: 'rede principal',
+    },
+    onboarding: {
+      settingUp: 'Configurando sua conta',
+      deployingSafe: 'Implantando sua Safe na blockchain...',
+      safeDeployed: 'Safe na blockchain implantada',
+      enablingModule: 'Habilitando módulo de chave de sessão...',
+      moduleEnabled: 'Módulo de chave de sessão habilitado',
+      creatingSessionKey: 'Criando chave de sessão...',
+      sessionKeyCreated: 'Chave de sessão criada',
+      complete: 'Configuração concluída!',
+      error: 'Ocorreu um erro durante a configuração',
+    },
   },
 
   // Urdu
@@ -250,8 +483,8 @@ export const translations: Translations = {
     home: {
       title: 'خوش آمدید!',
       subtitle: 'آپ کا یہاں ہونا خوشی کی بات ہے!',
-      greeting: 'ہیلو دوست!',
-      greetingSubtitle: 'آرام سے بیٹھیں اور کچھ شاندار بنائیں!',
+      greeting: 'خوش آمدید!',
+      greetingSubtitle: 'آرام کریں اور زندگی سے لطف اندوز ہوں!',
     },
     navigation: {
       settings: 'ترتیبات',
@@ -260,6 +493,30 @@ export const translations: Translations = {
       title: 'ترتیبات',
       loginRequired: 'اپنی ترتیبات تک رسائی کے لیے براہ کرم لاگ ان کریں',
     },
+    header: {
+      intro: 'Shebam',
+      faster: 'تیز تر',
+      and: 'اور',
+      cheaper: 'سستا',
+      thanAnyExisting:
+        'کسی بھی موجودہ ادائیگی کے نظام سے بہتر ہے۔ ہم ایک آن چین یورو استعمال کر رہے ہیں جو قانونی طور پر',
+      onchainEuro: 'آن چین یورو',
+      legallyRegulated: 'منظم',
+      testNetwork:
+        'ہے۔ ہم ابھی ٹیسٹ نیٹ ورک استعمال کر رہے ہیں، لیکن یہ مرکزی نیٹ ورک پر بالکل اسی طرح کام کرے گا۔',
+      mainNetwork: 'مرکزی نیٹ ورک',
+    },
+    onboarding: {
+      settingUp: 'اپنا اکاؤنٹ سیٹ اپ کیا جا رہا ہے',
+      deployingSafe: 'آپ کا آن چین Safe تعینات کیا جا رہا ہے...',
+      safeDeployed: 'آن چین Safe تعینات ہو گیا',
+      enablingModule: 'سیشن کلید ماڈیول فعال کیا جا رہا ہے...',
+      moduleEnabled: 'سیشن کلید ماڈیول فعال ہو گیا',
+      creatingSessionKey: 'سیشن کلید بنائی جا رہی ہے...',
+      sessionKeyCreated: 'سیشن کلید بن گئی',
+      complete: 'سیٹ اپ مکمل ہو گیا!',
+      error: 'سیٹ اپ کے دوران ایک خرابی پیش آگئی',
+    },
   },
 }