diff --git a/index.html b/index.html
index 56076cd3..9e942157 100644
--- a/index.html
+++ b/index.html
@@ -17,45 +17,91 @@
       href="https://fonts.googleapis.com/css2?family=Mukta:wght@200;300;400;500;600;700;800&display=swap"
       rel="stylesheet" />
     <meta name="theme-color" content="#000000" />
-    <title>Invariant - AMM DEX provided concentrated liquidity</title>
-    <meta name="title" content="Invariant - AMM DEX provided concentrated liquidity" />
+    <title>
+      Invariant: Best AMM DEX with Concentrated Liquidity on Aleph Zero | High Efficiency DeFi
+    </title>
+    <meta name="title" content="Invariant - AMM DEX with Concentrated Liquidity on Aleph Zero" />
     <meta
       name="description"
-      content="Invariant is the most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain, providing the highest capital efficiency and risk management." />
+      content="Discover Invariant, the top AMM DEX on Aleph Zero offering the highest capital efficiency with concentrated liquidity. Maximize your DeFi investments with advanced risk management tools." />
     <meta
       name="keywords"
-      content="crypto, crypto exchange, Aleph Zero crypto, concentrated liquidity, defi crypto, Aleph Zero exchange" />
+      content="AMM DEX, concentrated liquidity, Aleph Zero blockchain, DeFi exchange, crypto trading, capital efficiency, risk management, decentralized finance, Aleph Zero DeFi, liquidity pools, yield farming" />
+    <meta name="author" content="Invariant" />
+    <meta name="robots" content="index, follow" />
 
-    <!-- Open Graph -->
+    <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website" />
-    <meta property="og:url" content="https://invariant.app/" />
-    <meta property="og:title" content="Invariant - AMM DEX provided concentrated liquidity" />
+    <meta property="og:url" content="https://azero.invariant.app/" />
+    <meta
+      property="og:title"
+      content="Invariant - Unlock High Capital Efficiency with Concentrated Liquidity on Aleph Zero" />
     <meta
       property="og:description"
-      content="Invariant is the most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain, providing the highest capital efficiency and risk management." />
-    <meta property="og:image" content="https://invariant.app/favicon-192x192.png" />
+      content="Join Invariant, the top AMM DEX on Aleph Zero, and access cutting-edge DeFi solutions with concentrated liquidity for maximum capital efficiency and risk management." />
+    <meta property="og:image" content="https://azero.invariant.app/favicon-192x192.png" />
 
-    <!-- Twitter Card -->
+    <!-- Twitter -->
     <meta property="twitter:card" content="summary" />
     <meta property="twitter:url" content="https://twitter.com/invariant_labs" />
     <meta property="twitter:title" content="Invariant - AMM DEX provided concentrated liquidity" />
     <meta
       property="twitter:description"
-      content="Invariant is the most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain, providing the highest capital efficiency and risk management." />
-    <meta property="twitter:image" content="https://invariant.app/favicon-192x192.png" />
+      content="Discover Invariant, Aleph Zero's most efficient AMM DEX. Concentrated liquidity ensures top-tier capital efficiency for all DeFi traders." />
+    <meta property="twitter:image" content="https://azero.invariant.app/favicon-192x192.png" />
 
     <!-- DublinCore -->
     <link rel="schema.dcterms" href="https://purl.org/dc/terms/" />
-    <meta name="DC.title" lang="en" content="Invariant - AMM DEX provided concentrated liquidity" />
+    <meta
+      name="DC.title"
+      lang="en"
+      content="Invariant - The Most Efficient AMM DEX on Aleph Zero with Concentrated Liquidity" />
     <meta
       name="DC.description"
       lang="en"
-      content="Invariant is the most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain, providing the highest capital efficiency and risk management." />
+      content="Invariant offers top-tier capital efficiency and risk management on Aleph Zero, making it the most advanced AMM DEX for DeFi investors." />
     <meta name="DC.publisher" content="Invariant" />
-    <meta name="DC.identifier" content="https://invariant.app/" />
+    <meta name="DC.identifier" content="https://azero.invariant.app/" />
     <meta name="DC.format" content="text/html" />
     <meta name="DC.type" content="Text" />
 
+    <!-- Schema.org markup for Google+ -->
+    <meta itemprop="name" content="Invariant: Leading AMM DEX on Aleph Zero" />
+    <meta
+      itemprop="description"
+      content="Invariant offers top-tier capital efficiency and risk management on Aleph Zero, making it the most advanced AMM DEX for DeFi investors." />
+    <meta itemprop="image" content="https://azero.invariant.app/favicon-192x192.png" />
+
+    <!-- Canonical URL -->
+    <link rel="canonical" href="https://azero.invariant.app/" />
+
+    <!-- Manifest -->
+    <link rel="manifest" href="/public/manifest.json" />
+
+    <!-- Structured Data -->
+    <script type="application/ld+json">
+      {
+        "@context": "https://schema.org",
+        "@type": "Organization",
+        "name": "Invariant",
+        "url": "https://invariant.app/",
+        "logo": "https://invariant.app/favicon-192x192.png",
+        "sameAs": [
+          "https://twitter.com/invariant_labs",
+          "https://medium.com/@invariantlabs",
+          "https://github.com/invariant-labs"
+        ],
+        "description": "Invariant is the most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain, offering the highest capital efficiency and advanced risk management tools.",
+        "founder": {
+          "@type": "Person",
+          "name": "Wojciech Cichocki"
+        },
+        "foundingDate": "2022",
+        "areaServed": "Worldwide",
+        "knowsAbout": ["Decentralized Finance", "AMM", "Concentrated Liquidity", "Blockchain"]
+      }
+    </script>
+
     <!-- Global Site Tag (gtag.js) - Google Analytics 4 -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=G-TEFDYYTWP3"></script>
     <script>
@@ -67,9 +113,6 @@
       gtag('config', 'G-TEFDYYTWP3', { cookie_flags: 'SameSite=None;Secure' })
     </script>
 
-    <link rel="canonical" href="https://invariant.app/" />
-    <link rel="manifest" href="/manifest.json" />
-
     <style>
       html {
         scrollbar-width: none;
diff --git a/package-lock.json b/package-lock.json
index 703024a0..74c5a047 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,10 +10,10 @@
       "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@invariant-labs/a0-sdk": "^0.2.24",
+        "@invariant-labs/a0-sdk": "^0.2.27",
         "@mui/icons-material": "^5.15.15",
         "@mui/material": "^5.15.15",
-        "@nightlylabs/wallet-selector-polkadot": "^0.2.5",
+        "@nightlylabs/wallet-selector-polkadot": "^0.2.6",
         "@nivo/bar": "^0.87.0",
         "@nivo/line": "^0.86.0",
         "@polkadot/api": "^10.11.2",
@@ -2933,11 +2933,11 @@
       "dev": true
     },
     "node_modules/@invariant-labs/a0-sdk": {
-      "version": "0.2.24",
-      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk/-/a0-sdk-0.2.24.tgz",
-      "integrity": "sha512-VpTlKFh5NE/4H6R4FlU0R4LImGCwMvV+EdnrersqT56piH5IhL8i0ZW7kWuCb+k8WgftbUCQlOAxLvrzLmm24Q==",
+      "version": "0.2.27",
+      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk/-/a0-sdk-0.2.27.tgz",
+      "integrity": "sha512-cSnokx4JmlVk505pVQfrLwbVqCpzZMQ7oqEut89I3uat27sI+oEi0Ll36cDWabAYDyGcrVj3IqA5I42L/nrKpg==",
       "dependencies": {
-        "@invariant-labs/a0-sdk-wasm": "0.1.26",
+        "@invariant-labs/a0-sdk-wasm": "0.1.27",
         "@polkadot/api": "^10.12.4",
         "@polkadot/api-contract": "^10.12.4",
         "@scio-labs/use-inkathon": "^0.6.3",
@@ -2947,9 +2947,9 @@
       }
     },
     "node_modules/@invariant-labs/a0-sdk-wasm": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk-wasm/-/a0-sdk-wasm-0.1.26.tgz",
-      "integrity": "sha512-Y2OjXpKzrqpBbkgUyVLQvDoNyOsa5AsadGRUJVOVsesZ8771W3CEURrJTrZyh8HtMZEeVUUtA30dU8+YppsTNw=="
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/@invariant-labs/a0-sdk-wasm/-/a0-sdk-wasm-0.1.27.tgz",
+      "integrity": "sha512-R6S2jwV0xYggLD8G32yx+zClpS0KksX08yfaIgs1x8BdX403SZcdhAv+DkuHLANLxqsEe9BPwZrhbmkpVAfm0w=="
     },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
@@ -8470,9 +8470,9 @@
       "dev": true
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.1.tgz",
-      "integrity": "sha512-GrXxNVBes13Q3wSBjdZlmu4VulFhfNs1eP2/pX5dmx6cE1XgfV2/BfqdGt4d2Z7Zqp+qnYSf7zvIB4buc+2DwA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
       "cpu": [
         "arm"
       ],
@@ -8482,9 +8482,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.1.tgz",
-      "integrity": "sha512-Cr/dpKRc4tjK13SCZJrSDXSaKjL/fekn04BWMCJ+Pj4vPCp8rixvtArrnWUYycOdRNi7kx3MSClcvEP7C2nvCw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
       "cpu": [
         "arm64"
       ],
@@ -8494,9 +8494,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.1.tgz",
-      "integrity": "sha512-IwEyoeCZoO1lpY5Er5t3UK/Aq5q2W/ubLmu3pYW4as0htn4NbJagBaVNr1aVhRTXUxrYvcPhxQCqodShnocLdA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
       "cpu": [
         "arm64"
       ],
@@ -8506,9 +8506,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.1.tgz",
-      "integrity": "sha512-LSbJhEOTz557VBcJOWspdGyiFbMTNgLxbWnup7bDj1elpNTK04E3M1qLlvGzPKPmk+uG6XlbT8xAUSKkyn0g8w==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
       "cpu": [
         "x64"
       ],
@@ -8518,9 +8518,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.1.tgz",
-      "integrity": "sha512-F4DgRk//u604Np1eFoGUzE9TgGE6LMvjnX2tM24ePB34JlED9utc4T3iK5x8CWC/agH+zuN7q/hJF5AtWR+JOA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
       "cpu": [
         "arm"
       ],
@@ -8530,9 +8530,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.1.tgz",
-      "integrity": "sha512-Gl5pbijcb6QOJRvHkmU/O1G65ZnKxwSHhPQRuGdmcxmX/mBM+wNHoai7wvpCoPVsdhkc+KUqgu/MydP8wovGAA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
       "cpu": [
         "arm"
       ],
@@ -8542,9 +8542,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.1.tgz",
-      "integrity": "sha512-GsvZqPloVOrh3G2nmZmwNSNGqWLf3L3a0nFDO1zecwucAYxEFgZkrvqQrVMT+zUjChaHPBp0eoTOQMWSKFcV8w==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
       "cpu": [
         "arm64"
       ],
@@ -8554,9 +8554,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.1.tgz",
-      "integrity": "sha512-+vZ1jrJeEEYLbMqeKDfgcl8v7zjymdAGTr7xUdQL6c4nC+S+BZHo3Mrp/9ij2qpAveC0Iaz9DIiFplcO0joapQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
       "cpu": [
         "arm64"
       ],
@@ -8566,9 +8566,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.1.tgz",
-      "integrity": "sha512-6psD9nKw+wLj9bMhArTkzKt5etA6kb+cBJQws4MovI9gQSRkdX4nyYZofBfgTtaZtymQl7uRfe1I75guePal5A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
       "cpu": [
         "ppc64"
       ],
@@ -8578,9 +8578,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.1.tgz",
-      "integrity": "sha512-xzbqImk1h5abj0bPU5XQVrqBhLHl2zTygG6+vES2TrgmNSiaPzn39aqI8QtdqmGYz507ZVI2qocTTfVwW23SmQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
       "cpu": [
         "riscv64"
       ],
@@ -8590,9 +8590,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.1.tgz",
-      "integrity": "sha512-Hz5iwqYv08PpEC75z0GAgLlOY+cLAb0PVx578mLW0naugNfG0WQqoDzQoJWiivmtTdgmwoH5YXDnjZJb7MDlhA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
       "cpu": [
         "s390x"
       ],
@@ -8602,9 +8602,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.1.tgz",
-      "integrity": "sha512-ot1DPlQZGGiZYNyE/PF3jbT6juuG0W5oiguHQEvjoZZ3+FSxMfdJnBz1P71QeqICSOlSFG9Z31oA/uXyuxDEVw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
       "cpu": [
         "x64"
       ],
@@ -8614,9 +8614,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.1.tgz",
-      "integrity": "sha512-euksHNkKlXS9RKKHSBBPtloSEUGPg1eRVGfOkXSSIj5W9LdkMfOefsTlVf2g8kuayZW/98nIJ83Fnou9OaZNXA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
       "cpu": [
         "x64"
       ],
@@ -8626,9 +8626,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.1.tgz",
-      "integrity": "sha512-jDS/ShZxlA3HKtgm25CcbApOVsr/0Zkdu/E+3xK4UO0PT912yqyh7jNpTmZZJAiPDQoSDI9FOqrjSbnlpW6IFg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
       "cpu": [
         "arm64"
       ],
@@ -8638,9 +8638,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.1.tgz",
-      "integrity": "sha512-yNEeuvH2b+susSgUCfpRelIRjB1CmErHyqA7KsQ/NCjY401rpChVqw5df/H5AUPCKNDqgBMbtrtl9F6z7N9LTg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
       "cpu": [
         "ia32"
       ],
@@ -8650,9 +8650,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.1.tgz",
-      "integrity": "sha512-UgdylcqjcgJSNMhrjMJpJ4T3zriTmiUd2COh1mJHwDShrhhMkpZ/j4M5e4GsvBFviaxtrJtufr0FnKfm2UfOSw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
       "cpu": [
         "x64"
       ],
@@ -18366,9 +18366,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.22.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.1.tgz",
-      "integrity": "sha512-rit4zY5uPX0jrzTidez3rFr0MD30Rpu3S8VxwXFDfBVAzkk9U28s5MF3/R6u5bIHN6CQnf7zbiwVQbqBkyrU/A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
       "dependencies": {
         "@types/estree": "1.0.5"
       },
@@ -18380,22 +18380,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.1",
-        "@rollup/rollup-android-arm64": "4.22.1",
-        "@rollup/rollup-darwin-arm64": "4.22.1",
-        "@rollup/rollup-darwin-x64": "4.22.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.1",
-        "@rollup/rollup-linux-arm64-musl": "4.22.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.1",
-        "@rollup/rollup-linux-x64-gnu": "4.22.1",
-        "@rollup/rollup-linux-x64-musl": "4.22.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.1",
-        "@rollup/rollup-win32-x64-msvc": "4.22.1",
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index e4239632..89d25c98 100644
--- a/package.json
+++ b/package.json
@@ -12,15 +12,16 @@
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "export NODE_OPTIONS=--max-old-space-size=8192 && storybook build"
+    "build-storybook": "export NODE_OPTIONS=--max-old-space-size=8192 && storybook build",
+    "update-mainnet-list": "node ./src/fetchMainnetList.js"
   },
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@invariant-labs/a0-sdk": "^0.2.24",
+    "@invariant-labs/a0-sdk": "^0.2.27",
     "@mui/icons-material": "^5.15.15",
     "@mui/material": "^5.15.15",
-    "@nightlylabs/wallet-selector-polkadot": "^0.2.5",
+    "@nightlylabs/wallet-selector-polkadot": "^0.2.6",
     "@nivo/bar": "^0.87.0",
     "@nivo/line": "^0.86.0",
     "@polkadot/api": "^10.11.2",
diff --git a/public/manifest.json b/public/manifest.json
index 643c628d..25a87183 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,15 +1,55 @@
 {
-  "short_name": "App",
-  "name": "Invariant App",
+  "name": "Invariant - AMM DEX with Concentrated Liquidity",
+  "short_name": "Invariant",
+  "description": "Invariant: The most efficient AMM DEX with concentrated liquidity on Aleph Zero blockchain",
+  "start_url": ".",
+  "display": "standalone",
+  "background_color": "#000000",
+  "theme_color": "#000000",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "192x192 128x128 64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "./favicon-16x16.png",
+      "sizes": "16x16",
+      "type": "image/png"
+    },
+    {
+      "src": "/favicon-32x32.png",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "/favicon-96x96.png",
+      "sizes": "96x96",
+      "type": "image/png"
+    },
+    {
+      "src": "/favicon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
     }
   ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
+  "orientation": "portrait",
+  "lang": "en-US",
+  "dir": "ltr",
+  "prefer_related_applications": false,
+  "related_applications": [
+    "https://eclipse.invariant.app",
+    "https://invariant.app",
+    "https://vara.invariant.app"
+  ],
+  "categories": [
+    "finance",
+    "business",
+    "productivity",
+    "utilities",
+    "cryptocurrency",
+    "defi",
+    "blockchain",
+    "investment",
+    "technology",
+    "dex",
+    "crypto",
+    "concentrated liquidity"
+  ]
 }
diff --git a/src/components/Header/Header.stories.tsx b/src/components/Header/Header.stories.tsx
index 11aec2f8..c3e59957 100644
--- a/src/components/Header/Header.stories.tsx
+++ b/src/components/Header/Header.stories.tsx
@@ -6,6 +6,7 @@ import { Network } from '@invariant-labs/a0-sdk'
 import { Chain } from '@store/consts/types'
 import { Provider } from 'react-redux'
 import { store } from '@store/index'
+import { RpcStatus } from '@store/reducers/connection'
 
 const meta = {
   title: 'Layout/Header',
@@ -45,6 +46,7 @@ export const Primary: Story = {
     },
     onChainSelect: fn(),
     network: Network.Testnet,
-    defaultMainnetRPC: 'https://rpc.moonbeam.network'
+    defaultMainnetRPC: 'https://rpc.moonbeam.network',
+    rpcStatus: RpcStatus.Uninitialized
   }
 }
diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
index e0f7d824..3bba62bc 100644
--- a/src/components/Header/Header.tsx
+++ b/src/components/Header/Header.tsx
@@ -20,6 +20,7 @@ import SelectChainButton from './HeaderButton/SelectChainButton'
 import { ISelectChain } from '@store/consts/types'
 import SelectChain from '@components/Modals/SelectChain/SelectChain'
 import SelectMainnetRPC from '@components/Modals/SelectMainnetRPC/SelectMainnetRPC'
+import { RpcStatus } from '@store/reducers/connection'
 
 export interface IHeader {
   address: string
@@ -38,6 +39,7 @@ export interface IHeader {
   onChainSelect: (chain: ISelectChain) => void
   network: Network
   defaultMainnetRPC: string
+  rpcStatus: RpcStatus
 }
 
 export const Header: React.FC<IHeader> = ({
@@ -55,8 +57,9 @@ export const Header: React.FC<IHeader> = ({
   onChangeWallet,
   activeChain,
   onChainSelect,
-  network
-  // defaultMainnetRPC
+  network,
+  // defaultMainnetRPC,
+  rpcStatus
 }) => {
   const { classes } = useStyles()
   const buttonStyles = useButtonStyles()
@@ -161,21 +164,24 @@ export const Header: React.FC<IHeader> = ({
 
         <Grid container item className={classes.buttons} wrap='nowrap'>
           <Grid container className={classes.leftButtons}>
-            <Box sx={{ display: { xs: 'none', md: 'block' } }}>
-              <Button
-                className={buttonStyles.classes.headerButton}
-                variant='contained'
-                sx={{ '& .MuiButton-label': buttonStyles.classes.label }}
-                onClick={onFaucet}>
-                Faucet
-              </Button>
-            </Box>
+            {typeOfNetwork === Network.Testnet ? (
+              <Box sx={{ display: { xs: 'none', md: 'block' } }}>
+                <Button
+                  className={buttonStyles.classes.headerButton}
+                  variant='contained'
+                  sx={{ '& .MuiButton-label': buttonStyles.classes.label }}
+                  onClick={onFaucet}>
+                  Faucet
+                </Button>
+              </Box>
+            ) : null}
             <Box sx={{ display: { xs: 'none', md: 'block' } }}>
               <SelectRPCButton
                 rpc={rpc}
                 networks={network === Network.Testnet ? testnetRPCs : mainnetRPCs}
                 onSelect={onNetworkSelect}
                 network={network}
+                rpcStatus={rpcStatus}
               />
             </Box>
             <Box sx={{ display: { xs: 'none', md: 'block' } }}>
@@ -280,6 +286,7 @@ export const Header: React.FC<IHeader> = ({
                 unblurContent()
               }}
               activeRPC={rpc}
+              rpcStatus={rpcStatus}
             />
           ) : (
             <SelectMainnetRPC
@@ -292,6 +299,7 @@ export const Header: React.FC<IHeader> = ({
                 unblurContent()
               }}
               activeRPC={rpc}
+              rpcStatus={rpcStatus}
             />
           )}
           <SelectChain
diff --git a/src/components/Header/HeaderButton/SelectRPCButton.stories.tsx b/src/components/Header/HeaderButton/SelectRPCButton.stories.tsx
index a8b7dc90..7e63fcab 100644
--- a/src/components/Header/HeaderButton/SelectRPCButton.stories.tsx
+++ b/src/components/Header/HeaderButton/SelectRPCButton.stories.tsx
@@ -3,6 +3,7 @@ import SelectRPCButton from './SelectRPCButton'
 import { Network } from '@invariant-labs/a0-sdk'
 import { RPC } from '@store/consts/static'
 import { action } from '@storybook/addon-actions'
+import { RpcStatus } from '@store/reducers/connection'
 
 const meta = {
   title: 'Buttons/SelectRPCButton',
@@ -23,6 +24,7 @@ export const Primary: Story = {
       }
     ],
     onSelect: (networkType, rpc) => action('chosen: ' + networkType + ' ' + rpc)(),
-    network: Network.Testnet
+    network: Network.Testnet,
+    rpcStatus: RpcStatus.Uninitialized
   }
 }
diff --git a/src/components/Header/HeaderButton/SelectRPCButton.tsx b/src/components/Header/HeaderButton/SelectRPCButton.tsx
index ee114bc1..d8527c8e 100644
--- a/src/components/Header/HeaderButton/SelectRPCButton.tsx
+++ b/src/components/Header/HeaderButton/SelectRPCButton.tsx
@@ -7,6 +7,9 @@ import SelectTestnetRPC from '@components/Modals/SelectTestnetRPC/SelectTestnetR
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown'
 import { Network } from '@invariant-labs/a0-sdk'
 import SelectMainnetRPC from '@components/Modals/SelectMainnetRPC/SelectMainnetRPC'
+import { RpcStatus } from '@store/reducers/connection'
+import { RECOMMENDED_RPC_ADDRESS } from '@store/consts/static'
+import icons from '@static/icons'
 
 export interface IProps {
   rpc: string
@@ -14,13 +17,15 @@ export interface IProps {
   onSelect: (networkType: Network, rpcAddress: string, rpcName?: string) => void
   disabled?: boolean
   network: Network
+  rpcStatus: RpcStatus
 }
 export const SelectRPCButton: React.FC<IProps> = ({
   rpc,
   networks,
   onSelect,
   disabled = false,
-  network
+  network,
+  rpcStatus
 }) => {
   const { classes } = useStyles()
   const [anchorEl, setAnchorEl] = React.useState<HTMLButtonElement | null>(null)
@@ -46,6 +51,9 @@ export const SelectRPCButton: React.FC<IProps> = ({
         disabled={disabled}
         endIcon={<KeyboardArrowDownIcon id='downIcon' />}
         onClick={handleClick}>
+        {rpcStatus === RpcStatus.IgnoredWithError && rpc !== RECOMMENDED_RPC_ADDRESS[network] && (
+          <img className={classes.warningIcon} src={icons.warningIcon} alt='Warning icon' />
+        )}
         RPC
       </Button>
       {network === Network.Testnet ? (
@@ -56,6 +64,7 @@ export const SelectRPCButton: React.FC<IProps> = ({
           onSelect={onSelect}
           handleClose={handleClose}
           activeRPC={rpc}
+          rpcStatus={rpcStatus}
         />
       ) : (
         <SelectMainnetRPC
@@ -65,6 +74,7 @@ export const SelectRPCButton: React.FC<IProps> = ({
           onSelect={onSelect}
           handleClose={handleClose}
           activeRPC={rpc}
+          rpcStatus={rpcStatus}
         />
       )}
     </>
diff --git a/src/components/Header/HeaderButton/style.ts b/src/components/Header/HeaderButton/style.ts
index 1472718d..abcc7654 100644
--- a/src/components/Header/HeaderButton/style.ts
+++ b/src/components/Header/HeaderButton/style.ts
@@ -97,6 +97,10 @@ const useStyles = makeStyles()((theme: Theme) => {
     innerEndIcon: {
       marginLeft: 0,
       marginBottom: 3
+    },
+    warningIcon: {
+      height: 16,
+      marginRight: 4
     }
   }
 })
diff --git a/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx b/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
index e99b182e..5a78d7b6 100644
--- a/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
+++ b/src/components/Inputs/DepositAmountInput/DepositAmountInput.stories.tsx
@@ -28,7 +28,8 @@ export const Null: Story = {
     onBlur: fn(),
     style: {},
     disabled: false,
-    isBalanceLoading: false
+    isBalanceLoading: false,
+    walletUninitialized: true
   }
 }
 
@@ -49,6 +50,7 @@ export const BTC: Story = {
     onBlur: fn(),
     style: {},
     disabled: false,
-    isBalanceLoading: false
+    isBalanceLoading: false,
+    walletUninitialized: false
   }
 }
diff --git a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
index e79a9c6e..7316f98d 100644
--- a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
+++ b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
@@ -22,6 +22,7 @@ interface IProps {
   disabled?: boolean
   priceLoading?: boolean
   isBalanceLoading: boolean
+  walletUninitialized: boolean
 }
 
 export const DepositAmountInput: React.FC<IProps> = ({
@@ -40,9 +41,10 @@ export const DepositAmountInput: React.FC<IProps> = ({
   balanceValue,
   disabled = false,
   priceLoading = false,
-  isBalanceLoading
+  isBalanceLoading,
+  walletUninitialized
 }) => {
-  const { classes } = useStyles({ isSelected: !!currency })
+  const { classes } = useStyles({ isSelected: !!currency && !walletUninitialized })
 
   const inputRef = useRef<HTMLInputElement>(null)
 
@@ -139,28 +141,29 @@ export const DepositAmountInput: React.FC<IProps> = ({
             container
             alignItems='center'
             wrap='nowrap'
-            onClick={onMaxClick}>
+            onClick={walletUninitialized ? () => {} : onMaxClick}>
             <Typography className={classes.caption2}>
               Balance:{' '}
-              {isBalanceLoading ? (
+              {walletUninitialized ? (
+                <>-</>
+              ) : isBalanceLoading ? (
                 <img src={loadingAnimation} className={classes.loadingBalance} alt='loading' />
-              ) : balanceValue ? (
-                formatNumber(balanceValue || 0)
               ) : (
-                <span style={{ marginLeft: '8px' }}>-</span>
+                <>{formatNumber(balanceValue || 0)}</>
               )}{' '}
               {currency}
             </Typography>
             <Button
               className={
-                currency ? classes.maxButton : `${classes.maxButton} ${classes.maxButtonNotActive}`
-              }
-              onClick={onMaxClick}>
+                currency && !walletUninitialized
+                  ? classes.maxButton
+                  : `${classes.maxButton} ${classes.maxButtonNotActive}`
+              }>
               Max
             </Button>
           </Grid>
           <Grid className={classes.percentages} container alignItems='center' wrap='nowrap'>
-            {currency ? (
+            {currency && !walletUninitialized ? (
               priceLoading ? (
                 <img src={loadingAnimation} className={classes.loading} alt='loading' />
               ) : tokenPrice ? (
diff --git a/src/components/Inputs/DepositAmountInput/style.ts b/src/components/Inputs/DepositAmountInput/style.ts
index 4d2b0c96..f78d54df 100644
--- a/src/components/Inputs/DepositAmountInput/style.ts
+++ b/src/components/Inputs/DepositAmountInput/style.ts
@@ -96,7 +96,7 @@ export const useStyles = makeStyles<{ isSelected: boolean }>()((theme: Theme, {
     backgroundColor: `${colors.invariant.Error}40`
   },
   currencyIcon: {
-    minWidth: 20,
+    width: 20,
     height: 20,
     marginRight: 8,
     borderRadius: '100%'
diff --git a/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx b/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
index 762d567b..2352ab46 100644
--- a/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
+++ b/src/components/Inputs/ExchangeAmountInput/ExchangeAmountInput.tsx
@@ -65,7 +65,7 @@ export const AmountInput: React.FC<IProps> = ({
   hiddenUnknownTokens
 }) => {
   const hideBalance = balance === '- -' || !balance || hideBalances
-  const { classes } = useStyles({ walletDisconnected: hideBalance })
+  const { classes } = useStyles()
   const inputRef = useRef<HTMLInputElement>(null)
 
   const allowOnlyDigitsAndTrimUnnecessaryZeros: React.ChangeEventHandler<HTMLInputElement> = e => {
@@ -144,44 +144,47 @@ export const AmountInput: React.FC<IProps> = ({
           />
         )}
       </Grid>
-      {!hideBalance && (
+
+      <Grid
+        container
+        justifyContent='space-between'
+        alignItems='center'
+        direction='row'
+        wrap='nowrap'
+        className={classes.bottom}>
         <Grid
-          container
-          justifyContent='space-between'
-          alignItems='center'
-          direction='row'
-          wrap='nowrap'
-          className={classes.bottom}>
-          <Grid
-            className={classNames(classes.balanceContainer, {
-              [classes.showMaxButton]: showMaxButton
-            })}
-            onClick={showMaxButton ? onMaxClick : () => {}}>
-            <Typography className={classes.BalanceTypography}>
-              Balance:{' '}
-              {isBalanceLoading ? (
-                <img src={loadingAnimation} className={classes.loadingBalance} alt='loading' />
-              ) : (
-                formatNumber(balance || 0)
-              )}{' '}
-              {tokenIcon.slice(0, 8)}
-              {tokenIcon.length > 8 ? '...' : ''}
-            </Typography>
-            {showMaxButton && (
-              <OutlinedButton
-                name='Max'
-                color='primary'
-                onClick={onMaxClick}
-                className={classes.maxButton}
-                labelClassName={classes.label}
-                disabled={
-                  disabled && isNaN(Number(balance))
-                    ? disabled
-                    : isNaN(Number(balance)) || hideBalances
-                }
-              />
-            )}
-          </Grid>
+          className={classNames(classes.balanceContainer, {
+            [classes.showMaxButton]: showMaxButton
+          })}
+          onClick={showMaxButton && !hideBalance ? onMaxClick : () => {}}>
+          <Typography className={classes.BalanceTypography}>
+            Balance:{' '}
+            {isBalanceLoading ? (
+              <img src={loadingAnimation} className={classes.loadingBalance} alt='loading' />
+            ) : hideBalance ? (
+              <>-</>
+            ) : (
+              formatNumber(balance || 0)
+            )}{' '}
+            {tokenIcon.slice(0, 8)}
+            {tokenIcon.length > 8 ? '...' : ''}
+          </Typography>
+          {showMaxButton && (
+            <OutlinedButton
+              name='Max'
+              color='primary'
+              onClick={onMaxClick}
+              className={classes.maxButton}
+              labelClassName={classes.label}
+              disabled={
+                disabled && isNaN(Number(balance))
+                  ? disabled
+                  : isNaN(Number(balance)) || hideBalances
+              }
+            />
+          )}
+        </Grid>
+        {!hideBalance && (
           <Grid className={classes.percentages} container alignItems='center' wrap='nowrap'>
             {current ? (
               priceLoading ? (
@@ -215,8 +218,8 @@ export const AmountInput: React.FC<IProps> = ({
               )
             ) : null}
           </Grid>
-        </Grid>
-      )}
+        )}
+      </Grid>
     </>
   )
 }
diff --git a/src/components/Inputs/ExchangeAmountInput/style.ts b/src/components/Inputs/ExchangeAmountInput/style.ts
index b3a5cdf8..ebfbaaa0 100644
--- a/src/components/Inputs/ExchangeAmountInput/style.ts
+++ b/src/components/Inputs/ExchangeAmountInput/style.ts
@@ -2,181 +2,179 @@ import { Theme } from '@mui/material'
 import { colors, typography } from '@static/theme'
 import { makeStyles } from 'tss-react/mui'
 
-export const useStyles = makeStyles<{ walletDisconnected: boolean }>()(
-  (theme: Theme, { walletDisconnected }) => ({
-    amountInput: {
-      background: colors.invariant.newDark,
-      color: colors.invariant.light,
-      borderRadius: 20,
-      ...typography.heading2,
-      width: '100%',
-      textAlign: 'right',
-      transition: 'all .4s',
-      '& ::placeholder': {
-        textAlign: 'right'
+export const useStyles = makeStyles()((theme: Theme) => ({
+  amountInput: {
+    background: colors.invariant.newDark,
+    color: colors.invariant.light,
+    borderRadius: 20,
+    ...typography.heading2,
+    width: '100%',
+    textAlign: 'right',
+    transition: 'all .4s',
+    '& ::placeholder': {
+      textAlign: 'right'
+    }
+  },
+  maxButton: {
+    color: colors.invariant.componentBcg,
+    ...typography.tiny2,
+    borderRadius: 4,
+    width: 26,
+    minWidth: 26,
+    height: 14,
+    textTransform: 'none',
+    marginLeft: 4,
+    background: ' rgba(46, 224, 154, 0.8)',
+    lineHeight: '14px',
+
+    '&:hover': {
+      background: 'none',
+      backgroundColor: colors.invariant.green,
+      boxShadow: '0px 0px 20px -10px white',
+      '@media (hover: none)': {
+        background: ' rgba(46, 224, 154, 0.8)',
+        boxShadow: 'none'
       }
     },
-    maxButton: {
-      color: colors.invariant.componentBcg,
-      ...typography.tiny2,
-      borderRadius: 4,
+    [theme.breakpoints.down('md')]: {
       width: 26,
       minWidth: 26,
       height: 14,
-      textTransform: 'none',
-      marginLeft: 4,
-      background: ' rgba(46, 224, 154, 0.8)',
-      lineHeight: '14px',
-
-      '&:hover': {
-        background: 'none',
-        backgroundColor: colors.invariant.green,
-        boxShadow: '0px 0px 20px -10px white',
-        '@media (hover: none)': {
-          background: ' rgba(46, 224, 154, 0.8)',
-          boxShadow: 'none'
-        }
-      },
-      [theme.breakpoints.down('md')]: {
-        width: 26,
-        minWidth: 26,
-        height: 14,
-        marginTop: 2
-      }
-    },
-    maxButtonNotActive: {
+      marginTop: 2
+    }
+  },
+  maxButtonNotActive: {
+    backgroundColor: colors.invariant.light,
+    '&:hover': {
       backgroundColor: colors.invariant.light,
-      '&:hover': {
-        backgroundColor: colors.invariant.light,
-        cursor: 'default'
-      }
-    },
-    select: {
-      marginRight: 20,
-      width: 'min-content'
-    },
-    input: {
-      textAlign: 'right',
-      color: colors.white.main,
-      '& ::placeholder': {
-        textAlign: 'right'
-      }
-    },
-    label: {
-      top: -1,
-      color: colors.invariant.dark
-    },
-    balanceContainer: {
-      display: 'flex',
-      alignItems: 'center',
-      paddingBlock: 6,
-      flexShrink: 1,
-      marginRight: 10
-    },
-    showMaxButton: {
-      cursor: 'pointer'
-    },
-    BalanceTypography: {
-      color: colors.invariant.lightGrey,
-      ...typography.caption2,
-      marginRight: 3,
-      overflow: 'hidden',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis',
-      display: 'flex',
-      alignItems: 'center'
-    },
-    walletBalanace: {
-      color: colors.invariant.lightGrey
-    },
-    exchangeContainer: {
-      height: 65,
-      padding: `10px 15px ${walletDisconnected ? '10px' : '0'} 15px `,
-      display: 'flex',
-      justifyContent: 'space-between',
-      alignItems: 'center'
-    },
-    noData: {
-      color: colors.invariant.warning,
-      ...typography.caption2,
-      display: 'flex',
-      flexDirection: 'row',
-      cursor: 'default',
-      paddingBottom: 10
-    },
-    noDataIcon: {
-      marginRight: 5,
-      height: 9.5,
-      width: 9.5,
-      border: '1px solid #EFD063',
-      color: colors.invariant.warning,
-      borderRadius: '50%',
-      fontSize: 8,
-      lineHeight: '10px',
-      fontWeight: 400,
-      textAlign: 'center',
-      alignSelf: 'center',
       cursor: 'default'
-    },
-    loading: {
-      width: 15,
-      height: 15
-    },
-    loadingBalance: {
-      padding: '0 10px 0 20px',
-      width: 15,
-      height: 15
-    },
-    tooltip: {
-      color: colors.invariant.textGrey,
-      ...typography.caption4,
-      lineHeight: '24px',
-      background: colors.black.full,
-      borderRadius: 12
-    },
-    percentages: {
-      flexShrink: 0,
-      width: 'fit-content',
-      justifyContent: 'end',
-      height: 17
-    },
-    percentage: {
-      ...typography.tiny1,
-      borderRadius: 5,
-      paddingInline: 5,
-      marginRight: 3,
-      height: 16,
-      lineHeight: '16px',
-      display: 'flex',
-      flexShrink: 0,
-      marginTop: 1
-    },
-    percentagePositive: {
-      color: colors.invariant.green,
-      backgroundColor: `${colors.invariant.green}40`
-    },
-    percentageNegative: {
-      color: colors.invariant.Error,
-      backgroundColor: `${colors.invariant.Error}40`
-    },
-    caption2: {
-      ...typography.caption2,
-      color: colors.invariant.lightHover,
-      overflow: 'hidden',
-      whiteSpace: 'nowrap',
-      textOverflow: 'ellipsis'
-    },
-    bottom: {
-      paddingInline: 15
-    },
-    blur: {
-      width: 120,
-      height: 40,
-      borderRadius: 16,
-      background: `linear-gradient(90deg, ${colors.invariant.component} 25%, ${colors.invariant.light} 50%, ${colors.invariant.component} 75%)`,
-      backgroundSize: '200% 100%',
-      animation: 'shimmer 2s infinite'
     }
-  })
-)
+  },
+  select: {
+    marginRight: 20,
+    width: 'min-content'
+  },
+  input: {
+    textAlign: 'right',
+    color: colors.white.main,
+    '& ::placeholder': {
+      textAlign: 'right'
+    }
+  },
+  label: {
+    top: -1,
+    color: colors.invariant.dark
+  },
+  balanceContainer: {
+    display: 'flex',
+    alignItems: 'center',
+    paddingBlock: 6,
+    flexShrink: 1,
+    marginRight: 10
+  },
+  showMaxButton: {
+    cursor: 'pointer'
+  },
+  BalanceTypography: {
+    color: colors.invariant.lightGrey,
+    ...typography.caption2,
+    marginRight: 6,
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis',
+    display: 'flex',
+    alignItems: 'center'
+  },
+  walletBalanace: {
+    color: colors.invariant.lightGrey
+  },
+  exchangeContainer: {
+    height: 65,
+    padding: `10px 15px 0 15px `,
+    display: 'flex',
+    justifyContent: 'space-between',
+    alignItems: 'center'
+  },
+  noData: {
+    color: colors.invariant.warning,
+    ...typography.caption2,
+    display: 'flex',
+    flexDirection: 'row',
+    cursor: 'default',
+    paddingBottom: 10
+  },
+  noDataIcon: {
+    marginRight: 5,
+    height: 9.5,
+    width: 9.5,
+    border: '1px solid #EFD063',
+    color: colors.invariant.warning,
+    borderRadius: '50%',
+    fontSize: 8,
+    lineHeight: '10px',
+    fontWeight: 400,
+    textAlign: 'center',
+    alignSelf: 'center',
+    cursor: 'default'
+  },
+  loading: {
+    width: 15,
+    height: 15
+  },
+  loadingBalance: {
+    padding: '0 10px 0 20px',
+    width: 15,
+    height: 15
+  },
+  tooltip: {
+    color: colors.invariant.textGrey,
+    ...typography.caption4,
+    lineHeight: '24px',
+    background: colors.black.full,
+    borderRadius: 12
+  },
+  percentages: {
+    flexShrink: 0,
+    width: 'fit-content',
+    justifyContent: 'end',
+    height: 17
+  },
+  percentage: {
+    ...typography.tiny1,
+    borderRadius: 5,
+    paddingInline: 5,
+    marginRight: 3,
+    height: 16,
+    lineHeight: '16px',
+    display: 'flex',
+    flexShrink: 0,
+    marginTop: 1
+  },
+  percentagePositive: {
+    color: colors.invariant.green,
+    backgroundColor: `${colors.invariant.green}40`
+  },
+  percentageNegative: {
+    color: colors.invariant.Error,
+    backgroundColor: `${colors.invariant.Error}40`
+  },
+  caption2: {
+    ...typography.caption2,
+    color: colors.invariant.lightHover,
+    overflow: 'hidden',
+    whiteSpace: 'nowrap',
+    textOverflow: 'ellipsis'
+  },
+  bottom: {
+    paddingInline: 15
+  },
+  blur: {
+    width: 120,
+    height: 40,
+    borderRadius: 16,
+    background: `linear-gradient(90deg, ${colors.invariant.component} 25%, ${colors.invariant.light} 50%, ${colors.invariant.component} 75%)`,
+    backgroundSize: '200% 100%',
+    animation: 'shimmer 2s infinite'
+  }
+}))
 export default useStyles
diff --git a/src/components/Inputs/RangeInput/style.ts b/src/components/Inputs/RangeInput/style.ts
index 056b8eb3..3a3f30b5 100644
--- a/src/components/Inputs/RangeInput/style.ts
+++ b/src/components/Inputs/RangeInput/style.ts
@@ -108,6 +108,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
   diffLabelWrapper: {
     borderRadius: 11,
     height: 36,
+    flex: '0 0 auto',
     backgroundColor: colors.invariant.light,
     display: 'flex',
     alignItems: 'center',
@@ -116,7 +117,6 @@ export const useStyles = makeStyles()((theme: Theme) => ({
   diffLabel: {
     ...typography.caption2,
     color: colors.invariant.text,
-    width: 'fit-content',
     textOverflow: 'ellipsis',
     overflow: 'hidden',
     whiteSpace: 'nowrap'
@@ -126,7 +126,15 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     padding: 3,
     borderRadius: 5,
     marginInline: 'auto',
-    flex: '0 0 auto'
+    overflowX: 'auto',
+    overflowY: 'hidden',
+    scrollbarWidth: 'none',
+
+    '&::-webkit-scrollbar': {
+      display: 'none',
+      scrollbarWidth: 'none',
+      msOverflowStyle: 'none'
+    }
   }
 }))
 
diff --git a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.stories.ts b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.stories.ts
index 126324fe..8800e356 100644
--- a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.stories.ts
+++ b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.stories.ts
@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import SelectMainnetRPC from './SelectMainnetRPC'
 import { Network } from '@invariant-labs/a0-sdk'
+import { RpcStatus } from '@store/reducers/connection'
 
 const meta = {
   title: 'Modals/SelectRPC',
@@ -17,7 +18,8 @@ const meta = {
       }
     ],
     onSelect: () => {},
-    open: true
+    open: true,
+    rpcStatus: RpcStatus.Uninitialized
   }
 } satisfies Meta<typeof SelectMainnetRPC>
 
diff --git a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
index ea5685a4..553f8d0b 100644
--- a/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
+++ b/src/components/Modals/SelectMainnetRPC/SelectMainnetRPC.tsx
@@ -1,10 +1,13 @@
 import { Network } from '@invariant-labs/a0-sdk'
 import DotIcon from '@mui/icons-material/FiberManualRecord'
-import { Button, Grid, Input, Popover, Typography } from '@mui/material'
+import { Box, Button, Grid, Input, Popover, Typography } from '@mui/material'
 import { ISelectNetwork } from '@store/consts/types'
 import classNames from 'classnames'
 import React, { useEffect, useRef, useState } from 'react'
 import useStyles from './styles'
+import { RpcStatus } from '@store/reducers/connection'
+import { RECOMMENDED_RPC_ADDRESS } from '@store/consts/static'
+import icons from '@static/icons'
 
 export interface ISelectMainnetRPC {
   networks: ISelectNetwork[]
@@ -13,6 +16,7 @@ export interface ISelectMainnetRPC {
   onSelect: (networkType: Network, rpcAddress: string, rpcName?: string) => void
   handleClose: () => void
   activeRPC: string
+  rpcStatus: RpcStatus
 }
 export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
   networks,
@@ -20,7 +24,8 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
   open,
   onSelect,
   handleClose,
-  activeRPC
+  activeRPC,
+  rpcStatus
 }) => {
   const { classes } = useStyles()
 
@@ -50,8 +55,13 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
       setButtonApplied(true)
       setActiveCustom(true)
       setAddress(activeRPC)
+    } else {
+      setCustomApplied(false)
+      setButtonApplied(false)
+      setActiveCustom(false)
+      setAddress('')
     }
-  }, [])
+  }, [activeRPC])
 
   return (
     <Popover
@@ -72,6 +82,15 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
       }}>
       <Grid className={classes.root}>
         <Typography className={classes.title}>Select mainnet RPC to use</Typography>
+        {rpcStatus === RpcStatus.IgnoredWithError &&
+          activeRPC !== RECOMMENDED_RPC_ADDRESS[Network.Mainnet] && (
+            <div className={classes.warningContainer}>
+              <img className={classes.warningIcon} src={icons.warningIcon} alt='Warning icon' />
+              <Typography className={classes.warningText}>
+                Current RPC might not work properly
+              </Typography>
+            </div>
+          )}
         <Grid className={classes.list} container alignContent='space-around' direction='column'>
           {networks.map(({ networkType, rpc, rpcName }) => (
             <Grid
@@ -89,7 +108,12 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
                 setButtonApplied(false)
                 handleClose()
               }}>
-              <Typography className={classes.name}>{rpcName}</Typography>
+              <Box width='100%' display='flex' justifyContent='space-between' alignItems='center'>
+                <Typography className={classes.name}>{rpcName} </Typography>
+                <Typography className={classes.recommendedText}>
+                  {RECOMMENDED_RPC_ADDRESS[Network.Mainnet] === rpc && 'RECOMMENDED'}
+                </Typography>
+              </Box>
               <DotIcon className={classes.dotIcon} />
             </Grid>
           ))}
@@ -105,7 +129,9 @@ export const SelectMainnetRPC: React.FC<ISelectMainnetRPC> = ({
               setActiveCustom(true)
               inputRef.current?.focus()
             }}>
-            <Typography className={classes.name}>Custom RPC</Typography>
+            <Box width='100%' display='flex' justifyContent='space-between' alignItems='center'>
+              <Typography className={classes.name}>Custom RPC</Typography>
+            </Box>
             <DotIcon className={classes.dotIcon} />
           </Grid>
         </Grid>
diff --git a/src/components/Modals/SelectMainnetRPC/styles.ts b/src/components/Modals/SelectMainnetRPC/styles.ts
index bbb14bc6..60a45230 100644
--- a/src/components/Modals/SelectMainnetRPC/styles.ts
+++ b/src/components/Modals/SelectMainnetRPC/styles.ts
@@ -47,7 +47,7 @@ const useStyles = makeStyles()(() => {
     },
     dotIcon: {
       width: 12,
-      marginLeft: 'auto',
+      marginLeft: 8,
       color: colors.invariant.green,
       visibility: 'hidden'
     },
@@ -149,6 +149,28 @@ const useStyles = makeStyles()(() => {
         color: colors.invariant.text,
         cursor: 'default'
       }
+    },
+    warningIcon: {
+      height: 16,
+      marginRight: 4
+    },
+    warningText: {
+      ...typography.caption2,
+      color: colors.invariant.yellow
+    },
+    recommendedText: {
+      ...typography.caption3,
+      color: colors.white.main
+    },
+    warningContainer: {
+      padding: '0 8px',
+      display: 'flex'
+    },
+    rpcContainer: {
+      width: '100%',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between'
     }
   }
 })
diff --git a/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx b/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
index 34e6828a..5b1f2314 100644
--- a/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
+++ b/src/components/Modals/SelectModals/SelectTokenModal/SelectTokenModal.tsx
@@ -99,10 +99,6 @@ export const SelectTokenModal: React.FC<ISelectTokenModal> = ({
   }, [tokens, commonTokens])
 
   const filteredTokens = useMemo(() => {
-    if (!open) {
-      return []
-    }
-
     const filteredTokens: SwapToken[] = []
     for (const [assetAddress, token] of Object.entries(tokens)) {
       if (
diff --git a/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.stories.ts b/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.stories.ts
index 01b7594b..632c9f2a 100644
--- a/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.stories.ts
+++ b/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.stories.ts
@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import SelectTestnetRPC from './SelectTestnetRPC'
 import { Network } from '@invariant-labs/a0-sdk'
+import { RpcStatus } from '@store/reducers/connection'
 
 const meta = {
   title: 'Modals/SelectRPC',
@@ -17,7 +18,8 @@ const meta = {
       }
     ],
     onSelect: () => {},
-    open: true
+    open: true,
+    rpcStatus: RpcStatus.Uninitialized
   }
 } satisfies Meta<typeof SelectTestnetRPC>
 
diff --git a/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.tsx b/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.tsx
index eaf769b8..efa7b1e4 100644
--- a/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.tsx
+++ b/src/components/Modals/SelectTestnetRPC/SelectTestnetRPC.tsx
@@ -1,10 +1,13 @@
 import { Network } from '@invariant-labs/a0-sdk'
 import DotIcon from '@mui/icons-material/FiberManualRecord'
-import { Button, Grid, Input, Popover, Typography } from '@mui/material'
+import { Box, Button, Grid, Input, Popover, Typography } from '@mui/material'
 import { ISelectNetwork } from '@store/consts/types'
 import classNames from 'classnames'
 import React, { useEffect, useRef, useState } from 'react'
 import useStyles from './styles'
+import { RpcStatus } from '@store/reducers/connection'
+import { RECOMMENDED_RPC_ADDRESS } from '@store/consts/static'
+import icons from '@static/icons'
 
 export interface ISelectTestnetRPC {
   networks: ISelectNetwork[]
@@ -13,6 +16,7 @@ export interface ISelectTestnetRPC {
   onSelect: (networkType: Network, rpcAddress: string, rpcName?: string) => void
   handleClose: () => void
   activeRPC: string
+  rpcStatus: RpcStatus
 }
 export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
   networks,
@@ -20,7 +24,8 @@ export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
   open,
   onSelect,
   handleClose,
-  activeRPC
+  activeRPC,
+  rpcStatus
 }) => {
   const { classes } = useStyles()
 
@@ -50,8 +55,13 @@ export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
       setButtonApplied(true)
       setActiveCustom(true)
       setAddress(activeRPC)
+    } else {
+      setCustomApplied(false)
+      setButtonApplied(false)
+      setActiveCustom(false)
+      setAddress('')
     }
-  }, [])
+  }, [activeRPC])
 
   return (
     <Popover
@@ -72,6 +82,15 @@ export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
       }}>
       <Grid className={classes.root}>
         <Typography className={classes.title}>Select testnet RPC to use</Typography>
+        {rpcStatus === RpcStatus.IgnoredWithError &&
+          activeRPC !== RECOMMENDED_RPC_ADDRESS[Network.Testnet] && (
+            <div className={classes.warningContainer}>
+              <img className={classes.warningIcon} src={icons.warningIcon} alt='Warning icon' />
+              <Typography className={classes.warningText}>
+                Current RPC might not work properly
+              </Typography>
+            </div>
+          )}
         <Grid className={classes.list} container alignContent='space-around' direction='column'>
           {networks.map(({ networkType, rpc, rpcName }) => (
             <Grid
@@ -89,7 +108,12 @@ export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
                 setButtonApplied(false)
                 handleClose()
               }}>
-              <Typography className={classes.name}>{rpcName}</Typography>
+              <Box width='100%' display='flex' justifyContent='space-between' alignItems='center'>
+                <Typography className={classes.name}>{rpcName} </Typography>
+                <Typography className={classes.recommendedText}>
+                  {RECOMMENDED_RPC_ADDRESS[Network.Testnet] === rpc && 'RECOMMENDED'}
+                </Typography>
+              </Box>
               <DotIcon className={classes.dotIcon} />
             </Grid>
           ))}
@@ -105,7 +129,9 @@ export const SelectTestnetRPC: React.FC<ISelectTestnetRPC> = ({
               setActiveCustom(true)
               inputRef.current?.focus()
             }}>
-            <Typography className={classes.name}>Custom RPC</Typography>
+            <Box width='100%' display='flex' justifyContent='space-between' alignItems='center'>
+              <Typography className={classes.name}>Custom RPC</Typography>
+            </Box>
             <DotIcon className={classes.dotIcon} />
           </Grid>
         </Grid>
diff --git a/src/components/Modals/SelectTestnetRPC/styles.ts b/src/components/Modals/SelectTestnetRPC/styles.ts
index bbb14bc6..60a45230 100644
--- a/src/components/Modals/SelectTestnetRPC/styles.ts
+++ b/src/components/Modals/SelectTestnetRPC/styles.ts
@@ -47,7 +47,7 @@ const useStyles = makeStyles()(() => {
     },
     dotIcon: {
       width: 12,
-      marginLeft: 'auto',
+      marginLeft: 8,
       color: colors.invariant.green,
       visibility: 'hidden'
     },
@@ -149,6 +149,28 @@ const useStyles = makeStyles()(() => {
         color: colors.invariant.text,
         cursor: 'default'
       }
+    },
+    warningIcon: {
+      height: 16,
+      marginRight: 4
+    },
+    warningText: {
+      ...typography.caption2,
+      color: colors.invariant.yellow
+    },
+    recommendedText: {
+      ...typography.caption3,
+      color: colors.white.main
+    },
+    warningContainer: {
+      padding: '0 8px',
+      display: 'flex'
+    },
+    rpcContainer: {
+      width: '100%',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between'
     }
   }
 })
diff --git a/src/components/NewPosition/DepositSelector/DepositSelector.stories.tsx b/src/components/NewPosition/DepositSelector/DepositSelector.stories.tsx
index 164bee50..d2cf010b 100644
--- a/src/components/NewPosition/DepositSelector/DepositSelector.stories.tsx
+++ b/src/components/NewPosition/DepositSelector/DepositSelector.stories.tsx
@@ -7,6 +7,7 @@ import { Provider } from 'react-redux'
 import { store } from '@store/index'
 import { MemoryRouter } from 'react-router-dom'
 import { Network } from '@invariant-labs/a0-sdk'
+import { Status } from '@store/reducers/wallet'
 
 const tokens: Record<string, SwapToken> = {
   So11111111111111111111111111111111111111112: {
@@ -116,7 +117,10 @@ export const Primary: Story = {
     isGetLiquidityError: false,
     ticksLoading: false,
     network: Network.Testnet,
-    azeroBalance: 20000000000000 as any
+    azeroBalance: 20000000000000 as any,
+    walletStatus: Status.Initialized,
+    onConnectWallet: () => {},
+    onDisconnectWallet: () => {}
   },
   render: args => <PrimaryComponent {...args} />
 }
diff --git a/src/components/NewPosition/DepositSelector/DepositSelector.tsx b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
index a01d6370..0618b8e6 100644
--- a/src/components/NewPosition/DepositSelector/DepositSelector.tsx
+++ b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
@@ -19,6 +19,8 @@ import { PositionOpeningMethod } from '@store/consts/types'
 import { SwapToken } from '@store/selectors/wallet'
 import { TooltipHover } from '@components/TooltipHover/TooltipHover'
 import { Network } from '@invariant-labs/a0-sdk'
+import { Status } from '@store/reducers/wallet'
+import ChangeWalletButton from '@components/Header/HeaderButton/ChangeWalletButton'
 export interface InputState {
   value: string
   setValue: (value: string) => void
@@ -64,6 +66,9 @@ export interface IDepositSelector {
   ticksLoading: boolean
   network: Network
   azeroBalance: bigint
+  walletStatus: Status
+  onConnectWallet: () => void
+  onDisconnectWallet: () => void
 }
 
 export const DepositSelector: React.FC<IDepositSelector> = ({
@@ -98,7 +103,10 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
   isGetLiquidityError,
   ticksLoading,
   network,
-  azeroBalance
+  azeroBalance,
+  walletStatus,
+  onConnectWallet,
+  onDisconnectWallet
 }) => {
   const { classes } = useStyles()
 
@@ -360,6 +368,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           {...tokenAInputState}
           priceLoading={priceALoading}
           isBalanceLoading={isBalanceLoading}
+          walletUninitialized={walletStatus !== Status.Initialized}
         />
 
         <DepositAmountInput
@@ -385,9 +394,18 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           {...tokenBInputState}
           priceLoading={priceBLoading}
           isBalanceLoading={isBalanceLoading}
+          walletUninitialized={walletStatus !== Status.Initialized}
         />
       </Grid>
-      {getButtonMessage() === 'Insufficient AZERO' ? (
+      {walletStatus !== Status.Initialized ? (
+        <ChangeWalletButton
+          name='Connect wallet'
+          onConnect={onConnectWallet}
+          connected={false}
+          onDisconnect={onDisconnectWallet}
+          className={classes.connectWalletButton}
+        />
+      ) : getButtonMessage() === 'Insufficient AZERO' ? (
         <TooltipHover
           text='More AZERO is required to cover the transaction fee. Obtain more AZERO to complete this transaction.'
           top={-10}>
diff --git a/src/components/NewPosition/DepositSelector/style.ts b/src/components/NewPosition/DepositSelector/style.ts
index 4d371f25..d6b41c4a 100644
--- a/src/components/NewPosition/DepositSelector/style.ts
+++ b/src/components/NewPosition/DepositSelector/style.ts
@@ -58,6 +58,7 @@ export const useStyles = makeStyles()(theme => {
       }
     },
     addButton: {
+      height: '48px',
       width: '100%',
       margin: '30px 0',
       cursor: 'default'
@@ -80,6 +81,16 @@ export const useStyles = makeStyles()(theme => {
           filter: 'none'
         }
       }
+    },
+    connectWalletButton: {
+      height: '48px !important',
+      borderRadius: '16px',
+      width: '100%',
+      margin: '30px 0',
+
+      [theme.breakpoints.down('sm')]: {
+        width: '100%'
+      }
     }
   }
 })
diff --git a/src/components/NewPosition/NewPosition.stories.tsx b/src/components/NewPosition/NewPosition.stories.tsx
index 8227702e..92731687 100644
--- a/src/components/NewPosition/NewPosition.stories.tsx
+++ b/src/components/NewPosition/NewPosition.stories.tsx
@@ -3,6 +3,7 @@ import { fn } from '@storybook/test'
 import { MemoryRouter } from 'react-router-dom'
 import NewPosition from './NewPosition'
 import { Network } from '@invariant-labs/a0-sdk'
+import { Status } from '@store/reducers/wallet'
 
 const meta = {
   title: 'PageComponent/NewPosition',
@@ -64,10 +65,6 @@ export const Primary: Story = {
     calcAmount: fn(),
     loadingTicksAndTickMaps: false,
     poolKey: '',
-    noConnectedBlockerProps: {
-      onConnect: fn(),
-      descCustomText: 'Cannot add any liquidity.'
-    },
     onRefresh: fn(),
     isBalanceLoading: false,
     shouldNotUpdatePriceRange: false,
@@ -77,7 +74,10 @@ export const Primary: Story = {
     setOnlyUserPositions: fn(),
     network: Network.Testnet,
     isLoadingTokens: false,
-    azeroBalance: 20000000000000 as any
+    azeroBalance: 20000000000000 as any,
+    walletStatus: Status.Initialized,
+    onConnectWallet: () => {},
+    onDisconnectWallet: () => {}
   },
   render: () => {
     return (
@@ -125,10 +125,6 @@ export const Primary: Story = {
         calcAmount={() => 1n}
         loadingTicksAndTickMaps={false}
         poolKey=''
-        noConnectedBlockerProps={{
-          onConnect: fn(),
-          descCustomText: 'Cannot add any liquidity.'
-        }}
         onRefresh={fn()}
         isBalanceLoading={false}
         shouldNotUpdatePriceRange={false}
@@ -139,6 +135,9 @@ export const Primary: Story = {
         network={Network.Testnet}
         isLoadingTokens={false}
         azeroBalance={20000000000000n}
+        walletStatus={Status.Initialized}
+        onConnectWallet={() => {}}
+        onDisconnectWallet={() => {}}
       />
     )
   }
diff --git a/src/components/NewPosition/NewPosition.tsx b/src/components/NewPosition/NewPosition.tsx
index 308a373b..5ec1f0b4 100644
--- a/src/components/NewPosition/NewPosition.tsx
+++ b/src/components/NewPosition/NewPosition.tsx
@@ -1,6 +1,5 @@
 import { ProgressState } from '@components/AnimatedButton/AnimatedButton'
 import Slippage from '@components/Modals/Slippage/Slippage'
-import { INoConnected, NoConnected } from '@components/NoConnected/NoConnected'
 import Refresher from '@components/Refresher/Refresher'
 import { getMaxTick, getMinTick, Network } from '@invariant-labs/a0-sdk'
 import { PERCENTAGE_DENOMINATOR } from '@invariant-labs/a0-sdk/target/consts'
@@ -34,6 +33,7 @@ import useStyles from './style'
 import { BestTier, PositionOpeningMethod, TokenPriceData } from '@store/consts/types'
 import { getConcentrationArray } from '@invariant-labs/a0-sdk/target/utils'
 import { TooltipHover } from '@components/TooltipHover/TooltipHover'
+import { Status } from '@store/reducers/wallet'
 
 export interface INewPosition {
   initialTokenFrom: string
@@ -68,8 +68,6 @@ export interface INewPosition {
   }>
   ticksLoading: boolean
   loadingTicksAndTickMaps: boolean
-  showNoConnected?: boolean
-  noConnectedBlockerProps: INoConnected
   progress: ProgressState
   isXtoY: boolean
   xDecimal: bigint
@@ -106,6 +104,9 @@ export interface INewPosition {
   network: Network
   isLoadingTokens: boolean
   azeroBalance: bigint
+  walletStatus: Status
+  onConnectWallet: () => void
+  onDisconnectWallet: () => void
 }
 
 export const NewPosition: React.FC<INewPosition> = ({
@@ -124,8 +125,6 @@ export const NewPosition: React.FC<INewPosition> = ({
   calcAmount,
   feeTiers,
   ticksLoading,
-  showNoConnected,
-  noConnectedBlockerProps,
   isXtoY,
   xDecimal,
   yDecimal,
@@ -160,7 +159,10 @@ export const NewPosition: React.FC<INewPosition> = ({
   setOnlyUserPositions,
   network,
   isLoadingTokens,
-  azeroBalance
+  azeroBalance,
+  walletStatus,
+  onConnectWallet,
+  onDisconnectWallet
 }) => {
   const { classes } = useStyles()
   const navigate = useNavigate()
@@ -553,7 +555,6 @@ export const NewPosition: React.FC<INewPosition> = ({
       />
 
       <Grid container className={classes.row} alignItems='stretch'>
-        {showNoConnected && <NoConnected {...noConnectedBlockerProps} />}
         <DepositSelector
           initialTokenFrom={initialTokenFrom}
           initialTokenTo={initialTokenTo}
@@ -685,6 +686,9 @@ export const NewPosition: React.FC<INewPosition> = ({
           ticksLoading={ticksLoading}
           network={network}
           azeroBalance={azeroBalance}
+          walletStatus={walletStatus}
+          onConnectWallet={onConnectWallet}
+          onDisconnectWallet={onDisconnectWallet}
         />
         <Hidden mdUp>
           <Grid container justifyContent='end' mb={2}>
diff --git a/src/components/NewPosition/style.ts b/src/components/NewPosition/style.ts
index a6210708..0e933b1d 100644
--- a/src/components/NewPosition/style.ts
+++ b/src/components/NewPosition/style.ts
@@ -8,7 +8,8 @@ const useStyles = makeStyles()(theme => {
       maxWidth: '100%'
     },
     headerContainer: {
-      columnGap: 24
+      columnGap: 24,
+      height: 46
     },
     back: {
       height: 24,
diff --git a/src/components/NoConnected/NoConnected.tsx b/src/components/NoConnected/NoConnected.tsx
index 0403ad6c..eda012e4 100644
--- a/src/components/NoConnected/NoConnected.tsx
+++ b/src/components/NoConnected/NoConnected.tsx
@@ -2,6 +2,7 @@ import { Button, Grid, Typography } from '@mui/material'
 import icons from '@static/icons'
 import classNames from 'classnames'
 import { useStyles } from './style'
+import { useNavigate } from 'react-router-dom'
 
 export interface INoConnected {
   onConnect: () => void
@@ -11,18 +12,34 @@ export interface INoConnected {
 export const NoConnected: React.FC<INoConnected> = ({ onConnect, descCustomText }) => {
   const { classes } = useStyles()
 
+  const navigate = useNavigate()
+
   return (
     <>
       <Grid className={classNames(classes.blur, 'blurLayer')} />
       <Grid className={classNames(classes.container, 'blurLayer')}>
         <Grid className={classNames(classes.root, 'blurInfo')}>
           <img className={classes.img} src={icons.NoConnected} alt='Not connected' />
-          <Typography className={classes.desc}>Wallet is not connected.</Typography>
+          <Typography className={classes.desc}>
+            Start exploring liquidity pools right now!
+          </Typography>
+
           {descCustomText?.length && (
-            <Typography className={classes.desc}>{descCustomText}</Typography>
+            <Typography className={classes.desc}>
+              Or, connect your wallet to see existing positions, and create a new one!
+            </Typography>
           )}
-          <Button className={classes.button} onClick={onConnect} variant='contained'>
-            Connect a wallet
+          <Button
+            className={classes.buttonPrimary}
+            onClick={() => {
+              navigate('/newPosition/0_01')
+            }}
+            variant='contained'>
+            Explore pools
+          </Button>
+
+          <Button className={classes.buttonSecondary} onClick={onConnect} variant='contained'>
+            Connect wallet
           </Button>
         </Grid>
       </Grid>
diff --git a/src/components/NoConnected/style.tsx b/src/components/NoConnected/style.tsx
index 92e1e282..993deb22 100644
--- a/src/components/NoConnected/style.tsx
+++ b/src/components/NoConnected/style.tsx
@@ -38,10 +38,10 @@ export const useStyles = makeStyles()(() => ({
     lineHeight: '20px',
     color: colors.invariant.lightHover
   },
-  button: {
+  buttonPrimary: {
     height: 40,
     width: 200,
-    marginTop: 20,
+    marginTop: 16,
     color: colors.invariant.componentBcg,
     ...typography.body1,
     textTransform: 'none',
@@ -56,5 +56,26 @@ export const useStyles = makeStyles()(() => ({
         boxShadow: 'none'
       }
     }
+  },
+  buttonSecondary: {
+    width: 200,
+    height: 40,
+    marginTop: 12,
+    ...typography.body2,
+    color: colors.white.main,
+    textTransform: 'none',
+    backgroundColor: colors.invariant.light,
+    borderRadius: 14,
+
+    transition: '0.1s',
+    '&:hover': {
+      //
+      boxShadow: '0px 0px 16px rgba(255, 255, 255, 0.1)',
+      backgroundColor: colors.invariant.light,
+      filter: 'brightness(1.2)',
+      '@media (hover: none)': {
+        boxShadow: 'none'
+      }
+    }
   }
 }))
diff --git a/src/components/PositionDetails/LiquidationRangeInfo/style.ts b/src/components/PositionDetails/LiquidationRangeInfo/style.ts
index fde94279..e1fc8fff 100644
--- a/src/components/PositionDetails/LiquidationRangeInfo/style.ts
+++ b/src/components/PositionDetails/LiquidationRangeInfo/style.ts
@@ -40,7 +40,8 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     justifyContent: 'center',
     fontSize: 16,
     width: '100%',
-    padding: '0 4px'
+    padding: '0 4px',
+    textWrap: 'nowrap'
   },
   infoAmount: {
     color: colors.invariant.text,
diff --git a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
index b88c7bee..2de4d557 100644
--- a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
+++ b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
@@ -95,7 +95,7 @@ const SinglePositionInfo: React.FC<IProp> = ({
               {xToY ? tokenX.name : tokenY.name} - {xToY ? tokenY.name : tokenX.name}
             </Typography>
           </Grid>
-          <Grid className={classes.rangeGrid}>
+          <Grid className={classes.rangeGrid} sx={{ display: { xs: 'flex', md: 'none' } }}>
             <Tooltip
               title={
                 isActive ? (
@@ -127,6 +127,35 @@ const SinglePositionInfo: React.FC<IProp> = ({
         </Grid>
 
         <Grid className={classes.headerButtons}>
+          <Grid className={classes.rangeGrid} sx={{ display: { xs: 'none', md: 'flex' } }}>
+            <Tooltip
+              title={
+                isActive ? (
+                  <>
+                    The position is <b>active</b> and currently <b>earning a fee</b> as long as the
+                    current price is <b>within</b> the position's price range.
+                  </>
+                ) : (
+                  <>
+                    The position is <b>inactive</b> and <b>not earning a fee</b> as long as the
+                    current price is <b>outside</b> the position's price range.
+                  </>
+                )
+              }
+              placement='top'
+              classes={{
+                tooltip: classes.tooltip
+              }}>
+              <Typography
+                className={classNames(
+                  classes.text,
+                  classes.feeText,
+                  isActive ? classes.active : null
+                )}>
+                {fee.toString()}% fee
+              </Typography>
+            </Tooltip>
+          </Grid>
           <TooltipHover
             text={
               tokenX.claimValue > 0 || tokenY.claimValue > 0
diff --git a/src/components/PositionDetails/SinglePositionInfo/style.ts b/src/components/PositionDetails/SinglePositionInfo/style.ts
index 91b90847..45503f02 100644
--- a/src/components/PositionDetails/SinglePositionInfo/style.ts
+++ b/src/components/PositionDetails/SinglePositionInfo/style.ts
@@ -55,8 +55,7 @@ export const useStyles = makeStyles()((theme: Theme) => ({
   },
   rangeGrid: {
     display: 'flex',
-    flexDirection: 'row',
-    paddingRight: 4
+    flexDirection: 'row'
   },
   header: {
     display: 'flex',
@@ -71,18 +70,32 @@ export const useStyles = makeStyles()((theme: Theme) => ({
     flexDirection: 'row',
     alignItems: 'center',
     columnGap: 10,
+    flexBasis: '41%',
+    justifyContent: 'space-between',
+    flexGrow: 0.6,
+    [theme.breakpoints.down('md')]: {
+      justifyContent: 'flex-end',
+      flexBasis: 'auto',
+      flexGrow: 'auto'
+    },
+
     [theme.breakpoints.down('sm')]: {
       justifyContent: 'space-between',
+      flexBasis: 'auto',
       marginTop: 16
     }
   },
   feeText: {
-    marginLeft: 8,
     paddingInline: 6,
     minWidth: 66,
 
     [theme.breakpoints.down('md')]: {
-      minWidth: 84
+      minWidth: 84,
+      marginLeft: 16
+    },
+    [theme.breakpoints.down('md')]: {
+      minWidth: 84,
+      marginInline: 12
     }
   },
   closedText: {
diff --git a/src/components/PositionsList/PositionItem/PositionItem.stories.tsx b/src/components/PositionsList/PositionItem/PositionItem.stories.tsx
index f9e52877..fa3ce521 100644
--- a/src/components/PositionsList/PositionItem/PositionItem.stories.tsx
+++ b/src/components/PositionsList/PositionItem/PositionItem.stories.tsx
@@ -27,6 +27,7 @@ export const Primary: Story = {
     tokenXLiq: 5000,
     tokenYLiq: 300.2,
     currentPrice: 10000,
-    network: Network.Testnet
+    network: Network.Testnet,
+    isFullRange: false
   }
 }
diff --git a/src/components/PositionsList/PositionItem/PositionItem.tsx b/src/components/PositionsList/PositionItem/PositionItem.tsx
index 0724b80a..2ffddbc9 100644
--- a/src/components/PositionsList/PositionItem/PositionItem.tsx
+++ b/src/components/PositionsList/PositionItem/PositionItem.tsx
@@ -25,6 +25,7 @@ export interface IPositionItem {
   tokenXLiq: number
   tokenYLiq: number
   network: Network
+  isFullRange: boolean
 }
 
 export const PositionItem: React.FC<IPositionItem> = ({
@@ -41,7 +42,8 @@ export const PositionItem: React.FC<IPositionItem> = ({
   currentPrice,
   tokenXLiq,
   tokenYLiq,
-  network
+  network,
+  isFullRange
 }) => {
   const { classes } = useStyles()
 
@@ -209,15 +211,21 @@ export const PositionItem: React.FC<IPositionItem> = ({
           justifyContent='space-between'
           alignItems='center'
           wrap='nowrap'>
-          <Typography className={classNames(classes.greenText, classes.label)}>
-            MIN - MAX
-          </Typography>
-          <Grid className={classes.infoCenter} container item justifyContent='center'>
-            <Typography className={classes.infoText}>
-              {formatNumber(xToY ? min : 1 / max)} - {formatNumber(xToY ? max : 1 / min)}{' '}
-              {xToY ? tokenYName : tokenXName} per {xToY ? tokenXName : tokenYName}
+          <>
+            <Typography className={classNames(classes.greenText, classes.label)}>
+              MIN - MAX
             </Typography>
-          </Grid>
+            <Grid className={classes.infoCenter} container item justifyContent='center'>
+              {isFullRange ? (
+                <Typography className={classes.infoText}>FULL RANGE</Typography>
+              ) : (
+                <Typography className={classes.infoText}>
+                  {formatNumber(xToY ? min : 1 / max)} - {formatNumber(xToY ? max : 1 / min)}{' '}
+                  {xToY ? tokenYName : tokenXName} per {xToY ? tokenXName : tokenYName}
+                </Typography>
+              )}
+            </Grid>
+          </>
         </Grid>
 
         <Hidden mdDown>{valueFragment}</Hidden>
diff --git a/src/components/PositionsList/PositionsList.stories.tsx b/src/components/PositionsList/PositionsList.stories.tsx
index 22fca4cb..ebc9b034 100644
--- a/src/components/PositionsList/PositionsList.stories.tsx
+++ b/src/components/PositionsList/PositionsList.stories.tsx
@@ -34,7 +34,8 @@ const data = [
     tokenXLiq: 5000,
     tokenYLiq: 300.2,
     currentPrice: 1000,
-    network: Network.Testnet
+    network: Network.Testnet,
+    isFullRange: false
   },
   {
     tokenXName: 'BTC',
@@ -51,7 +52,8 @@ const data = [
     tokenXLiq: 5000,
     tokenYLiq: 300.2,
     currentPrice: 1000,
-    network: Network.Testnet
+    network: Network.Testnet,
+    isFullRange: false
   },
   {
     tokenXName: 'BTC',
@@ -68,7 +70,8 @@ const data = [
     tokenXLiq: 5000,
     tokenYLiq: 300.2,
     currentPrice: 1000,
-    network: Network.Testnet
+    network: Network.Testnet,
+    isFullRange: false
   },
   {
     tokenXName: 'BTC',
@@ -85,7 +88,8 @@ const data = [
     tokenXLiq: 5000,
     tokenYLiq: 300.2,
     currentPrice: 1000,
-    network: Network.Testnet
+    network: Network.Testnet,
+    isFullRange: false
   }
 ]
 
diff --git a/src/components/PositionsList/PositionsList.tsx b/src/components/PositionsList/PositionsList.tsx
index 175ea883..17f8f33a 100644
--- a/src/components/PositionsList/PositionsList.tsx
+++ b/src/components/PositionsList/PositionsList.tsx
@@ -141,10 +141,7 @@ export const PositionsList: React.FC<IProps> = ({
                   </Button>
                 </Grid>
               </TooltipHover>
-              <Button
-                className={showNoConnected ? classes.buttonSelectDisabled : classes.button}
-                variant='contained'
-                onClick={showNoConnected ? () => {} : onAddPositionClick}>
+              <Button className={classes.button} variant='contained' onClick={onAddPositionClick}>
                 <span className={classes.buttonText}>+ Add Position</span>
               </Button>
             </Grid>
diff --git a/src/components/RpcErrorModal/RpcErrorModal.tsx b/src/components/RpcErrorModal/RpcErrorModal.tsx
new file mode 100644
index 00000000..be2a14c3
--- /dev/null
+++ b/src/components/RpcErrorModal/RpcErrorModal.tsx
@@ -0,0 +1,47 @@
+import { Button, Typography } from '@mui/material'
+import useStyles from './style'
+import icons from '@static/icons'
+import { useState } from 'react'
+
+interface Props {
+  rpcAddress: string
+  useDefaultRpc: () => void
+  useCurrentRpc: () => void
+}
+
+export const RpcErrorModal: React.FC<Props> = ({ rpcAddress, useDefaultRpc, useCurrentRpc }) => {
+  const [rpc] = useState(rpcAddress)
+
+  const { classes } = useStyles()
+
+  return (
+    <>
+      <div className={classes.background}></div>
+      <div className={classes.container}>
+        <img className={classes.warningIcon} src={icons.warningIcon} alt='Warning icon' />
+        <Typography className={classes.title}>RPC Connection Error</Typography>
+        <div className={classes.textContainer}>
+          <Typography className={classes.rpcText}>
+            Your RPC might not be working due to one of the following reasons:
+            <ul>
+              <li>The RPC server is down or not responding.</li>
+              <li>Your RPC subscription expired, causing the server to stop working.</li>
+              <li>Your RPC plan may not support certain calls.</li>
+            </ul>
+          </Typography>
+          <Typography className={classes.currentRpcText}>
+            Current RPC: <span className={classes.currentRpc}>{rpc}</span>
+          </Typography>
+        </div>
+        <div className={classes.buttonsContainer}>
+          <Button className={classes.mainButton} onClick={useDefaultRpc}>
+            Change to default RPC
+          </Button>
+          <Button className={classes.otherButton} onClick={useCurrentRpc}>
+            Use current RPC anyway
+          </Button>
+        </div>
+      </div>
+    </>
+  )
+}
diff --git a/src/components/RpcErrorModal/style.ts b/src/components/RpcErrorModal/style.ts
new file mode 100644
index 00000000..b5da28a4
--- /dev/null
+++ b/src/components/RpcErrorModal/style.ts
@@ -0,0 +1,104 @@
+import { makeStyles } from 'tss-react/mui'
+import { colors, typography } from '@static/theme'
+
+const useStyles = makeStyles()(theme => ({
+  background: {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    zIndex: 51,
+    backdropFilter: 'blur(16px)'
+  },
+  container: {
+    position: 'absolute',
+    top: 300,
+    width: 480,
+    left: '50%',
+    transform: 'translate(-50%, -50%)',
+    backgroundColor: colors.invariant.component,
+    padding: 32,
+    borderRadius: 20,
+    color: colors.white.main,
+    zIndex: 52,
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+
+    [theme.breakpoints.down('sm')]: {
+      width: 'calc(100% - 96px)',
+      left: 16,
+      right: 16,
+      transform: 'none'
+    }
+  },
+  warningIcon: {
+    height: 48
+  },
+  title: {
+    ...typography.heading3,
+    marginTop: 16,
+    textAlign: 'center'
+  },
+  rpcText: {
+    color: colors.invariant.lightGrey,
+    fontWeight: 'normal'
+  },
+  currentRpcText: {
+    color: colors.invariant.lightGrey,
+    fontWeight: 'normal',
+    textAlign: 'center'
+  },
+  currentRpc: {
+    color: colors.white.main,
+    fontWeight: 'bold'
+  },
+  mainButton: {
+    width: 240,
+    height: 40,
+    color: colors.invariant.black,
+    ...typography.body1,
+    textTransform: 'none',
+    background: colors.invariant.pinkLinearGradientOpacity,
+    borderRadius: 14,
+
+    '&:hover': {
+      background: colors.invariant.pinkLinearGradient,
+      boxShadow: `0 0 16px ${colors.invariant.pink}`
+    }
+  },
+  otherButton: {
+    width: 240,
+    height: 40,
+    color: colors.white.main,
+    ...typography.body1,
+    textTransform: 'none',
+    background: colors.invariant.light,
+    borderRadius: 14,
+
+    '&:hover': {
+      background: colors.invariant.light,
+      boxShadow: `0 0 16px ${colors.invariant.light}`
+    }
+  },
+  buttonsContainer: {
+    marginTop: 16,
+    display: 'flex',
+    alignItems: 'center',
+    gap: 8,
+
+    [theme.breakpoints.down('sm')]: {
+      flexDirection: 'column'
+    }
+  },
+  textContainer: {
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    gap: 8,
+    marginTop: 16
+  }
+}))
+
+export default useStyles
diff --git a/src/components/Stats/PoolListItem/PoolListItem.tsx b/src/components/Stats/PoolListItem/PoolListItem.tsx
index 7ba91f26..7de09f0b 100644
--- a/src/components/Stats/PoolListItem/PoolListItem.tsx
+++ b/src/components/Stats/PoolListItem/PoolListItem.tsx
@@ -10,6 +10,7 @@ import icons from '@static/icons'
 import { SortTypePoolList } from '@store/consts/static'
 import { Network } from '@invariant-labs/a0-sdk'
 import { PERCENTAGE_SCALE } from '@invariant-labs/a0-sdk/target/consts'
+import { TooltipHover } from '@components/TooltipHover/TooltipHover'
 
 interface IProps {
   TVL?: number
@@ -139,12 +140,16 @@ const PoolListItem: React.FC<IProps> = ({
           <Typography>{`$${formatNumbers()(volume.toString())}${showPrefix(volume)}`}</Typography>
           <Typography>{`$${formatNumbers()(TVL.toString())}${showPrefix(TVL)}`}</Typography>
           <Box className={classes.action}>
-            <button className={classes.actionButton} onClick={handleOpenSwap}>
-              <img width={32} height={32} src={icons.horizontalSwapIcon} alt={'Exchange'} />
-            </button>
-            <button className={classes.actionButton} onClick={handleOpenPosition}>
-              <img width={32} height={32} src={icons.plusIcon} alt={'Open'} />
-            </button>
+            <TooltipHover text='Exchange'>
+              <button className={classes.actionButton} onClick={handleOpenSwap}>
+                <img width={32} height={32} src={icons.horizontalSwapIcon} alt={'Exchange'} />
+              </button>
+            </TooltipHover>
+            <TooltipHover text='Add position'>
+              <button className={classes.actionButton} onClick={handleOpenPosition}>
+                <img width={32} height={32} src={icons.plusIcon} alt={'Open'} />
+              </button>
+            </TooltipHover>
           </Box>
         </Grid>
       ) : (
diff --git a/src/containers/HeaderWrapper/HeaderWrapper.tsx b/src/containers/HeaderWrapper/HeaderWrapper.tsx
index 7b50e3d3..ea6bf67d 100644
--- a/src/containers/HeaderWrapper/HeaderWrapper.tsx
+++ b/src/containers/HeaderWrapper/HeaderWrapper.tsx
@@ -1,9 +1,9 @@
 import Header from '@components/Header/Header'
 import { Network } from '@invariant-labs/a0-sdk'
-import { RPC, CHAINS } from '@store/consts/static'
-import { actions } from '@store/reducers/connection'
+import { RPC, CHAINS, RECOMMENDED_RPC_ADDRESS } from '@store/consts/static'
+import { actions, RpcStatus } from '@store/reducers/connection'
 import { Status, actions as walletActions } from '@store/reducers/wallet'
-import { networkType, rpcAddress } from '@store/selectors/connection'
+import { networkType, rpcAddress, rpcStatus } from '@store/selectors/connection'
 import { address, status } from '@store/selectors/wallet'
 import { openWalletSelectorModal } from '@utils/web3/selector'
 import { getAlephZeroWallet } from '@utils/web3/wallet'
@@ -12,6 +12,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { useLocation, useNavigate } from 'react-router-dom'
 import { actions as snackbarsActions } from '@store/reducers/snackbars'
 import { Chain } from '@store/consts/types'
+import { RpcErrorModal } from '@components/RpcErrorModal/RpcErrorModal'
 
 export const HeaderWrapper: React.FC = () => {
   const dispatch = useDispatch()
@@ -63,63 +64,93 @@ export const HeaderWrapper: React.FC = () => {
 
   const activeChain = CHAINS.find(chain => chain.name === Chain.AlephZero) ?? CHAINS[0]
 
-  return (
-    <Header
-      address={walletAddress}
-      onNetworkSelect={(network, rpcAddress) => {
-        if (rpcAddress !== currentRpc) {
-          localStorage.setItem(`INVARIANT_RPC_AlephZero_${network}`, rpcAddress)
-          dispatch(actions.setRPCAddress(rpcAddress))
-        }
+  const currentRpcStatus = useSelector(rpcStatus)
 
-        if (network !== currentNetwork) {
-          if (location.pathname.startsWith('/exchange')) {
-            navigate('/exchange')
-          }
+  const useDefaultRpc = () => {
+    localStorage.setItem(
+      `INVARIANT_RPC_AlephZero_${currentNetwork}`,
+      RECOMMENDED_RPC_ADDRESS[currentNetwork]
+    )
+    dispatch(actions.setRPCAddress(RECOMMENDED_RPC_ADDRESS[currentNetwork]))
+    dispatch(actions.setRpcStatus(RpcStatus.Uninitialized))
+    localStorage.setItem('IS_RPC_WARNING_IGNORED', 'false')
+  }
 
-          if (location.pathname.startsWith('/newPosition')) {
-            navigate('/newPosition')
+  const useCurrentRpc = () => {
+    dispatch(actions.setRpcStatus(RpcStatus.IgnoredWithError))
+    localStorage.setItem('IS_RPC_WARNING_IGNORED', 'true')
+  }
+
+  return (
+    <>
+      {currentRpcStatus === RpcStatus.Error &&
+        currentRpc !== RECOMMENDED_RPC_ADDRESS[currentNetwork] && (
+          <RpcErrorModal
+            rpcAddress={currentRpc}
+            useDefaultRpc={useDefaultRpc}
+            useCurrentRpc={useCurrentRpc}
+          />
+        )}
+      <Header
+        address={walletAddress}
+        onNetworkSelect={(network, rpcAddress) => {
+          if (rpcAddress !== currentRpc) {
+            localStorage.setItem(`INVARIANT_RPC_AlephZero_${network}`, rpcAddress)
+            dispatch(actions.setRPCAddress(rpcAddress))
+            dispatch(actions.setRpcStatus(RpcStatus.Uninitialized))
+            localStorage.setItem('IS_RPC_WARNING_IGNORED', 'false')
           }
 
-          dispatch(actions.setNetwork(network))
-        }
-      }}
-      onConnectWallet={async () => {
-        await openWalletSelectorModal()
-        dispatch(walletActions.connect(false))
-      }}
-      landing={location.pathname.substring(1)}
-      walletConnected={walletStatus === Status.Initialized}
-      onDisconnectWallet={() => {
-        dispatch(walletActions.disconnect())
-      }}
-      onFaucet={() => dispatch(walletActions.airdrop())}
-      typeOfNetwork={currentNetwork}
-      rpc={currentRpc}
-      defaultTestnetRPC={defaultTestnetRPC}
-      onCopyAddress={() => {
-        navigator.clipboard.writeText(walletAddress)
-
-        dispatch(
-          snackbarsActions.add({
-            message: 'Wallet address copied.',
-            variant: 'success',
-            persist: false
-          })
-        )
-      }}
-      onChangeWallet={() => {
-        dispatch(walletActions.reconnect())
-      }}
-      activeChain={activeChain}
-      onChainSelect={chain => {
-        if (chain.name !== activeChain.name) {
-          window.location.replace(chain.address)
-        }
-      }}
-      network={currentNetwork}
-      defaultMainnetRPC={defaultMainnetRPC}
-    />
+          if (network !== currentNetwork) {
+            if (location.pathname.startsWith('/exchange')) {
+              navigate('/exchange')
+            }
+
+            if (location.pathname.startsWith('/newPosition')) {
+              navigate('/newPosition')
+            }
+
+            dispatch(actions.setNetwork(network))
+          }
+        }}
+        onConnectWallet={async () => {
+          await openWalletSelectorModal()
+          dispatch(walletActions.connect(false))
+        }}
+        landing={location.pathname.substring(1)}
+        walletConnected={walletStatus === Status.Initialized}
+        onDisconnectWallet={() => {
+          dispatch(walletActions.disconnect())
+        }}
+        onFaucet={() => dispatch(walletActions.airdrop())}
+        typeOfNetwork={currentNetwork}
+        rpc={currentRpc}
+        defaultTestnetRPC={defaultTestnetRPC}
+        onCopyAddress={() => {
+          navigator.clipboard.writeText(walletAddress)
+
+          dispatch(
+            snackbarsActions.add({
+              message: 'Wallet address copied.',
+              variant: 'success',
+              persist: false
+            })
+          )
+        }}
+        onChangeWallet={() => {
+          dispatch(walletActions.reconnect())
+        }}
+        activeChain={activeChain}
+        onChainSelect={chain => {
+          if (chain.name !== activeChain.name) {
+            window.location.replace(chain.address)
+          }
+        }}
+        network={currentNetwork}
+        defaultMainnetRPC={defaultMainnetRPC}
+        rpcStatus={currentRpcStatus}
+      />
+    </>
   )
 }
 
diff --git a/src/containers/NewPositionWrapper/NewPositionWrapper.tsx b/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
index e82f7e71..46c803be 100644
--- a/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
+++ b/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
@@ -30,7 +30,7 @@ import {
 import { actions as poolsActions } from '@store/reducers/pools'
 import { actions, InitMidPrice, actions as positionsActions } from '@store/reducers/positions'
 import { actions as snackbarsActions } from '@store/reducers/snackbars'
-import { Status, actions as walletActions } from '@store/reducers/wallet'
+import { actions as walletActions } from '@store/reducers/wallet'
 import { networkType } from '@store/selectors/connection'
 import {
   isLoadingLatestPoolsForTransaction,
@@ -656,14 +656,6 @@ export const NewPositionWrapper: React.FC<IProps> = ({
           })
         )
       }}
-      showNoConnected={walletStatus !== Status.Initialized}
-      noConnectedBlockerProps={{
-        onConnect: async () => {
-          await openWalletSelectorModal()
-          dispatch(walletActions.connect(false))
-        },
-        descCustomText: 'Cannot add any liquidity.'
-      }}
       poolKey={poolKey}
       onRefresh={onRefresh}
       isBalanceLoading={isBalanceLoading}
@@ -675,6 +667,14 @@ export const NewPositionWrapper: React.FC<IProps> = ({
       network={network}
       isLoadingTokens={isCurrentlyLoadingTokens}
       azeroBalance={azeroBalance}
+      walletStatus={walletStatus}
+      onConnectWallet={async () => {
+        await openWalletSelectorModal()
+        dispatch(walletActions.connect(false))
+      }}
+      onDisconnectWallet={() => {
+        dispatch(walletActions.disconnect())
+      }}
     />
   )
 }
diff --git a/src/containers/WrappedPositionsList/WrappedPositionsList.tsx b/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
index 91853bfb..dc976686 100644
--- a/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
+++ b/src/containers/WrappedPositionsList/WrappedPositionsList.tsx
@@ -1,5 +1,5 @@
 import { PositionsList } from '@components/PositionsList/PositionsList'
-import { calculateTokenAmounts, Network } from '@invariant-labs/a0-sdk'
+import { calculateTokenAmounts, getMaxTick, getMinTick, Network } from '@invariant-labs/a0-sdk'
 import { PERCENTAGE_SCALE } from '@invariant-labs/a0-sdk/target/consts'
 import { POSITIONS_PER_PAGE } from '@store/consts/static'
 import {
@@ -79,6 +79,8 @@ export const WrappedPositionsList: React.FC = () => {
           position.tokenY.decimals
         )
       )
+      const minTick = getMinTick(position.poolKey.feeTier.tickSpacing)
+      const maxTick = getMaxTick(position.poolKey.feeTier.tickSpacing)
 
       const min = Math.min(lowerPrice, upperPrice)
       const max = Math.max(lowerPrice, upperPrice)
@@ -131,7 +133,8 @@ export const WrappedPositionsList: React.FC = () => {
         currentPrice,
         tokenXLiq,
         tokenYLiq,
-        network: Network.Testnet
+        network: Network.Testnet,
+        isFullRange: position.lowerTickIndex === minTick && position.upperTickIndex === maxTick
       }
     })
     .filter(item => {
diff --git a/src/containers/WrappedSwap/WrappedSwap.tsx b/src/containers/WrappedSwap/WrappedSwap.tsx
index a9fd1295..1b02f4e9 100644
--- a/src/containers/WrappedSwap/WrappedSwap.tsx
+++ b/src/containers/WrappedSwap/WrappedSwap.tsx
@@ -12,7 +12,7 @@ import {
 import { actions as poolsActions } from '@store/reducers/pools'
 import { actions as snackbarsActions } from '@store/reducers/snackbars'
 import { Simulate, actions } from '@store/reducers/swap'
-import { actions as walletActions } from '@store/reducers/wallet'
+import { Status, actions as walletActions } from '@store/reducers/wallet'
 import { networkType } from '@store/selectors/connection'
 import {
   isLoadingLatestPoolsForTransaction,
@@ -215,7 +215,9 @@ export const WrappedSwap = ({ initialTokenFrom, initialTokenTo }: Props) => {
       return
     }
 
-    dispatch(walletActions.getBalances([tokenFromAddress, tokenToAddress]))
+    if (walletStatus === Status.Initialized) {
+      dispatch(walletActions.getBalances([tokenFromAddress, tokenToAddress]))
+    }
 
     dispatch(
       poolsActions.getAllPoolsForPairData({
diff --git a/src/fetchMainnetList.js b/src/fetchMainnetList.js
new file mode 100644
index 00000000..7dd673ce
--- /dev/null
+++ b/src/fetchMainnetList.js
@@ -0,0 +1,22 @@
+import fs from 'fs'
+import axios from 'axios'
+
+const run = async () => {
+  const tokensObject = (await axios.get('https://api.psplist.xyz/tokens')).data
+
+  const tokensList = {}
+  tokensObject.forEach(({ symbol, contractAddress, decimals, name, logoURI, description }) => {
+    tokensList[contractAddress] = {
+      symbol,
+      address: contractAddress,
+      decimals,
+      name,
+      logoURI: `https://api.psplist.xyz/tokens/${contractAddress}/logo`
+    }
+  })
+
+  fs.writeFileSync('./src/store/consts/tokenLists/mainnet.json', JSON.stringify(tokensList))
+  console.log('Tokens list updated!')
+}
+
+run()
diff --git a/src/static/icons.ts b/src/static/icons.ts
index 30b64cff..b66a7c3b 100644
--- a/src/static/icons.ts
+++ b/src/static/icons.ts
@@ -30,6 +30,7 @@ import a0Logo from './svg/a0Logo.svg'
 import eclipseLogo from './svg/eclipseLogo.svg'
 import solanaLogo from './svg/solanaLogo.svg'
 import varaLogo from './svg/VaraLogo.svg'
+import warningIcon from './svg/Warning.svg'
 
 const icons: { [key: string]: string } = {
   clear: clearIcon,
@@ -63,7 +64,8 @@ const icons: { [key: string]: string } = {
   AlephZero: a0Logo,
   Eclipse: eclipseLogo,
   Solana: solanaLogo,
-  Vara: varaLogo
+  Vara: varaLogo,
+  warningIcon
 }
 
 export default icons
diff --git a/src/static/svg/Warning.svg b/src/static/svg/Warning.svg
new file mode 100644
index 00000000..da4ff36f
--- /dev/null
+++ b/src/static/svg/Warning.svg
@@ -0,0 +1,3 @@
+<svg width="28" height="23" viewBox="0 0 28 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.25 22.125H27.75L14 0.75L0.25 22.125ZM15.25 18.75H12.75V16.5H15.25V18.75ZM15.25 14.25H12.75V9.75H15.25V14.25Z" fill="#EFD063"/>
+</svg>
\ No newline at end of file
diff --git a/src/store/consts/static.ts b/src/store/consts/static.ts
index be436a0a..bdcc0752 100644
--- a/src/store/consts/static.ts
+++ b/src/store/consts/static.ts
@@ -2,10 +2,10 @@ import {
   FEE_TIERS,
   Network,
   Position,
-  BTC_ADDRESS,
-  ETH_ADDRESS,
-  USDC_ADDRESS,
-  WAZERO_ADDRESS
+  BTC_ADDRESS as BTC_ADDRESS_SDK,
+  ETH_ADDRESS as ETH_ADDRESS_SDK,
+  USDC_ADDRESS as USDC_ADDRESS_SDK,
+  WAZERO_ADDRESS as WAZERO_ADDRESS_SDK
 } from '@invariant-labs/a0-sdk'
 import { Keyring } from '@polkadot/api'
 import {
@@ -18,6 +18,26 @@ import {
 } from './types'
 import { bestTiersCreator } from '@utils/utils'
 import { POSITIONS_ENTRIES_LIMIT } from '@invariant-labs/a0-sdk/target/consts'
+import mainnetListJson from '@store/consts/tokenLists/mainnet.json'
+
+export const WAZERO_ADDRESS = {
+  ...WAZERO_ADDRESS_SDK,
+  [Network.Mainnet]: '5CtuFVgEUz13SFPVY6s2cZrnLDEkxQXc19aXrNARwEBeCXgg'
+}
+
+export const BTC_ADDRESS = {
+  ...BTC_ADDRESS_SDK,
+  [Network.Mainnet]: '5EEtCdKLyyhQnNQWWWPM1fMDx1WdVuiaoR9cA6CWttgyxtuJ'
+}
+export const ETH_ADDRESS = {
+  ...ETH_ADDRESS_SDK,
+  [Network.Mainnet]: '5EoFQd36196Duo6fPTz2MWHXRzwTJcyETHyCyaB3rb61Xo2u'
+}
+export const USDC_ADDRESS = {
+  ...USDC_ADDRESS_SDK,
+  [Network.Mainnet]: '5FYFojNCJVFR2bBNKfAePZCa72ZcVX5yeTv8K9bzeUo8D83Z'
+}
+export const USDT_MAINNET_ADDRESS = '5Et3dDcXUiThrBCot7g65k3oDSicGy4qC82cq9f911izKNtE'
 
 export enum RPC {
   TEST = 'wss://ws.test.azero.dev',
@@ -94,45 +114,6 @@ export const TESTNET_AZERO: Token = {
   coingeckoId: 'aleph-zero'
 }
 
-export const MAINNET_BTC: Token = {
-  symbol: 'BTC',
-  address: BTC_ADDRESS[Network.Mainnet],
-  decimals: 8n,
-  name: 'Bitcoin',
-  logoURI:
-    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/9n4nbM75f5Ui33ZbPYXn59EwSgE8CGsHtAeTH5YFeJ9E/logo.png',
-  coingeckoId: 'bitcoin'
-}
-
-export const MAINNET_ETH: Token = {
-  symbol: 'ETH',
-  address: ETH_ADDRESS[Network.Mainnet],
-  decimals: 18n,
-  name: 'Ether',
-  logoURI:
-    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/2FPyTwcZLUg1MDrwsyoP4D6s1tM7hAkHYRjkNb5w6Pxk/logo.png',
-  coingeckoId: 'ethereum'
-}
-
-export const MAINNET_USDC: Token = {
-  symbol: 'USDC',
-  address: USDC_ADDRESS[Network.Mainnet],
-  decimals: 6n,
-  name: 'USDC',
-  logoURI:
-    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png',
-  coingeckoId: 'usd-coin'
-}
-
-export const MAINNET_AZERO: Token = {
-  symbol: 'AZERO',
-  address: WAZERO_ADDRESS[Network.Mainnet],
-  decimals: 12n,
-  name: 'Aleph Zero',
-  logoURI: 'https://assets.coingecko.com/coins/images/17212/standard/azero-logo_coingecko.png',
-  coingeckoId: 'aleph-zero'
-}
-
 export const DEFAULT_TOKENS = ['bitcoin', 'ethereum', 'usd-coin', 'aleph-zero']
 
 export const bestTiers: Record<Network, BestTier[]> = {
@@ -149,14 +130,47 @@ export const commonTokensForNetworks: Record<Network, string[]> = {
     TESTNET_AZERO.address
   ],
   [Network.Mainnet]: [
-    MAINNET_BTC.address,
-    MAINNET_ETH.address,
-    MAINNET_USDC.address,
-    MAINNET_AZERO.address
+    WAZERO_ADDRESS[Network.Mainnet],
+    BTC_ADDRESS[Network.Mainnet],
+    ETH_ADDRESS[Network.Mainnet],
+    USDC_ADDRESS[Network.Mainnet],
+    USDT_MAINNET_ADDRESS
   ],
   [Network.Local]: []
 }
 
+const commonTokensLogos = {
+  [BTC_ADDRESS[Network.Mainnet]]:
+    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/9n4nbM75f5Ui33ZbPYXn59EwSgE8CGsHtAeTH5YFeJ9E/logo.png',
+  [ETH_ADDRESS[Network.Mainnet]]:
+    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/2FPyTwcZLUg1MDrwsyoP4D6s1tM7hAkHYRjkNb5w6Pxk/logo.png',
+  [USDC_ADDRESS[Network.Mainnet]]:
+    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v/logo.png',
+  [WAZERO_ADDRESS[Network.Mainnet]]:
+    'https://assets.coingecko.com/coins/images/17212/standard/azero-logo_coingecko.png',
+  [USDT_MAINNET_ADDRESS]:
+    'https://raw.githubusercontent.com/solana-labs/token-list/main/assets/mainnet/Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB/logo.svg'
+}
+
+export const mainnetList = (() => {
+  const parsedMainnetList: Record<string, Token> = {}
+
+  const mainnetList = mainnetListJson as unknown as Record<string, Token>
+
+  Object.keys(mainnetList).forEach(token => {
+    if (commonTokensLogos[token]) {
+      parsedMainnetList[token] = {
+        ...mainnetList[token],
+        logoURI: commonTokensLogos[token]
+      }
+    } else {
+      parsedMainnetList[token] = mainnetList[token]
+    }
+  })
+
+  return parsedMainnetList
+})()
+
 export const DEFAULT_INVARIANT_OPTIONS = {
   storageDepositLimit: null,
   refTime: 100000000000,
@@ -303,11 +317,23 @@ export const defaultPrefixConfig: PrefixConfig = {
 }
 
 export const getAddressTickerMap = (network: Network): { [k: string]: string } => {
-  return {
-    BTC: BTC_ADDRESS[network],
-    ETH: ETH_ADDRESS[network],
-    USDC: USDC_ADDRESS[network],
-    AZERO: WAZERO_ADDRESS[network]
+  if (network !== Network.Mainnet) {
+    return {
+      BTC: BTC_ADDRESS[network],
+      ETH: ETH_ADDRESS[network],
+      USDC: USDC_ADDRESS[network],
+      AZERO: WAZERO_ADDRESS[network]
+    }
+  } else {
+    const parsedMainnetList = mainnetList as unknown as Record<string, Token>
+    const result: { [k: string]: string } = {}
+
+    Object.keys(parsedMainnetList).forEach((key: string) => {
+      const token = parsedMainnetList[key]
+      result[token.symbol] = token.address
+    })
+
+    return result
   }
 }
 
@@ -379,3 +405,9 @@ export const enum SortTypeTokenList {
   TVL_ASC,
   TVL_DESC
 }
+
+export const RECOMMENDED_RPC_ADDRESS = {
+  [Network.Testnet]: RPC.TEST,
+  [Network.Mainnet]: RPC.MAIN,
+  [Network.Local]: ''
+}
diff --git a/src/store/consts/tokenLists/mainnet.json b/src/store/consts/tokenLists/mainnet.json
new file mode 100644
index 00000000..52b1d3b7
--- /dev/null
+++ b/src/store/consts/tokenLists/mainnet.json
@@ -0,0 +1 @@
+{"5CtuFVgEUz13SFPVY6s2cZrnLDEkxQXc19aXrNARwEBeCXgg":{"symbol":"wAZERO","address":"5CtuFVgEUz13SFPVY6s2cZrnLDEkxQXc19aXrNARwEBeCXgg","decimals":12,"name":"Wrapped AZERO","logoURI":"https://api.psplist.xyz/tokens/5CtuFVgEUz13SFPVY6s2cZrnLDEkxQXc19aXrNARwEBeCXgg/logo"},"5DCPp7odM3MTkQEH4X1gFwvA64nfEpxfmxZtSPjaSW1rPJjM":{"symbol":"balda","address":"5DCPp7odM3MTkQEH4X1gFwvA64nfEpxfmxZtSPjaSW1rPJjM","decimals":12,"name":"baldawifhat","logoURI":"https://api.psplist.xyz/tokens/5DCPp7odM3MTkQEH4X1gFwvA64nfEpxfmxZtSPjaSW1rPJjM/logo"},"5DYVFYzBTG8EMWpWQUcZM74nS9PBUnmC8fkCHe9eRZtEQKtQ":{"symbol":"LOL","address":"5DYVFYzBTG8EMWpWQUcZM74nS9PBUnmC8fkCHe9eRZtEQKtQ","decimals":12,"name":"projektlol","logoURI":"https://api.psplist.xyz/tokens/5DYVFYzBTG8EMWpWQUcZM74nS9PBUnmC8fkCHe9eRZtEQKtQ/logo"},"5E4QGU8jyYkDTfMXNVojadP6miQLbx8cnPZq4zMdc4WmsNA8":{"symbol":"ARC","address":"5E4QGU8jyYkDTfMXNVojadP6miQLbx8cnPZq4zMdc4WmsNA8","decimals":12,"name":"ARCANA","logoURI":"https://api.psplist.xyz/tokens/5E4QGU8jyYkDTfMXNVojadP6miQLbx8cnPZq4zMdc4WmsNA8/logo"},"5EA7h2xCP9TkAwEQ8Km2b7aQChPKVCqcS2BJWqYavoXiEsfx":{"symbol":"INW2","address":"5EA7h2xCP9TkAwEQ8Km2b7aQChPKVCqcS2BJWqYavoXiEsfx","decimals":12,"name":"Ink Whale Token V2","logoURI":"https://api.psplist.xyz/tokens/5EA7h2xCP9TkAwEQ8Km2b7aQChPKVCqcS2BJWqYavoXiEsfx/logo"},"5EEtCdKLyyhQnNQWWWPM1fMDx1WdVuiaoR9cA6CWttgyxtuJ":{"symbol":"WBTC","address":"5EEtCdKLyyhQnNQWWWPM1fMDx1WdVuiaoR9cA6CWttgyxtuJ","decimals":8,"name":"Wrapped BTC","logoURI":"https://api.psplist.xyz/tokens/5EEtCdKLyyhQnNQWWWPM1fMDx1WdVuiaoR9cA6CWttgyxtuJ/logo"},"5ESKJbkpVa1ppUCmrkCmaZDHqm9SHihws9Uqqsoi4VrDCDLE":{"symbol":"ZPF","address":"5ESKJbkpVa1ppUCmrkCmaZDHqm9SHihws9Uqqsoi4VrDCDLE","decimals":12,"name":"ZPF Token","logoURI":"https://api.psplist.xyz/tokens/5ESKJbkpVa1ppUCmrkCmaZDHqm9SHihws9Uqqsoi4VrDCDLE/logo"},"5EoFQd36196Duo6fPTz2MWHXRzwTJcyETHyCyaB3rb61Xo2u":{"symbol":"WETH","address":"5EoFQd36196Duo6fPTz2MWHXRzwTJcyETHyCyaB3rb61Xo2u","decimals":18,"name":"Wrapped Ether","logoURI":"https://api.psplist.xyz/tokens/5EoFQd36196Duo6fPTz2MWHXRzwTJcyETHyCyaB3rb61Xo2u/logo"},"5Et3dDcXUiThrBCot7g65k3oDSicGy4qC82cq9f911izKNtE":{"symbol":"USDT","address":"5Et3dDcXUiThrBCot7g65k3oDSicGy4qC82cq9f911izKNtE","decimals":6,"name":"Tether USD","logoURI":"https://api.psplist.xyz/tokens/5Et3dDcXUiThrBCot7g65k3oDSicGy4qC82cq9f911izKNtE/logo"},"5F9aiiwLMPC6fFxxwqHvJpm7h5T4Xm93mJT6cpDrQnKkLFoK":{"symbol":"SHIT","address":"5F9aiiwLMPC6fFxxwqHvJpm7h5T4Xm93mJT6cpDrQnKkLFoK","decimals":12,"name":"Mr Hankey","logoURI":"https://api.psplist.xyz/tokens/5F9aiiwLMPC6fFxxwqHvJpm7h5T4Xm93mJT6cpDrQnKkLFoK/logo"},"5FYFojNCJVFR2bBNKfAePZCa72ZcVX5yeTv8K9bzeUo8D83Z":{"symbol":"USDC","address":"5FYFojNCJVFR2bBNKfAePZCa72ZcVX5yeTv8K9bzeUo8D83Z","decimals":18,"name":"USD Coin","logoURI":"https://api.psplist.xyz/tokens/5FYFojNCJVFR2bBNKfAePZCa72ZcVX5yeTv8K9bzeUo8D83Z/logo"},"5FmiAwHBR9buMwUhSC4Mhj6WqnLVaYeyyXjjJYyfNwKnYhBN":{"symbol":"VIB3","address":"5FmiAwHBR9buMwUhSC4Mhj6WqnLVaYeyyXjjJYyfNwKnYhBN","decimals":12,"name":"VIB3S","logoURI":"https://api.psplist.xyz/tokens/5FmiAwHBR9buMwUhSC4Mhj6WqnLVaYeyyXjjJYyfNwKnYhBN/logo"},"5FvomNiEifvrS8vmMmDspGKaXUpgeeJnXzqXrLXoyYVpVQbh":{"symbol":"CMON","address":"5FvomNiEifvrS8vmMmDspGKaXUpgeeJnXzqXrLXoyYVpVQbh","decimals":12,"name":"Common","logoURI":"https://api.psplist.xyz/tokens/5FvomNiEifvrS8vmMmDspGKaXUpgeeJnXzqXrLXoyYVpVQbh/logo"},"5G1LVy9K5uapJE9uzG1NbMN4bTKJEyKLMtKGAtqdgbLDegNF":{"symbol":"SC","address":"5G1LVy9K5uapJE9uzG1NbMN4bTKJEyKLMtKGAtqdgbLDegNF","decimals":12,"name":"Staking Capital","logoURI":"https://api.psplist.xyz/tokens/5G1LVy9K5uapJE9uzG1NbMN4bTKJEyKLMtKGAtqdgbLDegNF/logo"},"5GCubYQbm9x6TQbthbWpUVrgEibXMDXhgisw8DFYCpPJQ5f7":{"symbol":"IOU","address":"5GCubYQbm9x6TQbthbWpUVrgEibXMDXhgisw8DFYCpPJQ5f7","decimals":12,"name":"I Owe You","logoURI":"https://api.psplist.xyz/tokens/5GCubYQbm9x6TQbthbWpUVrgEibXMDXhgisw8DFYCpPJQ5f7/logo"},"5GVjxVdUMr5dQX9TSvvwWq42jyRaXLN65MDh4A8jhdG4Rz1A":{"symbol":"KEBAB","address":"5GVjxVdUMr5dQX9TSvvwWq42jyRaXLN65MDh4A8jhdG4Rz1A","decimals":12,"name":"Azero Kebab","logoURI":"https://api.psplist.xyz/tokens/5GVjxVdUMr5dQX9TSvvwWq42jyRaXLN65MDh4A8jhdG4Rz1A/logo"},"5GcAeGeAep1PeQA176XYcFMQn8Cc2waVLrsmGX3ruCbKNbR8":{"symbol":"BALD","address":"5GcAeGeAep1PeQA176XYcFMQn8Cc2waVLrsmGX3ruCbKNbR8","decimals":12,"name":"BALD GUY COIN","logoURI":"https://api.psplist.xyz/tokens/5GcAeGeAep1PeQA176XYcFMQn8Cc2waVLrsmGX3ruCbKNbR8/logo"},"5Gpj9qiRheTZSmBz8wZYmrvrY9UjzqYWc6PVedLTBJhy63Db":{"symbol":"SEBY","address":"5Gpj9qiRheTZSmBz8wZYmrvrY9UjzqYWc6PVedLTBJhy63Db","decimals":12,"name":"Secret Service Bunnys","logoURI":"https://api.psplist.xyz/tokens/5Gpj9qiRheTZSmBz8wZYmrvrY9UjzqYWc6PVedLTBJhy63Db/logo"},"5HZxA385SYeydqZUpTeKj7D37T1bL9N6JA7Xde5QMP8qiSym":{"symbol":"NUKO","address":"5HZxA385SYeydqZUpTeKj7D37T1bL9N6JA7Xde5QMP8qiSym","decimals":12,"name":"Cats are Liquid","logoURI":"https://api.psplist.xyz/tokens/5HZxA385SYeydqZUpTeKj7D37T1bL9N6JA7Xde5QMP8qiSym/logo"},"5HjLPBcfjxYByU66TbE66jUQaZ7Tv2XwekFWRVCW4sJjKcXc":{"symbol":"BOBR","address":"5HjLPBcfjxYByU66TbE66jUQaZ7Tv2XwekFWRVCW4sJjKcXc","decimals":12,"name":"BOBR KURWA","logoURI":"https://api.psplist.xyz/tokens/5HjLPBcfjxYByU66TbE66jUQaZ7Tv2XwekFWRVCW4sJjKcXc/logo"}}
\ No newline at end of file
diff --git a/src/store/reducers/connection.ts b/src/store/reducers/connection.ts
index 266fa7f8..f986fb19 100644
--- a/src/store/reducers/connection.ts
+++ b/src/store/reducers/connection.ts
@@ -1,6 +1,6 @@
-import { Network, INVARIANT_ADDRESS, WAZERO_ADDRESS } from '@invariant-labs/a0-sdk'
+import { Network, INVARIANT_ADDRESS } from '@invariant-labs/a0-sdk'
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
-import { RPC } from '@store/consts/static'
+import { RPC, WAZERO_ADDRESS } from '@store/consts/static'
 import { PayloadType } from '@store/consts/types'
 
 export enum Status {
@@ -9,6 +9,19 @@ export enum Status {
   Error = 'error',
   Initialized = 'initalized'
 }
+
+export enum RpcStatus {
+  Uninitialized,
+  Error,
+  Ignored,
+  IgnoredWithError
+}
+
+const RPC_STATUS =
+  localStorage.getItem('IS_RPC_WARNING_IGNORED') === 'true'
+    ? RpcStatus.Ignored
+    : RpcStatus.Uninitialized
+
 export interface IAlephZeroConnectionStore {
   status: Status
   message: string
@@ -17,6 +30,7 @@ export interface IAlephZeroConnectionStore {
   rpcAddress: string
   invariantAddress: string
   wrappedAZEROAddress: string
+  rpcStatus: RpcStatus
 }
 
 const network =
@@ -30,7 +44,8 @@ export const defaultState: IAlephZeroConnectionStore = {
   blockNumber: 0,
   rpcAddress: localStorage.getItem(`INVARIANT_RPC_AlephZero_${network}`) ?? RPC.TEST,
   invariantAddress: INVARIANT_ADDRESS[network],
-  wrappedAZEROAddress: WAZERO_ADDRESS[network]
+  wrappedAZEROAddress: WAZERO_ADDRESS[network],
+  rpcStatus: RPC_STATUS
 }
 export const connectionSliceName = 'connection'
 const connectionSlice = createSlice({
@@ -65,6 +80,13 @@ const connectionSlice = createSlice({
     setRPCAddress(state, action: PayloadAction<string>) {
       state.rpcAddress = action.payload
       return state
+    },
+    setRpcStatus(state, action: PayloadAction<RpcStatus>) {
+      state.rpcStatus = action.payload
+      return state
+    },
+    handleRpcError(state, _action: PayloadAction) {
+      return state
     }
   }
 })
diff --git a/src/store/reducers/pools.ts b/src/store/reducers/pools.ts
index 5f9ab6c7..b0333bfc 100644
--- a/src/store/reducers/pools.ts
+++ b/src/store/reducers/pools.ts
@@ -1,26 +1,22 @@
 import {
-  BTC_ADDRESS,
-  ETH_ADDRESS,
   FeeTier,
   LiquidityTick,
   Network,
   Pool,
   PoolKey,
   Tick,
-  Tickmap,
-  USDC_ADDRESS,
-  WAZERO_ADDRESS
+  Tickmap
 } from '@invariant-labs/a0-sdk'
 import { PayloadAction, createSlice } from '@reduxjs/toolkit'
 import {
-  MAINNET_AZERO,
-  MAINNET_BTC,
-  MAINNET_ETH,
-  MAINNET_USDC,
+  BTC_ADDRESS,
+  ETH_ADDRESS,
   TESTNET_AZERO,
   TESTNET_BTC,
   TESTNET_ETH,
-  TESTNET_USDC
+  TESTNET_USDC,
+  USDC_ADDRESS,
+  WAZERO_ADDRESS
 } from '@store/consts/static'
 import { PayloadType, Token } from '@store/consts/types'
 import { poolKeyToString } from '@utils/utils'
@@ -90,12 +86,7 @@ const network =
 export const defaultState: IPoolsStore = {
   tokens:
     network === Network.Mainnet
-      ? {
-          [BTC_ADDRESS[Network.Mainnet]]: MAINNET_BTC,
-          [ETH_ADDRESS[Network.Mainnet]]: MAINNET_ETH,
-          [USDC_ADDRESS[Network.Mainnet]]: MAINNET_USDC,
-          [WAZERO_ADDRESS[Network.Mainnet]]: MAINNET_AZERO
-        }
+      ? {}
       : {
           [BTC_ADDRESS[Network.Testnet]]: TESTNET_BTC,
           [ETH_ADDRESS[Network.Testnet]]: TESTNET_ETH,
diff --git a/src/store/sagas/connection.ts b/src/store/sagas/connection.ts
index 3e76ec44..6289ef3b 100644
--- a/src/store/sagas/connection.ts
+++ b/src/store/sagas/connection.ts
@@ -1,11 +1,12 @@
 import { all, call, put, SagaGenerator, select, takeLeading, spawn } from 'typed-redux-saga'
-import { actions, Status } from '@store/reducers/connection'
+import { actions, RpcStatus, Status } from '@store/reducers/connection'
 import { actions as snackbarsActions } from '@store/reducers/snackbars'
 import {
   rpcAddress,
   networkType,
   invariantAddress,
-  wrappedAZEROAddress
+  wrappedAZEROAddress,
+  rpcStatus
 } from '@store/selectors/connection'
 import { PayloadAction } from '@reduxjs/toolkit'
 import { ApiPromise } from '@polkadot/api'
@@ -15,6 +16,16 @@ import { Invariant, Network, PSP22, WrappedAZERO } from '@invariant-labs/a0-sdk'
 import SingletonPSP22 from '@store/services/psp22Singleton'
 import SingletonWrappedAZERO from '@store/services/wrappedAZEROSingleton'
 
+export function* handleRpcError(_action: PayloadAction): Generator {
+  const currentRpcStatus = yield* select(rpcStatus)
+
+  if (currentRpcStatus === RpcStatus.Uninitialized) {
+    yield* put(actions.setRpcStatus(RpcStatus.Error))
+  } else if (currentRpcStatus === RpcStatus.Ignored) {
+    yield* put(actions.setRpcStatus(RpcStatus.IgnoredWithError))
+  }
+}
+
 export function* getApi(): SagaGenerator<ApiPromise> {
   let api = yield* call([apiSingleton, apiSingleton.getInstance])
 
@@ -120,6 +131,11 @@ export function* networkChangeSaga(): Generator {
 export function* initConnectionSaga(): Generator {
   yield takeLeading(actions.initAlephZeroConnection, initConnection)
 }
+
+export function* handleRpcErrorSaga(): Generator {
+  yield takeLeading(actions.handleRpcError, handleRpcError)
+}
+
 export function* connectionSaga(): Generator {
-  yield* all([networkChangeSaga, initConnectionSaga].map(spawn))
+  yield* all([networkChangeSaga, initConnectionSaga, handleRpcErrorSaga].map(spawn))
 }
diff --git a/src/store/sagas/wallet.ts b/src/store/sagas/wallet.ts
index d8c63723..eb0c6599 100644
--- a/src/store/sagas/wallet.ts
+++ b/src/store/sagas/wallet.ts
@@ -262,6 +262,10 @@ export function* fetchBalances(tokens: string[]): Generator {
   const walletAddress = yield* select(address)
   const psp22 = yield* getPSP22()
 
+  if (!walletAddress) {
+    return
+  }
+
   yield* put(walletActions.setIsBalanceLoading(true))
 
   const { balance, tokenBalances } = yield* all({
diff --git a/src/store/selectors/connection.ts b/src/store/selectors/connection.ts
index 3f2d80da..e0c3e7e4 100644
--- a/src/store/selectors/connection.ts
+++ b/src/store/selectors/connection.ts
@@ -9,14 +9,16 @@ export const {
   blockNumber,
   rpcAddress,
   invariantAddress,
-  wrappedAZEROAddress
+  wrappedAZEROAddress,
+  rpcStatus
 } = keySelectors(store, [
   'networkType',
   'status',
   'blockNumber',
   'rpcAddress',
   'invariantAddress',
-  'wrappedAZEROAddress'
+  'wrappedAZEROAddress',
+  'rpcStatus'
 ])
 
 export const alephZeroConnectionSelectors = {
@@ -25,7 +27,8 @@ export const alephZeroConnectionSelectors = {
   blockNumber,
   rpcAddress,
   invariantAddress,
-  wrappedAZEROAddress
+  wrappedAZEROAddress,
+  rpcStatus
 }
 
 export default alephZeroConnectionSelectors
diff --git a/src/store/services/apiSingleton.ts b/src/store/services/apiSingleton.ts
index e7c67ebf..e54a2153 100644
--- a/src/store/services/apiSingleton.ts
+++ b/src/store/services/apiSingleton.ts
@@ -1,5 +1,8 @@
-import { Network, initPolkadotApi } from '@invariant-labs/a0-sdk'
-import { ApiPromise } from '@polkadot/api'
+import { Network } from '@invariant-labs/a0-sdk'
+import { ApiPromise, WsProvider } from '@polkadot/api'
+import { actions as connectionActions } from '@store/reducers/connection'
+import { store } from '..'
+import { RECOMMENDED_RPC_ADDRESS } from '@store/consts/static'
 
 class SingletonApi {
   static api: ApiPromise | null = null
@@ -21,4 +24,22 @@ class SingletonApi {
   }
 }
 
+const initPolkadotApi = async (network: Network, ws?: string): Promise<ApiPromise> => {
+  const wsProvider = new WsProvider(ws ?? RECOMMENDED_RPC_ADDRESS[network], false)
+
+  const unsubscribe = wsProvider.on('error', () => {
+    store.dispatch(connectionActions.handleRpcError())
+  })
+
+  try {
+    await wsProvider.connect()
+  } catch (e) {
+    unsubscribe()
+  }
+
+  const api = await ApiPromise.create({ provider: wsProvider })
+  await api.isReady
+  return api
+}
+
 export default SingletonApi
diff --git a/src/store/services/wrappedAZEROSingleton.ts b/src/store/services/wrappedAZEROSingleton.ts
index 854e7e6f..ac72daa4 100644
--- a/src/store/services/wrappedAZEROSingleton.ts
+++ b/src/store/services/wrappedAZEROSingleton.ts
@@ -1,6 +1,6 @@
-import { Network, WAZERO_ADDRESS, WrappedAZERO } from '@invariant-labs/a0-sdk'
+import { Network, WrappedAZERO } from '@invariant-labs/a0-sdk'
 import { ApiPromise } from '@polkadot/api'
-import { DEFAULT_WAZERO_OPTIONS } from '@store/consts/static'
+import { DEFAULT_WAZERO_OPTIONS, WAZERO_ADDRESS } from '@store/consts/static'
 
 class SingletonWrappedAZERO {
   static wrappedAZERO: WrappedAZERO | null = null
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index ed5ad082..f0c63b19 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -19,11 +19,7 @@ import {
   PERCENTAGE_DENOMINATOR,
   PERCENTAGE_SCALE,
   PRICE_SCALE,
-  SQRT_PRICE_SCALE,
-  BTC_ADDRESS,
-  ETH_ADDRESS,
-  USDC_ADDRESS,
-  WAZERO_ADDRESS
+  SQRT_PRICE_SCALE
 } from '@invariant-labs/a0-sdk/target/consts'
 import {
   calculateLiquidityBreakpoints,
@@ -53,9 +49,11 @@ import {
   TESTNET_USDC,
   TESTNET_BTC,
   TESTNET_ETH,
-  MAINNET_USDC,
-  MAINNET_BTC,
-  MAINNET_ETH
+  mainnetList,
+  USDC_ADDRESS,
+  BTC_ADDRESS,
+  ETH_ADDRESS,
+  WAZERO_ADDRESS
 } from '@store/consts/static'
 import { sleep } from '@store/sagas/wallet'
 import {
@@ -367,6 +365,14 @@ export const getTokenDataByAddresses = async (
   psp22: PSP22,
   address: string
 ): Promise<Record<string, Token>> => {
+  const knownTokens: Record<string, Token> = {}
+
+  tokens.forEach(token => {
+    if (mainnetList[token]) {
+      knownTokens[token] = mainnetList[token]
+    }
+  })
+
   const promises = tokens.flatMap(token => {
     return [
       psp22.tokenSymbol(token),
@@ -379,6 +385,9 @@ export const getTokenDataByAddresses = async (
 
   const newTokens: Record<string, Token> = {}
   tokens.forEach((token, index) => {
+    if (knownTokens[token]) {
+      return
+    }
     const baseIndex = index * 4
     newTokens[token] = {
       symbol: results[baseIndex] ? (results[baseIndex] as string) : 'UNKNOWN',
@@ -390,7 +399,7 @@ export const getTokenDataByAddresses = async (
       isUnknown: true
     }
   })
-  return newTokens
+  return { ...knownTokens, ...newTokens }
 }
 
 export const getTokenBalances = async (
@@ -440,13 +449,8 @@ export const poolKeyToString = (poolKey: PoolKey): string => {
 
 export const getNetworkTokensList = (networkType: Network): Record<string, Token> => {
   switch (networkType) {
-    case Network.Mainnet: {
-      return {
-        [MAINNET_USDC.address.toString()]: MAINNET_USDC,
-        [MAINNET_BTC.address.toString()]: MAINNET_BTC,
-        [MAINNET_ETH.address.toString()]: MAINNET_ETH
-      }
-    }
+    case Network.Mainnet:
+      return mainnetList
     case Network.Testnet:
       return {
         [TESTNET_USDC.address.toString()]: TESTNET_USDC,
@@ -884,7 +888,6 @@ export const createLiquidityPlot = (
 
   return isXtoY ? ticksData : ticksData.reverse()
 }
-
 export const formatNumber = (
   number: number | bigint | string,
   noDecimals?: boolean,
@@ -892,7 +895,14 @@ export const formatNumber = (
 ): string => {
   const numberAsNumber = Number(number)
   const isNegative = numberAsNumber < 0
-  const absNumberAsString = numberToString(Math.abs(numberAsNumber))
+  const absNumberAsNumber = Math.abs(numberAsNumber)
+
+  if (absNumberAsNumber.toString().includes('e')) {
+    const exponential = absNumberAsNumber.toExponential(decimalsAfterDot)
+    return isNegative ? `-${exponential}` : exponential
+  }
+
+  const absNumberAsString = numberToString(absNumberAsNumber)
 
   if (containsOnlyZeroes(absNumberAsString)) {
     return '0'
@@ -902,7 +912,7 @@ export const formatNumber = (
 
   let formattedNumber
 
-  if (Math.abs(numberAsNumber) > FormatConfig.B) {
+  if (Math.abs(numberAsNumber) >= FormatConfig.B) {
     const formattedDecimals = noDecimals
       ? ''
       : (FormatConfig.DecimalsAfterDot ? '.' : '') +
@@ -910,9 +920,10 @@ export const formatNumber = (
           0,
           FormatConfig.DecimalsAfterDot
         )
+
     formattedNumber =
       beforeDot.slice(0, -FormatConfig.BDecimals) + (noDecimals ? '' : formattedDecimals) + 'B'
-  } else if (Math.abs(numberAsNumber) > FormatConfig.M) {
+  } else if (Math.abs(numberAsNumber) >= FormatConfig.M) {
     const formattedDecimals = noDecimals
       ? ''
       : (FormatConfig.DecimalsAfterDot ? '.' : '') +
@@ -922,7 +933,7 @@ export const formatNumber = (
         )
     formattedNumber =
       beforeDot.slice(0, -FormatConfig.MDecimals) + (noDecimals ? '' : formattedDecimals) + 'M'
-  } else if (Math.abs(numberAsNumber) > FormatConfig.K) {
+  } else if (Math.abs(numberAsNumber) >= FormatConfig.K) {
     const formattedDecimals = noDecimals
       ? ''
       : (FormatConfig.DecimalsAfterDot ? '.' : '') +