diff --git a/src/antelope/chains/EVMChainSettings.ts b/src/antelope/chains/EVMChainSettings.ts
index 3f5e974b3..514534afd 100644
--- a/src/antelope/chains/EVMChainSettings.ts
+++ b/src/antelope/chains/EVMChainSettings.ts
@@ -294,7 +294,7 @@ export default abstract class EVMChainSettings implements ChainSettings {
     abstract getSystemTokens(): TokenClass[];
     abstract getIndexerApiEndpoint(): string;
     abstract hasIndexerSupport(): boolean;
-    abstract trackAnalyticsEvent(params: Record<string, unknown>): void;
+    abstract trackAnalyticsEvent(eventName: string): void;
 
     async getApy(): Promise<string> {
         const response = await this.api.get('apy/evm');
diff --git a/src/antelope/chains/NativeChainSettings.ts b/src/antelope/chains/NativeChainSettings.ts
index d5b05ed24..8c71c31ab 100644
--- a/src/antelope/chains/NativeChainSettings.ts
+++ b/src/antelope/chains/NativeChainSettings.ts
@@ -149,7 +149,7 @@ export default abstract class NativeChainSettings implements ChainSettings {
     abstract getMapDisplay(): boolean;
     abstract getTheme(): Theme;
     abstract getFiltersSupported(prop: string): boolean;
-    abstract trackAnalyticsEvent(params: Record<string, unknown>): void;
+    abstract trackAnalyticsEvent(eventName: string): void;
 
     /**
      * Retrieves the list of IDs for the important tokens.
diff --git a/src/antelope/chains/chain-constants.ts b/src/antelope/chains/chain-constants.ts
index f77fabd88..53f0cd569 100644
--- a/src/antelope/chains/chain-constants.ts
+++ b/src/antelope/chains/chain-constants.ts
@@ -3,17 +3,19 @@ import { NETWORK as telosTestnetEvmNetwork } from 'src/antelope/chains/evm/telos
 
 export const TELOS_CHAIN_IDS = ['40', '41'];
 export const TELOS_NETWORK_NAMES = [telosEvmNetwork, telosTestnetEvmNetwork];
-export const TELOS_ANALYTICS_EVENT_IDS = {
-    loginStarted: 'JXIYBP1S',
-    loginSuccessful: 'HIP11SFR',
-    loginSuccessfulMetamask: 'ABGMND23',
-    loginFailedMetamask: 'ZFGE6TFS',
-    loginSuccessfulSafepal: 'LKCBKDU2',
-    loginFailedSafepal: '6PSIWGNV',
-    loginSuccessfulOreId: 'MSXMDDNK',
-    loginFailedOreId: 'UFX3JYRJ',
-    loginFailedWalletConnect: '9V4IV1BV',
-    loginSuccessfulWalletConnect: '2EG2OR3H',
+export const TELOS_ANALYTICS_EVENT_NAMES = {
+    loginStarted: 'Login Started',
+    loginSuccessful: 'Login Successful',
+    loginSuccessfulMetamask: 'Login Successful - Metamask',
+    loginFailedMetamask: 'Login Failed - Metamask',
+    loginSuccessfulSafepal: 'Login Successful - Safepal',
+    loginFailedSafepal: 'Login Failed - Safepal',
+    loginSuccessfulOreId: 'Login Successful - OreId',
+    loginFailedOreId: 'Login Failed - OreId',
+    loginFailedWalletConnect: 'Login Failed - WalletConnect',
+    loginSuccessfulWalletConnect: 'Login Successful - WalletConnect',
+    loginSuccessfulBrave: 'Login Successful - Brave',
+    loginFailedBrave: 'Login Failed - Brave',
 };
 
 export const ZERO_ADDRESS = '0x'.concat('0'.repeat(40));
diff --git a/src/antelope/chains/evm/telos-evm-testnet/index.ts b/src/antelope/chains/evm/telos-evm-testnet/index.ts
index 9f0297307..d0d08f93e 100644
--- a/src/antelope/chains/evm/telos-evm-testnet/index.ts
+++ b/src/antelope/chains/evm/telos-evm-testnet/index.ts
@@ -59,7 +59,7 @@ const NETWORK_EVM_ENDPOINT = 'https://testnet.telos.net';
 const INDEXER_ENDPOINT = 'https://api.testnet.teloscan.io';
 const CONTRACTS_BUCKET = 'https://verified-evm-contracts-testnet.s3.amazonaws.com';
 
-declare const fathom: { trackGoal: (eventId: string, value: 0) => void };
+declare const fathom: { trackEvent: (eventName: string) => void };
 
 export default class TelosEVMTestnet extends EVMChainSettings {
     isTestnet() {
@@ -149,7 +149,7 @@ export default class TelosEVMTestnet extends EVMChainSettings {
     }
 
     getBuyMoreOfTokenLink(): string {
-        return 'https://www.telos.net/#buy-tlos-simplex';
+        return 'https://telos.net/ecosystem?category=Exchanges';
     }
 
     getSystemTokens(): TokenClass[] {
@@ -164,13 +164,12 @@ export default class TelosEVMTestnet extends EVMChainSettings {
         return true;
     }
 
-    trackAnalyticsEvent(params: Record<string, unknown>): void {
+    trackAnalyticsEvent(eventName: string): void {
         if (typeof fathom === 'undefined') {
-            console.warn(`Failed to track event with ID ${params.id}: Fathom Analytics not loaded`);
+            console.warn(`Failed to track event with name '${eventName}': Fathom Analytics not loaded`);
             return;
         }
 
-        const id = params.id as string;
-        fathom.trackGoal(id, 0);
+        fathom.trackEvent(eventName);
     }
 }
diff --git a/src/antelope/chains/evm/telos-evm/index.ts b/src/antelope/chains/evm/telos-evm/index.ts
index 91b1a8533..9e2e6ed3b 100644
--- a/src/antelope/chains/evm/telos-evm/index.ts
+++ b/src/antelope/chains/evm/telos-evm/index.ts
@@ -59,7 +59,7 @@ const NETWORK_EVM_ENDPOINT = 'https://mainnet.telos.net';
 const INDEXER_ENDPOINT = 'https://api.teloscan.io';
 const CONTRACTS_BUCKET = 'https://verified-evm-contracts.s3.amazonaws.com';
 
-declare const fathom: { trackGoal: (eventId: string, value: 0) => void };
+declare const fathom: { trackEvent: (eventName: string) => void };
 
 export default class TelosEVMTestnet extends EVMChainSettings {
     getNetwork(): string {
@@ -145,7 +145,7 @@ export default class TelosEVMTestnet extends EVMChainSettings {
     }
 
     getBuyMoreOfTokenLink(): string {
-        return 'https://www.telos.net/#buy-tlos-simplex';
+        return 'https://telos.net/ecosystem?category=Exchanges';
     }
 
     getSystemTokens(): TokenClass[] {
@@ -160,13 +160,12 @@ export default class TelosEVMTestnet extends EVMChainSettings {
         return true;
     }
 
-    trackAnalyticsEvent(params: Record<string, unknown>): void {
+    trackAnalyticsEvent(eventName: string): void {
         if (typeof fathom === 'undefined') {
-            console.warn(`Failed to track event with ID ${params.id}: Fathom Analytics not loaded`);
+            console.warn(`Failed to track event with name '${eventName}': Fathom Analytics not loaded`);
             return;
         }
 
-        const id = params.id as string;
-        fathom.trackGoal(id, 0);
+        fathom.trackEvent(eventName);
     }
 }
diff --git a/src/antelope/types/ChainSettings.ts b/src/antelope/types/ChainSettings.ts
index 36a081469..62c33e7fb 100644
--- a/src/antelope/types/ChainSettings.ts
+++ b/src/antelope/types/ChainSettings.ts
@@ -26,6 +26,6 @@ export interface ChainSettings {
     getSystemTokens(): TokenClass[];
     getNftsForAccount(address: string, filter: IndexerAccountNftsFilter): Promise<Collectible[]>;
     getNftsForCollection(contract: string, filter: IndexerCollectionNftsFilter): Promise<Collectible[]>;
-    trackAnalyticsEvent(params: Record<string, unknown>): void;
+    trackAnalyticsEvent(eventName: string): void;
     getApy(): Promise<string>;
 }
diff --git a/src/antelope/wallets/authenticators/InjectedProviderAuth.ts b/src/antelope/wallets/authenticators/InjectedProviderAuth.ts
index 4439ec142..94026a185 100644
--- a/src/antelope/wallets/authenticators/InjectedProviderAuth.ts
+++ b/src/antelope/wallets/authenticators/InjectedProviderAuth.ts
@@ -12,8 +12,8 @@ import {
     addressString,
 } from 'src/antelope/types';
 import { EVMAuthenticator } from 'src/antelope/wallets';
-import { TELOS_NETWORK_NAMES, TELOS_ANALYTICS_EVENT_IDS } from 'src/antelope/chains/chain-constants';
-import { MetamaskAuthName, SafePalAuthName } from 'src/antelope/wallets';
+import { TELOS_NETWORK_NAMES, TELOS_ANALYTICS_EVENT_NAMES } from 'src/antelope/chains/chain-constants';
+import { BraveAuthName, MetamaskAuthName, SafePalAuthName } from 'src/antelope/wallets';
 
 export abstract class InjectedProviderAuth extends EVMAuthenticator {
     onReady = new BehaviorSubject<boolean>(false);
@@ -32,31 +32,27 @@ export abstract class InjectedProviderAuth extends EVMAuthenticator {
         useFeedbackStore().setLoading(`${this.getName()}.login`);
 
         this.trace('login', 'trackAnalyticsEvent -> login started');
-        chainSettings.trackAnalyticsEvent(
-            { id: TELOS_ANALYTICS_EVENT_IDS.loginStarted },
-        );
+        chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginStarted);
 
         const response = await super.login(network).then((res) => {
             if (TELOS_NETWORK_NAMES.includes(network)) {
-                let successfulLoginEventId = '';
+                let successfulLoginEventName = '';
 
                 if (authName === MetamaskAuthName) {
-                    successfulLoginEventId = TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulMetamask;
+                    successfulLoginEventName = TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulMetamask;
                 } else if (authName === SafePalAuthName) {
-                    successfulLoginEventId = TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulSafepal;
+                    successfulLoginEventName = TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulSafepal;
+                } else if (authName === BraveAuthName) {
+                    successfulLoginEventName = TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulBrave;
                 }
 
-                if (successfulLoginEventId) {
-                    this.trace('login', 'trackAnalyticsEvent -> login succeeded', authName, successfulLoginEventId);
-                    chainSettings.trackAnalyticsEvent(
-                        { id: successfulLoginEventId },
-                    );
+                if (successfulLoginEventName) {
+                    this.trace('login', 'trackAnalyticsEvent -> login succeeded', authName, successfulLoginEventName);
+                    chainSettings.trackAnalyticsEvent(successfulLoginEventName);
                 }
 
-                this.trace('login', 'trackAnalyticsEvent -> generic login succeeded', TELOS_ANALYTICS_EVENT_IDS.loginSuccessful);
-                chainSettings.trackAnalyticsEvent(
-                    { id: TELOS_ANALYTICS_EVENT_IDS.loginSuccessful },
-                );
+                this.trace('login', 'trackAnalyticsEvent -> generic login succeeded', authName, TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful);
+                chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful);
             }
 
             return res;
@@ -69,16 +65,16 @@ export abstract class InjectedProviderAuth extends EVMAuthenticator {
                 let failedLoginEventId = '';
 
                 if (authName === MetamaskAuthName) {
-                    failedLoginEventId = TELOS_ANALYTICS_EVENT_IDS.loginFailedMetamask;
+                    failedLoginEventId = TELOS_ANALYTICS_EVENT_NAMES.loginFailedMetamask;
                 } else if (authName === SafePalAuthName) {
-                    failedLoginEventId = TELOS_ANALYTICS_EVENT_IDS.loginFailedSafepal;
+                    failedLoginEventId = TELOS_ANALYTICS_EVENT_NAMES.loginFailedSafepal;
+                } else if (authName === BraveAuthName) {
+                    failedLoginEventId = TELOS_ANALYTICS_EVENT_NAMES.loginFailedBrave;
                 }
 
                 if (failedLoginEventId) {
                     this.trace('login', 'trackAnalyticsEvent -> login failed', authName, failedLoginEventId);
-                    chainSettings.trackAnalyticsEvent(
-                        { id: failedLoginEventId },
-                    );
+                    chainSettings.trackAnalyticsEvent(failedLoginEventId);
                 }
             }
         }).finally(() => {
diff --git a/src/antelope/wallets/authenticators/OreIdAuth.ts b/src/antelope/wallets/authenticators/OreIdAuth.ts
index 15dff2034..3dc365a9f 100644
--- a/src/antelope/wallets/authenticators/OreIdAuth.ts
+++ b/src/antelope/wallets/authenticators/OreIdAuth.ts
@@ -14,7 +14,7 @@ import {
 import { useFeedbackStore } from 'src/antelope/stores/feedback';
 import { useChainStore } from 'src/antelope/stores/chain';
 import { RpcEndpoint } from 'universal-authenticator-library';
-import { TELOS_ANALYTICS_EVENT_IDS } from 'src/antelope/chains/chain-constants';
+import { TELOS_ANALYTICS_EVENT_NAMES } from 'src/antelope/chains/chain-constants';
 
 const name = 'OreId';
 export const OreIdAuthName = name;
@@ -64,14 +64,10 @@ export class OreIdAuth extends EVMAuthenticator {
         this.trace('login', network);
         const chainSettings = this.getChainSettings();
         const trackSuccessfulLogin = () => {
-            this.trace('login', 'trackAnalyticsEvent -> generic login succeeded', TELOS_ANALYTICS_EVENT_IDS.loginSuccessful);
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginSuccessful },
-            );
-            this.trace('login', 'trackAnalyticsEvent -> login succeeded', this.getName(), TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulOreId);
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulOreId },
-            );
+            this.trace('login', 'trackAnalyticsEvent -> generic login succeeded', TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful);
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful);
+            this.trace('login', 'trackAnalyticsEvent -> login succeeded', this.getName(), TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulOreId);
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulOreId);
         };
 
         useFeedbackStore().setLoading(`${this.getName()}.login`);
@@ -93,18 +89,14 @@ export class OreIdAuth extends EVMAuthenticator {
             this.trace('login', 'userChainAccount', this.userChainAccount);
             // track the login start for auto-login procceess
             this.trace('login', 'trackAnalyticsEvent -> login started');
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginStarted },
-            );
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginStarted);
             // then track the successful login
             trackSuccessfulLogin();
             return chainAccount;
         }
 
         this.trace('login', 'trackAnalyticsEvent -> login started');
-        chainSettings.trackAnalyticsEvent(
-            { id: TELOS_ANALYTICS_EVENT_IDS.loginStarted },
-        );
+        chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginStarted);
 
         // launch the login flow
         await oreId.popup.auth({ provider: this.provider as AuthProvider });
@@ -118,10 +110,8 @@ export class OreIdAuth extends EVMAuthenticator {
             const appName = this.options.appName;
             const networkName = useChainStore().getNetworkSettings(network).getDisplay();
 
-            this.trace('login', 'trackAnalyticsEvent -> login failed', this.getName(), TELOS_ANALYTICS_EVENT_IDS.loginFailedOreId);
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginFailedOreId },
-            );
+            this.trace('login', 'trackAnalyticsEvent -> login failed', this.getName(), TELOS_ANALYTICS_EVENT_NAMES.loginFailedOreId);
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginFailedOreId);
 
             throw new AntelopeError('antelope.wallets.error_oreid_no_chain_account', {
                 networkName,
diff --git a/src/antelope/wallets/authenticators/WalletConnectAuth.ts b/src/antelope/wallets/authenticators/WalletConnectAuth.ts
index 5010b55c5..5bdb6de7b 100644
--- a/src/antelope/wallets/authenticators/WalletConnectAuth.ts
+++ b/src/antelope/wallets/authenticators/WalletConnectAuth.ts
@@ -17,7 +17,7 @@ import {
 } from '@web3modal/ethereum';
 import { Web3Modal, Web3ModalConfig } from '@web3modal/html';
 import { BigNumber, ethers } from 'ethers';
-import { TELOS_ANALYTICS_EVENT_IDS } from 'src/antelope/chains/chain-constants';
+import { TELOS_ANALYTICS_EVENT_NAMES } from 'src/antelope/chains/chain-constants';
 import { useChainStore } from 'src/antelope/stores/chain';
 import { useContractStore } from 'src/antelope/stores/contract';
 import { useFeedbackStore } from 'src/antelope/stores/feedback';
@@ -106,19 +106,15 @@ export class WalletConnectAuth extends EVMAuthenticator {
                 'login',
                 'trackAnalyticsEvent -> login successful',
                 'WalletConnect',
-                TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulWalletConnect,
-            );
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginSuccessfulWalletConnect },
+                TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulWalletConnect,
             );
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginSuccessfulWalletConnect);
             this.trace(
                 'login',
                 'trackAnalyticsEvent -> generic login successful',
-                TELOS_ANALYTICS_EVENT_IDS.loginSuccessful,
-            );
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginSuccessful },
+                TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful,
             );
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginSuccessful);
 
             return address;
         } catch (e) {
@@ -128,12 +124,10 @@ export class WalletConnectAuth extends EVMAuthenticator {
                 'walletConnectLogin',
                 'trackAnalyticsEvent -> login failed',
                 'WalletConnect',
-                TELOS_ANALYTICS_EVENT_IDS.loginFailedWalletConnect,
+                TELOS_ANALYTICS_EVENT_NAMES.loginFailedWalletConnect,
             );
             const chainSettings = this.getChainSettings();
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginFailedWalletConnect },
-            );
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginFailedWalletConnect);
             throw new AntelopeError('antelope.evm.error_login');
         } finally {
             useFeedbackStore().unsetLoading(`${this.getName()}.login`);
@@ -152,11 +146,9 @@ export class WalletConnectAuth extends EVMAuthenticator {
                 'login',
                 'trackAnalyticsEvent -> login started',
                 'WalletConnect',
-                TELOS_ANALYTICS_EVENT_IDS.loginStarted,
-            );
-            chainSettings.trackAnalyticsEvent(
-                { id: TELOS_ANALYTICS_EVENT_IDS.loginStarted },
+                TELOS_ANALYTICS_EVENT_NAMES.loginStarted,
             );
+            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginStarted);
             return this.walletConnectLogin(network);
         } else {
             return new Promise(async (resolve) => {
@@ -170,11 +162,9 @@ export class WalletConnectAuth extends EVMAuthenticator {
                             'login',
                             'trackAnalyticsEvent -> login started',
                             'WalletConnect',
-                            TELOS_ANALYTICS_EVENT_IDS.loginStarted,
-                        );
-                        chainSettings.trackAnalyticsEvent(
-                            { id: TELOS_ANALYTICS_EVENT_IDS.loginStarted },
+                            TELOS_ANALYTICS_EVENT_NAMES.loginStarted,
                         );
+                        chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginStarted);
                     }
 
                     if (newState.open === false) {
@@ -185,11 +175,9 @@ export class WalletConnectAuth extends EVMAuthenticator {
                                 'login',
                                 'trackAnalyticsEvent -> login failed',
                                 'WalletConnect',
-                                TELOS_ANALYTICS_EVENT_IDS.loginFailedWalletConnect,
-                            );
-                            chainSettings.trackAnalyticsEvent(
-                                { id: TELOS_ANALYTICS_EVENT_IDS.loginFailedWalletConnect },
+                                TELOS_ANALYTICS_EVENT_NAMES.loginFailedWalletConnect,
                             );
+                            chainSettings.trackAnalyticsEvent(TELOS_ANALYTICS_EVENT_NAMES.loginFailedWalletConnect);
                         }
 
                         // this prevents multiple subscribers from being attached to the web3Modal
diff --git a/src/antelope/wallets/index.ts b/src/antelope/wallets/index.ts
index d09b2caf6..3f42a76ec 100644
--- a/src/antelope/wallets/index.ts
+++ b/src/antelope/wallets/index.ts
@@ -4,4 +4,5 @@ export * from 'src/antelope/wallets/authenticators/MetamaskAuth';
 export * from 'src/antelope/wallets/authenticators/OreIdAuth';
 export * from 'src/antelope/wallets/authenticators/WalletConnectAuth';
 export * from 'src/antelope/wallets/authenticators/SafePalAuth';
+export * from 'src/antelope/wallets/authenticators/BraveAuth';
 export * from 'src/antelope/wallets/AntelopeWallets';
diff --git a/src/boot/ual.js b/src/boot/ual.js
index bee935b1a..3f988b301 100644
--- a/src/boot/ual.js
+++ b/src/boot/ual.js
@@ -26,7 +26,7 @@ export default boot(async ({ app, store }) => {
         if (localStorage.getItem('autoLogin') === 'cleos') {
             accountName = localStorage.getItem('account');
         } else {
-            await new Promise((resolve) => {
+            await new Promise((resolve, reject) => {
                 Dialog.create({
                     class: 'cleos-auth-dialog',
                     color: 'primary',
@@ -43,11 +43,13 @@ export default boot(async ({ app, store }) => {
                         accountName = data !== '' ? data : 'eosio';
                     })
                     .onCancel(() => {
-                        throw 'Cancelled!';
+                        reject('cancelled');
                     })
                     .onDismiss(() => {
                         resolve(true);
                     });
+            }).catch((e) => {
+                throw e;
             });
             if (store.state.account.justViewer) {
                 permission = 'active';
@@ -73,7 +75,7 @@ export default boot(async ({ app, store }) => {
                             permission = data;
                         })
                         .onCancel(() => {
-                            throw 'Cancelled!';
+                            throw 'cancelled';
                         })
                         .onDismiss(() => {
                             resolve(true);
@@ -133,7 +135,7 @@ export default boot(async ({ app, store }) => {
                         });
                 })
                 .onCancel(() => {
-                    throw 'Cancelled!';
+                    throw 'cancelled';
                 })
                 .onDismiss(() => {
                     resolve(true);
@@ -142,8 +144,8 @@ export default boot(async ({ app, store }) => {
     }
 
     const authenticators = [
-        new Wombat([chain], { appName: process.env.APP_NAME }),
         new Anchor([chain], { appName: process.env.APP_NAME }),
+        new Wombat([chain], { appName: process.env.APP_NAME }),
         new CleosAuthenticator([chain], {
             appName: process.env.APP_NAME,
             loginHandler,
diff --git a/src/components/evm/AppNav.vue b/src/components/evm/AppNav.vue
index 2d8765378..64dc2e8bb 100644
--- a/src/components/evm/AppNav.vue
+++ b/src/components/evm/AppNav.vue
@@ -147,6 +147,10 @@ export default defineComponent({
             const network = this.loggedAccount.network;
             window.open(chainStore.getEcosystemUrl(network), '_blank');
         },
+        goToExplorer() {
+            const network = this.loggedAccount.network;
+            window.open(chainStore.getExplorerUrl(network), '_blank');
+        },
     },
 });
 </script>
@@ -252,25 +256,6 @@ export default defineComponent({
                 />
                 {{ $t('nav.wallet') }}
             </li>
-            <li
-                class="c-app-nav__menu-item"
-                role="menuitem"
-                :tabindex="menuItemTabIndex"
-                @click="goTo('evm-nft-inventory')"
-                @keypress.space.enter="goTo('evm-nft-inventory')"
-            >
-                <InlineSvg
-                    :src="require('src/assets/icon--nft.svg')"
-                    :class="{
-                        'c-app-nav__icon': true,
-                        'c-app-nav__icon--current-route': $route.name === 'evm-nft-inventory',
-                    }"
-                    height="24"
-                    width="24"
-                    aria-hidden="true"
-                />
-                {{ $t('nav.nfts') }}
-            </li>
 
             <li
                 class="c-app-nav__menu-item"
@@ -302,6 +287,26 @@ export default defineComponent({
                 </span>
             </li>
 
+            <li
+                class="c-app-nav__menu-item"
+                role="menuitem"
+                :tabindex="menuItemTabIndex"
+                @click="goTo('evm-nft-inventory')"
+                @keypress.space.enter="goTo('evm-nft-inventory')"
+            >
+                <InlineSvg
+                    :src="require('src/assets/icon--nft.svg')"
+                    :class="{
+                        'c-app-nav__icon': true,
+                        'c-app-nav__icon--current-route': $route.name === 'evm-nft-inventory',
+                    }"
+                    height="24"
+                    width="24"
+                    aria-hidden="true"
+                />
+                {{ $t('nav.nfts') }}
+            </li>
+
             <li
                 class="c-app-nav__menu-item"
                 role="menuitem"
@@ -374,6 +379,16 @@ export default defineComponent({
                 {{ $t('nav.ecosystem') }}
                 <q-icon size="16px" name="launch" />
             </li>
+            <li
+                class="c-app-nav__menu-link"
+                role="menuitem"
+                :tabindex="menuItemTabIndex"
+                @click="goToExplorer()"
+                @keypress.space.enter="goToExplorer()"
+            >
+                {{ $t('nav.teloscan') }}
+                <q-icon size="16px" name="launch" />
+            </li>
         </ul>
 
         <div v-if="!isProduction" class="c-app-nav__demos-link">
diff --git a/src/components/evm/UserInfo.vue b/src/components/evm/UserInfo.vue
index d7851c21f..ce9a720b7 100644
--- a/src/components/evm/UserInfo.vue
+++ b/src/components/evm/UserInfo.vue
@@ -1,7 +1,6 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { useAccountStore, getAntelope, useChainStore } from 'src/antelope';
-import InlineSvg from 'vue-inline-svg';
 
 const accountStore = useAccountStore();
 const chainStore = useChainStore();
@@ -27,13 +26,6 @@ export default defineComponent({
             type: Boolean,
             default: true,
         },
-        showUserMenu: {
-            type: Boolean,
-            default: true,
-        },
-    },
-    components: {
-        InlineSvg,
     },
     methods: {
         copyAddress() {
@@ -43,22 +35,9 @@ export default defineComponent({
                 ant.config.notifySuccessCopyHandler();
             }
         },
-        logout() {
-            accountStore.logout();
-        },
         toggleDarkMode() {
             this.$q.dark.toggle();
         },
-        gotoTeloscan() {
-            const network =  this.account.network;
-            const explorerUrl =  chainStore.getExplorerUrl(network);
-            if (explorerUrl) {
-                window.open(explorerUrl + '/address/' + this.account?.account, '_blank');
-                return;
-            } else {
-                ant.config.notifyFailureMessage(this.$t('settings.no_explorer', { network: this.account.network }));
-            }
-        },
     },
     computed: {
         address() {
@@ -88,54 +67,6 @@ export default defineComponent({
         :aria-label="$t('nav.copy_address')"
         @click="copyAddress"
     />
-    <q-btn
-        v-if="showUserMenu"
-        flat
-        dense
-        icon="more_vert"
-        class="c-user-info__menu-btn"
-        :aria-label="$t('nav.overflow_menu')"
-    >
-        <q-menu anchor="bottom end" self="top right" :offset="[0, 16]">
-            <ul class="c-user-info__menu-items" role="menu">
-                <li
-                    class="c-user-info__menu-item"
-                    role="menuitem"
-                    tabindex="0"
-                    @click="gotoTeloscan()"
-                    @keypress.space.enter="gotoTeloscan()"
-                >
-                    <div class="c-user-info__icon-wrapper">
-                        <img
-                            src="/branding/telos-scan.png"
-                            class="c-user-info__icon c-user-info__icon--acorn"
-                            height="24"
-                            width="24"
-                            aria-hidden="true"
-                        >
-                    </div>
-                    <h5>{{ $t('nav.teloscan') }}</h5>
-                    <q-icon size="xs" name="o_launch" class="c-user-info__menu-item-min-icon" />
-                </li>
-                <li
-                    class="c-user-info__menu-item"
-                    role="menuitem"
-                    tabindex="1"
-                    @click="logout"
-                    @keypress.space.enter="logout"
-                >
-                    <div class="c-user-info__icon-wrapper"><InlineSvg
-                        :src="require('src/assets/icon--logout.svg')"
-                        class="c-user-info__icon"
-                        height="24"
-                        width="24"
-                        aria-hidden="true"
-                    /></div>
-                    <h5>{{ $t('global.sign_out') }}</h5>
-                </li>
-            </ul>
-        </q-menu>
-    </q-btn>
 </div>
 </template>
 
diff --git a/src/layouts/NativeLayout.vue b/src/layouts/NativeLayout.vue
index ee953cbb0..1324074d4 100644
--- a/src/layouts/NativeLayout.vue
+++ b/src/layouts/NativeLayout.vue
@@ -113,7 +113,7 @@ export default {
         },
         logOut() {
             this.resetTokens();
-            this.logout();
+            this.logout(true);
         },
         resetTokens() {
             this.coins = [];
diff --git a/src/pages/evm/nfts/NftTransferForm.vue b/src/pages/evm/nfts/NftTransferForm.vue
index 16dc812ad..6f4546f80 100644
--- a/src/pages/evm/nfts/NftTransferForm.vue
+++ b/src/pages/evm/nfts/NftTransferForm.vue
@@ -124,7 +124,6 @@ async function startTransfer() {
                         :displayFullAddress="false"
                         :showAddress="true"
                         :showCopyBtn="false"
-                        :showUserMenu="false"
                         :lightweight="true"
                         :account="loggedAccount"
                     />
diff --git a/src/pages/evm/wallet/ReceivePage.vue b/src/pages/evm/wallet/ReceivePage.vue
index 22335880b..e31cc37bc 100644
--- a/src/pages/evm/wallet/ReceivePage.vue
+++ b/src/pages/evm/wallet/ReceivePage.vue
@@ -62,7 +62,6 @@ export default defineComponent({
             class="c-receive-page__user-info"
             :displayFullAddress="true"
             :showCopyBtn="!isMobile"
-            :showUserMenu="false"
             :account="loggedAccount"
         />
 
diff --git a/src/pages/evm/wallet/SendPage.vue b/src/pages/evm/wallet/SendPage.vue
index 9c32ae5c2..40d1a656d 100644
--- a/src/pages/evm/wallet/SendPage.vue
+++ b/src/pages/evm/wallet/SendPage.vue
@@ -285,7 +285,6 @@ export default defineComponent({
                 :displayFullAddress="false"
                 :showAddress="true"
                 :showCopyBtn="false"
-                :showUserMenu="false"
                 :lightweight="true"
                 :account="loggedAccount"
             />
diff --git a/src/pages/evm/wallet/WalletTransactionRow.vue b/src/pages/evm/wallet/WalletTransactionRow.vue
index d0b446ba2..e09b02a27 100644
--- a/src/pages/evm/wallet/WalletTransactionRow.vue
+++ b/src/pages/evm/wallet/WalletTransactionRow.vue
@@ -254,9 +254,8 @@ export default defineComponent({
 
             <template v-if="$q.screen.gt.xs">
                 <div>
-                    trx:
                     <ExternalLink
-                        :text="transaction.id"
+                        :text="$t('global.more_info')"
                         :url="transactionUrl"
                         :purpose="$t('evm_wallet.aria_link_to_transaction')"
                     />
diff --git a/src/pages/home/EVMLoginButtons.vue b/src/pages/home/EVMLoginButtons.vue
index c833b229a..ea3f83454 100644
--- a/src/pages/home/EVMLoginButtons.vue
+++ b/src/pages/home/EVMLoginButtons.vue
@@ -178,45 +178,45 @@ export default defineComponent({
 <div class="c-evm-login-buttons">
     <!-- main menu -->
     <template v-if="showMainMenu">
-        <!-- Brave Authenticator button -->
+        <!-- Metamask Authenticator button -->
         <div
-            v-if="showBraveButton"
+            v-if="showMetamaskButton"
             class="c-evm-login-buttons__option"
-            @click="supportsBrave ? setBraveAuthenticator() : notifyEnableBrave()"
+            @click="supportsMetamask ?  setMetamaskAuthenticator() : supportsSafePal ? notifyNoProvider('Metamask') : redirectToMetamaskDownload()"
         >
-            <template v-if="isLoading('Brave.login')">
+            <template v-if="isLoading('Metamask.login')">
                 <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
             </template>
             <template v-else>
                 <InlineSvg
-                    :src="require('src/assets/evm/brave_lion.svg')"
-                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--brave"
+                    :src="require('src/assets/evm/metamask_fox.svg')"
+                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--metamask"
                     height="24"
                     width="24"
                     aria-hidden="true"
                 />
-                {{ supportsBrave ? $t('home.brave') : $t('home.brave') }}
+                {{ supportsMetamask ? $t('home.metamask') : $t('home.install_metamask') }}
             </template>
         </div>
 
-        <!-- Metamask Authenticator button -->
+        <!-- WalletConnect Authenticator button -->
         <div
-            v-if="showMetamaskButton"
+            v-if="showWalletConnectButton"
             class="c-evm-login-buttons__option"
-            @click="supportsMetamask ?  setMetamaskAuthenticator() : supportsSafePal ? notifyNoProvider('Metamask') : redirectToMetamaskDownload()"
+            @click="setWalletConnectAuthenticator()"
         >
-            <template v-if="isLoading('Metamask.login')">
+            <template v-if="isLoading('WalletConnect.login')">
                 <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
             </template>
             <template v-else>
                 <InlineSvg
-                    :src="require('src/assets/evm/metamask_fox.svg')"
-                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--metamask"
+                    :src="require('src/assets/evm/wallet_connect.svg')"
+                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--wallet-connect"
                     height="24"
                     width="24"
                     aria-hidden="true"
                 />
-                {{ supportsMetamask ? $t('home.metamask') : $t('home.install_metamask') }}
+                {{ $t('home.walletconnect') }}
             </template>
         </div>
 
@@ -241,27 +241,26 @@ export default defineComponent({
             </template>
         </div>
 
-        <!-- WalletConnect Authenticator button -->
+        <!-- Brave Authenticator button -->
         <div
-            v-if="showWalletConnectButton"
+            v-if="showBraveButton"
             class="c-evm-login-buttons__option"
-            @click="setWalletConnectAuthenticator()"
+            @click="supportsBrave ? setBraveAuthenticator() : notifyEnableBrave()"
         >
-            <template v-if="isLoading('WalletConnect.login')">
+            <template v-if="isLoading('Brave.login')">
                 <div class="c-evm-login-buttons__loading"><QSpinnerFacebook /></div>
             </template>
             <template v-else>
                 <InlineSvg
-                    :src="require('src/assets/evm/wallet_connect.svg')"
-                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--wallet-connect"
+                    :src="require('src/assets/evm/brave_lion.svg')"
+                    class="c-evm-login-buttons__icon c-evm-login-buttons__icon--brave"
                     height="24"
                     width="24"
                     aria-hidden="true"
                 />
-                {{ $t('home.walletconnect') }}
+                {{ supportsBrave ? $t('home.brave') : $t('home.brave') }}
             </template>
         </div>
-
     </template>
 
     <!-- telos cloud menu -->
@@ -315,8 +314,6 @@ export default defineComponent({
         </div>
 
     </template>
-
-
 </div>
 </template>
 
diff --git a/src/pages/home/HomePage.vue b/src/pages/home/HomePage.vue
index 275e38fdb..e8c5a2899 100644
--- a/src/pages/home/HomePage.vue
+++ b/src/pages/home/HomePage.vue
@@ -109,7 +109,7 @@ onMounted(() => {
 
                     <q-toolbar class="c-home__footer-second-line bg-dark flex-center">
                         <a
-                            href="https://www.telos.net/terms-of-service"
+                            href="https://www.telos.net/terms-and-conditions"
                             target="_blank"
                             class="c-home__external-link-text"
                         >
@@ -137,8 +137,8 @@ onMounted(() => {
 .c-home {
     position: relative;
     background: var(--site-gradient);
-    min-height: 100vh;
-    display: flex;
+    width: 100%;
+    padding-top: 64px;
 
     &__page-container {
         // override inline style of unknown origin (do not delete)
@@ -146,32 +146,28 @@ onMounted(() => {
     }
 
     &__container {
-        flex-grow: 1;
-        display: flex;
-        flex-direction: column;
-        padding-top: 32px;
-        align-items: stretch;
-        justify-content: space-between;
+        min-height: calc(100svh - 64px);
+        position: relative;
+        padding-bottom: 88px;
     }
 
     &__logo-container {
-        flex-grow: 1;
-        align-self: center;
         display: flex;
-        flex-direction: column;
-        justify-content: space-evenly;
+        justify-content: center;
+        align-items: center;
+        margin-bottom: 48px;
     }
 
     &__logo {
-        width: 220px;
+        width: 180px;
     }
 
     &__button-container {
-        align-self: center;
         border-radius: 4px;
         padding: 24px;
         background-color: rgba(white, 0.1);
         max-width: 320px;
+        margin: 0 auto 48px;
     }
 
     &__network-toggle-container {
@@ -216,7 +212,6 @@ onMounted(() => {
         justify-content: center;
         gap: 4px;
 
-        margin-top: 24px;
         color: white;
     }
 
@@ -230,26 +225,18 @@ onMounted(() => {
         }
     }
 
-    // guarantees wallet connect on top of footer
     &__footer {
-        position: relative;
+        position: absolute;
+        bottom: 0;
     }
+
     &__connect-wallet {
         z-index: $z-index--connect-wallet-popup;
     }
 
-    @media only screen and (max-height: 850px) {
-        .c-home {
-            &__container{
-                min-height: unset;
-            }
-            &__logo{
-                margin-top: unset;
-                margin-bottom: 2rem;
-            }
-            &__button-container{
-                margin-top: 2rem;
-            }
+    @include md-and-up {
+        &__logo-container {
+            margin-bottom: 128px;
         }
     }
 }
diff --git a/src/pages/home/NativeLoginButton.vue b/src/pages/home/NativeLoginButton.vue
index a5d3b8f80..5cd5cfa49 100644
--- a/src/pages/home/NativeLoginButton.vue
+++ b/src/pages/home/NativeLoginButton.vue
@@ -4,17 +4,20 @@ import { CURRENT_CONTEXT, useChainStore } from 'src/antelope';
 import { defineComponent } from 'vue';
 import { mapGetters, mapActions, mapMutations } from 'vuex';
 import { OreIdAuthenticator } from 'ual-oreid';
+import { QSpinnerFacebook } from 'quasar';
+
 
 const telosLogo = require('src/assets/logo--telos-cloud-wallet.svg');
 
 export default defineComponent({
     name: 'NativeLoginButton',
+    components: {
+        QSpinnerFacebook,
+    },
     data() {
         return {
-            showLogin: false,
             showAuth: false,
             authType: 'signin',
-            error: null,
             authInterval: null,
             close: false,
             ramPrice: 0,
@@ -77,12 +80,16 @@ export default defineComponent({
             this.openUrl('https://app.telos.net/accounts/add');
         },
         async onLogin(idx, justViewer = false) {
-            const error = await this.login({ idx, justViewer });
-            if (!error) {
-                this.showLogin = false;
-                await this.$router.push({ path: '/zero/balance' });
-            } else {
-                this.error = error;
+            try {
+                await this.login({ idx, justViewer });
+                const account = localStorage.getItem('account');
+                if (account) {
+                    this.$router.push({ path: '/zero/balance' });
+                }
+            } catch (e) {
+                if (e.message !== 'User canceled request (Modal closed)') {
+                    this.$errorNotification(e);
+                }
             }
         },
         openUrl(url) {
@@ -230,35 +237,45 @@ export default defineComponent({
 <template>
 <div>
     <!-- Login Button -->
-    <div v-if="!isAuthenticated" class="q-px-md flex justify-center">
-        <div class="q-mt-md q-mb-sm">
-            <q-btn
-                :label="$t('home.connect_with_wallet')"
-                class="purpleGradient q-px-md q-py-sm"
-                @click="showLogin = true"
-            />
+    <div v-if="!isAuthenticated" class="c-native-login__buttons-container">
+        <div
+            v-for="(wallet, idx) in $ual.authenticators"
+            :key="wallet.getStyle().text"
+            class="c-native-login__button"
+            tabindex="0"
+            aria-role="button"
+            @keyup.enter="onLogin(idx)"
+            @click="onLogin(idx)"
+        >
+            <div v-if="loading === wallet.getStyle().text" class="c-native-login__loading">
+                <QSpinnerFacebook />
+            </div>
+            <template v-else>
+                <img :src="getWalletIcon(wallet)" width="24" class="c-native-login__ual-logo">
+                {{ getWalletName(wallet) }}
+            </template>
         </div>
 
-        <!-- View any account -->
-        <div class="q-mt-md">
-            <q-btn
-                text-color="white"
-                outline
-                :label="$t('home.view_any_account')"
-                class="q-px-md q-py-sm"
-                @click="loginAsJustViewer()"
-            />
+        <hr class="c-native-login__hr">
+
+        <div
+            class="c-native-login__button c-native-login__button--centered"
+            tabindex="0"
+            aria-role="button"
+            @keyup.enter="loginAsJustViewer"
+            @click="loginAsJustViewer"
+        >
+            {{ $t('home.view_any_account') }}
         </div>
 
-        <!-- Signup Button -->
-        <div class="q-mt-md">
-            <q-btn
-                text-color="white"
-                outline
-                :label="$t('home.create_new_account')"
-                class="q-px-md q-py-sm"
-                @click="signUp"
-            />
+        <div
+            class="c-native-login__button c-native-login__button--centered"
+            tabindex="0"
+            aria-role="button"
+            @keyup.enter="signUp"
+            @click="signUp"
+        >
+            {{ $t('home.create_new_account') }}
         </div>
     </div>
 
@@ -282,71 +299,6 @@ export default defineComponent({
         />
     </div>
 
-    <!-- Show Login -->
-    <q-dialog v-model="showLogin">
-        <div class="column showLoginPopup q-pa-lg popupCard">
-            <div class="text-subtitle1">{{$t('login.connect_wallet')}}</div>
-            <q-list class="" dark separator>
-                <q-item
-                    v-for="(wallet, idx) in $ual.authenticators"
-                    :key="wallet.getStyle().text"
-                    v-ripple
-                    class="q-my-sm"
-                >
-                    <q-item-section class="cursor-pointer" avatar @click="onLogin(idx)">
-                        <img :src="getWalletIcon(wallet)" width="30" >
-                    </q-item-section>
-                    <q-item-section class="cursor-pointer" @click="onLogin(idx)">
-                        {{ getWalletName(wallet) }}
-                    </q-item-section>
-                    <q-item-section class="flex" avatar>
-                        <q-spinner
-                            v-if="loading === wallet.getStyle().text"
-                            :color="wallet.getStyle().textColor"
-                            size="2em"
-                        />
-                        <q-btn
-                            v-else
-                            :color="wallet.getStyle().textColor"
-                            icon="get_app"
-                            target="_blank"
-                            dense
-                            flat
-                            size="12px"
-                            @click="openUrl(wallet.getOnboardingLink())"
-                        >
-                            <q-tooltip>
-                                {{$t('login.get_app')}}
-                            </q-tooltip>
-                        </q-btn>
-                    </q-item-section>
-                </q-item>
-            </q-list>
-
-            <!-- Close Button -->
-            <q-btn
-                v-close-popup
-                size="md"
-                no-caps
-                rounded
-                flat
-                class="self-center flex-center"
-                label="Close"
-                :style="`display:flex;`"
-                @click="close"
-            />
-            <q-item
-                v-if="error"
-                :active="!!error"
-                active-class="bg-red-1 text-grey-8"
-            >
-                <q-item-section>
-                    {{ error }}
-                </q-item-section>
-            </q-item>
-        </div>
-    </q-dialog>
-
     <!-- RAM low dialog -->
     <q-dialog v-model="resLow" persistent>
         <q-card class="popupCard">
@@ -393,12 +345,65 @@ export default defineComponent({
 </div>
 </template>
 
-<style lang="scss" scoped>
+<style lang="scss">
+
+.c-native-login {
+    $this: &;
+
+    &__buttons-container {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 14px;
+    }
+
+    &__loading {
+        width: 100%;
+        text-align: center;
+    }
+
+    &__ual-logo {
+        opacity: 0.8;
+
+        @include mobile-only {
+            opacity: 1;
+        }
+    }
+
+    &__button {
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        width: 224px;
+        height: 54px;
+        color: $white;
+        outline-color: $white;
+        outline-width: 1px;
+        outline-style: solid;
+        border-radius: 4px;
+        font-size: 16px;
+        font-weight: 500;
+        padding: 14px;
+        cursor: pointer;
+
+        &:hover,
+        &:focus {
+            outline-color: $white;
+            outline-width: 2px;
+
+            #{$this}__ual-logo {
+                opacity: 1;
+            }
+        }
+
+        &--centered {
+            justify-content: center;
+        }
+    }
 
-.showLoginPopup {
-    width: 30rem;
-    height: auto;
-    margin-bottom: 5rem;
+    &__hr {
+        width: 224px;
+    }
 }
 
 .logged-in{
diff --git a/src/pages/native/BalanceInfo.vue b/src/pages/native/BalanceInfo.vue
index d78576bfb..1ad520082 100644
--- a/src/pages/native/BalanceInfo.vue
+++ b/src/pages/native/BalanceInfo.vue
@@ -15,8 +15,7 @@ import WithdrawEVM from '~/pages/native/balance/WithdrawEVM';
 import RexStaking from '~/pages/native/balance/RexStaking';
 import { copyToClipboard } from 'quasar';
 
-const GETTING_STARTED_URL = 'https://www.telos.net/#getting-started';
-const TSWAPS_URL = 'https://tswaps.com/swap';
+const GETTING_STARTED_URL = 'https://telos.net/ecosystem?category=Exchanges';
 
 export default {
     props: ['loadedCoins', 'loadedNftTokens', 'balanceTab'],
@@ -184,9 +183,6 @@ export default {
             this.selectedCoin = this.coins.find(coin => coin.symbol === 'TLOS');
             window.open(GETTING_STARTED_URL);
         },
-        clickExchange() {
-            window.open(TSWAPS_URL);
-        },
         handlePan({ evt, ...info }) {
             this.coinViewHeight -= info.delta.y;
             if (info.isFirst) {
@@ -741,10 +737,6 @@ export default {
 
                 <!-- Convert and Purchace -->
                 <div class="row justify-between q-mb-md">
-                    <div class="convertBtn" @click="clickExchange()">
-                        <img src="~assets/coin/Convert.svg" class="q-mr-xs" >
-                        {{$t('balance.convert')}}
-                    </div>
                     <div class="purchaceBtn" @click="clickPurchase()">
                         {{$t('balance.purchase')}}
                         <img src="~assets/coin/Purchase.svg" class="q-ml-xs" >
diff --git a/src/pages/native/DappSearch.vue b/src/pages/native/DappSearch.vue
index fa03f5bed..8ea8b217b 100644
--- a/src/pages/native/DappSearch.vue
+++ b/src/pages/native/DappSearch.vue
@@ -14,10 +14,9 @@ export default {
         ...mapGetters('account', ['isAuthenticated', 'accountName']),
         searchDapps() {
             return this.dapps.filter(dapp => (
-                dapp.name.toLowerCase().includes(this.searchDappName.toLowerCase()) ||
-          dapp.category
-              .toLowerCase()
-              .includes(this.searchDappName.toLowerCase())
+                (dapp.name.toLowerCase().includes(this.searchDappName.toLowerCase()) ||
+                dapp.category.toLowerCase().includes(this.searchDappName.toLowerCase())) &&
+                dapp.name !== 'AreaX NFT'
             ));
         },
     },
diff --git a/src/pages/native/balance/CoinHistory.vue b/src/pages/native/balance/CoinHistory.vue
index a13995ff2..050b54f46 100644
--- a/src/pages/native/balance/CoinHistory.vue
+++ b/src/pages/native/balance/CoinHistory.vue
@@ -3,7 +3,6 @@ import { mapGetters } from 'vuex';
 import tokenAvatar from 'components/native/TokenAvatar.vue';
 
 const GETTING_STARTED_URL = 'https://www.telos.net/#getting-started';
-const TSWAPS_URL = 'https://tswaps.com/swap';
 
 export default {
     components: {
@@ -49,9 +48,6 @@ export default {
                 );
             });
         },
-        convertEnabled() {
-            return true;
-        },
     },
     methods: {
         async loadMoreHistory(index, done) {
@@ -80,9 +76,6 @@ export default {
             window.open(GETTING_STARTED_URL);
             //this.$emit("update:showBuyAmountDlg", true);
         },
-        convert() {
-            window.open(TSWAPS_URL);
-        },
         sell() {
             // this.$emit('update:showShareAddressDlg', true);
         },
@@ -310,22 +303,6 @@ export default {
                                 </div>
                             </q-btn>
 
-                            <q-btn
-                                v-if="convertEnabled"
-                                class=""
-                                flat
-                                dense
-                                stack
-                                size="md"
-                                no-caps
-                                @click="convert"
-                            >
-                                <div class="column">
-                                    <img src="~assets/coin/Convert.svg" >
-                                    {{$t('components.convert')}}
-                                </div>
-                            </q-btn>
-
                             <q-btn
                                 v-if="
                                     selectedCoin.account === 'eosio.token' &&
diff --git a/src/store/account/actions.js b/src/store/account/actions.js
index b88b02416..b0253471d 100644
--- a/src/store/account/actions.js
+++ b/src/store/account/actions.js
@@ -40,9 +40,14 @@ export const login = async function(
         const error =
             (authenticator.getError() && authenticator.getError().message) ||
             e.message ||
-            e.reason;
-        commit('general/setErrorMsg', error, { root: true });
-        console.error('Login error: ', error);
+            e.reason ||
+            e.cause;
+        if (error !== 'cancelled') {
+            commit('general/setErrorMsg', error, { root: true });
+            throw e;
+        } else {
+            console.log('Login cancelled');
+        }
     } finally {
         commit('setLoadingWallet');
     }
@@ -87,7 +92,7 @@ const getAuthenticator = function(ual, wlt = null) {
     };
 };
 
-export const logout = async function({ commit }) {
+export const logout = async function({ commit }, telosZeroLogout = false) {
     const { authenticator } = getAuthenticator(this.$ual);
     try {
         authenticator && (await authenticator.logout());
@@ -106,7 +111,7 @@ export const logout = async function({ commit }) {
     commit('setEvmBalance', null);
 
     if (this.$router.currentRoute.path !== '/') {
-        this.$router.push({ path: '/' });
+        this.$router.push({ path: '/', query: { login: telosZeroLogout ? 'zero' : '' } });
     }
 };