diff --git a/frontend/src/components/Navbar.jsx b/frontend/src/components/Navbar.jsx
index a4af563f..74ac36ed 100644
--- a/frontend/src/components/Navbar.jsx
+++ b/frontend/src/components/Navbar.jsx
@@ -143,7 +143,7 @@ function Navbar() {
           <motion.div
             whileHover={{ scale: 1.05 }}
             whileTap={{ scale: 0.95 }}
-            className="flex items-center space-x-2 cursor-pointer"
+            className="flex items-center space-x-1 xl:space-x-2 cursor-pointer"
             onClick={() => {
               navigate("/");
               closeMobileMenu();
@@ -156,7 +156,7 @@ function Navbar() {
           </motion.div>
 
           {/* Desktop Navigation */}
-          <div className="hidden lg:flex items-center space-x-0 xl:space-x-2">
+          <div className="hidden lg:flex items-center relative left-4 space-x-0 xl:space-x-2">
             {/* {navItems.map((item) => (
               <motion.button
                 key={item.name}
@@ -183,7 +183,7 @@ function Navbar() {
                   {item?.path === "/dashboard" ? (
                     <Link
                       to="/dashboard/create"
-                      className={`flex items-center px-2 xl:px-4 py-2 rounded-lg transition-colors ${isActive(item.path)
+                      className={`flex items-center px-1 xl:px-4 py-2 rounded-lg transition-colors ${isActive(item.path)
                           ? "text-green-400 font-medium"
                           : "text-white hover:text-green-400"
                         }`}
@@ -194,7 +194,7 @@ function Navbar() {
                   ) : (
                     <Link
                       to={item.path}
-                      className={`flex items-center px-4 py-2 rounded-lg transition-colors ${isActive(item.path)
+                      className={`flex items-center px-1 xl:px-4 py-2 rounded-lg transition-colors ${isActive(item.path)
                           ? "text-green-400 font-medium"
                           : "text-white hover:text-green-400"
                         }`}
diff --git a/frontend/src/page/CreateInvoice.jsx b/frontend/src/page/CreateInvoice.jsx
index 8bf93782..ba9eb779 100644
--- a/frontend/src/page/CreateInvoice.jsx
+++ b/frontend/src/page/CreateInvoice.jsx
@@ -157,7 +157,7 @@ function CreateInvoice() {
     };
 
     processUrlToken();
-  }, [searchParams, tokens, loadingTokens, account.address]);
+  }, [searchParams, walletClient, tokens, loadingTokens, account.address]);
 
   useEffect(() => {
     const total = itemData.reduce((sum, item) => {
@@ -236,31 +236,65 @@ function CreateInvoice() {
     ]);
   };
 
-  const verifyToken = async (address) => {
-    setTokenVerificationState("verifying");
-
-    try {
-      if (typeof window !== "undefined" && window.ethereum) {
-        const provider = new BrowserProvider(window.ethereum);
-        const contract = new ethers.Contract(address, ERC20_ABI, provider);
-
-        const [symbol, name, decimals] = await Promise.all([
-          contract.symbol().catch(() => "UNKNOWN"),
-          contract.name().catch(() => "Unknown Token"),
-          contract.decimals().catch(() => 18),
-        ]);
-
-        setVerifiedToken({ address, symbol, name, decimals });
-        setTokenVerificationState("success");
-      } else {
-        console.error("No Ethereum provider found");
+  
+const verifyToken = async (address, targetChainId = null) => {
+  setTokenVerificationState("verifying");
+  
+  // Determine which chain to verify on
+  const chainIdToUse = targetChainId || searchParams.get("chain") || account?.chainId;
+
+  try {
+    let provider;
+    
+
+    // for UNKNOWN symbol and name unknown update this rpc with some better one
+    const rpcUrls = {
+      1: "https://eth.llamarpc.com",                 // Ethereum (very fast)
+      61: "https://etc.rivet.link",                  // Ethereum Classic
+      137: "https://polygon.llamarpc.com",           // Polygon
+      56: "https://bsc.llamarpc.com",                // BNB Smart Chain
+      8453: "https://base.llamarpc.com",             // Base
+      11155111: "https://rpc.ankr.com/eth_sepolia",  // Sepolia
+    };
+    if (typeof window !== "undefined" && isConnected) {
+      // Fallback to wallet provider if no chainId specified
+      provider = new BrowserProvider(walletClient);
+    // If chainId is available, always use public RPC (works without wallet)
+    } else if (chainIdToUse) {
+      const rpcUrl = rpcUrls[chainIdToUse];
+      
+      if (!rpcUrl) {
+        console.error(`Unsupported chain ${chainIdToUse}. Supported chains: Ethereum (1), Ethereum Classic (61), Polygon (137), BNB Smart Chain (56), Base (8453), Sepolia (11155111)`);
         setTokenVerificationState("error");
+        return;
       }
-    } catch (error) {
-      console.error("Verification failed:", error);
-      setTokenVerificationState("error");
+      
+      // Use JsonRpcProvider with timeout for faster response
+      provider = new ethers.JsonRpcProvider(rpcUrl, Number(chainIdToUse));
     }
-  };
+
+    const contract = new ethers.Contract(address, ERC20_ABI, provider);
+  
+    const [symbol, name, decimals] = await Promise.all([
+        contract.symbol().catch(() => "UNKNOWN"),
+        contract.name().catch(() => "Unknown Token"),
+        contract.decimals().catch(() => 18),
+    ]);
+
+    console.log([symbol, name, decimals]);
+    setVerifiedToken({ 
+      address, 
+      symbol, 
+      name, 
+      decimals: Number(decimals),
+      chainId: chainIdToUse 
+    });
+    setTokenVerificationState("success");
+  } catch (error) {
+    console.error("Verification failed:", error);
+    setTokenVerificationState("error");
+  }
+};
 
   const createInvoiceRequest = async (data) => {
     if (!isConnected || !walletClient) {