diff --git a/package-lock.json b/package-lock.json
index f80a159..2e6fc37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wallet",
-  "version": "1.23.0",
+  "version": "1.23.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "wallet",
-      "version": "1.23.0",
+      "version": "1.23.1",
       "license": "GPL",
       "dependencies": {
         "@chenfengyuan/vue-qrcode": "^2.0.0",
diff --git a/package.json b/package.json
index 83c51bd..8ea3ee2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wallet",
-  "version": "1.23.0",
+  "version": "1.23.1",
   "description": "Web wallet for managing $EDGE",
   "private": true,
   "license": "GPL",
diff --git a/src/components/TransactionsTable.vue b/src/components/TransactionsTable.vue
index 2afbb72..c1a47eb 100644
--- a/src/components/TransactionsTable.vue
+++ b/src/components/TransactionsTable.vue
@@ -61,13 +61,14 @@ import TransactionsTableItem from '@/components/TransactionsTableItem.vue'
 import { mapState } from 'vuex'
 
 const txsRefreshInterval = 5 * 1000
+const txCache = {}
 
 export default {
   name: 'TransactionsTable',
   data: function () {
     return {
       loaded: false,
-      loading: false,
+      loading: true,
       metadata: null,
       transactions: [],
       iTransactions: null
@@ -90,6 +91,12 @@ export default {
     }
   },
   mounted() {
+    const cached = txCache[this.address]
+    if (cached) {
+      this.transactions = cached.transactions
+      this.loaded = true
+      this.loading = false
+    }
     this.updateTransactions()
     // initiate polling
     this.iTransactions = setInterval(() => {
@@ -102,21 +109,27 @@ export default {
   methods: {
     async updateTransactions() {
       this.loading = true
+      const addr = this.address
+      if (!addr) return
       // the sort query sent to index needs to include "-created", but this is hidden from user in browser url
       const sortQuery = this.$route.query.sort ? `${this.$route.query.sort},-timestamp` : '-timestamp'
       const transactions = await index.tx.transactions(
         import.meta.env.VITE_INDEX_API_URL,
-        this.address,
+        addr,
         {
           limit: this.limit,
           page: this.page,
           sort: sortQuery
         }
       )
-      this.transactions = transactions.results
-      if (this.receiveMetadata) this.receiveMetadata(transactions.metadata)
-      this.loaded = true
-      this.loading = false
+      txCache[addr] = { transactions: transactions.results }
+      // Only update display if address hasn't changed during fetch
+      if (this.address === addr) {
+        this.transactions = transactions.results
+        if (this.receiveMetadata) this.receiveMetadata(transactions.metadata)
+        this.loaded = true
+        this.loading = false
+      }
     },
     updateSorting(newSortQuery) {
       const query = { ...this.$route.query, sort: newSortQuery }
@@ -125,6 +138,16 @@ export default {
     }
   },
   watch: {
+    address(newAddr) {
+      const cached = txCache[newAddr]
+      if (cached) {
+        this.transactions = cached.transactions
+      } else {
+        this.transactions = []
+        this.loaded = false
+      }
+      this.updateTransactions()
+    },
     page() {
       this.updateTransactions()
     },
diff --git a/src/components/index/RestoreModal.vue b/src/components/index/RestoreModal.vue
index 02af07f..cc7342d 100644
--- a/src/components/index/RestoreModal.vue
+++ b/src/components/index/RestoreModal.vue
@@ -7,6 +7,12 @@
     <template v-slot:body>
       <div class="pt-15">
         <form>
+          <div v-if="isAdditionalWallet" class="flex items-start leading-8 text-gray mb-14">
+            <span class="flex-shrink-0 inline-block mt-8 mr-12 text-white icon w-27">
+              <ShieldExclamationIcon/>
+            </span>
+            <p>Enter a private key below to import a wallet. The wallet will be encrypted with your existing password.</p>
+          </div>
           <div class="form-group" :class="{'form-group__error': v$.privateKey.$error || importError}">
             <label for="key">ENTER private key</label>
             <div class="relative input-wrap">
@@ -74,7 +80,8 @@ import useVuelidate from '@vuelidate/core'
 import { mapState } from 'vuex'
 import {
   KeyIcon,
-  LockOpenIcon
+  LockOpenIcon,
+  ShieldExclamationIcon
 } from '@heroicons/vue/outline'
 import { helpers, sameAs } from '@vuelidate/validators'
 
@@ -85,7 +92,8 @@ export default {
   components: {
     KeyIcon,
     LockOpenIcon,
-    Modal
+    Modal,
+    ShieldExclamationIcon
   },
   props: {
     afterRestore: Function,
diff --git a/src/components/index/UnlockModal.vue b/src/components/index/UnlockModal.vue
index 9ecec62..84506a0 100644
--- a/src/components/index/UnlockModal.vue
+++ b/src/components/index/UnlockModal.vue
@@ -1,11 +1,25 @@
 <template>
   <Modal :close="close" :visible="visible">
     <template v-slot:header>
-      <h2>Unlock wallet</h2>
+      <h2>{{ migrationFailed ? 'Migration Failed' : 'Unlock wallet' }}</h2>
     </template>
 
     <template v-slot:body>
-      <div class="pt-15">
+      <div v-if="migrationFailed" class="pt-15">
+        <div class="flex items-start leading-8 text-gray mb-14">
+          <p>Wallet migration to the new format failed. Please copy your private key below and reset your wallet to continue.</p>
+        </div>
+        <div class="form-group">
+          <label>wallet address</label>
+          <span class="break-all">{{ address }}</span>
+        </div>
+        <div class="form-group mb-25">
+          <label>PRIVATE KEY</label>
+          <span class="font-mono break-all text-sm2">{{ legacyPrivateKey }}</span>
+        </div>
+      </div>
+
+      <div v-else class="pt-15">
         <form>
           <div v-if="walletVersion < 2" class="form-group">
             <label>wallet address</label>
@@ -34,7 +48,15 @@
     </template>
 
     <template v-slot:footer>
-      <div class="grid grid-cols-1 gap-24 px-24 pt-48 border-gray-700 border-solid md:grid-cols-2 border-t-default border-opacity-30 pb-54">
+      <div v-if="migrationFailed" class="px-24 pt-48 border-gray-700 border-solid border-t-default border-opacity-30 pb-54">
+        <button
+          class="w-full border-red-600 button button--outline-success hover:border-red-600 hover:bg-red-600"
+          @click="switchToForgetModal"
+        >
+          Reset wallet
+        </button>
+      </div>
+      <div v-else class="grid grid-cols-1 gap-24 px-24 pt-48 border-gray-700 border-solid md:grid-cols-2 border-t-default border-opacity-30 pb-54">
         <button
           class="w-full border-red-600 button button--outline-success hover:border-red-600 hover:bg-red-600"
           @click="switchToForgetModal"
@@ -48,7 +70,6 @@
 </template>
 
 <script>
-import * as xe from '@edge/xe-utils'
 import * as storage from '../../utils/storage'
 import * as validation from '../../utils/validation'
 import { LockOpenIcon } from '@heroicons/vue/outline'
@@ -65,7 +86,9 @@ export default {
   data() {
     return {
       password: '',
-      passwordError: ''
+      passwordError: '',
+      migrationFailed: false,
+      legacyPrivateKey: ''
     }
   },
   validations() {
@@ -106,22 +129,48 @@ export default {
       if (!await this.v$.$validate()) return
       if (!await this.checkPassword()) return
 
-      // Migrate vault from older versions if needed
-      if (await storage.needsMigration()) {
-        await storage.migrateToV2(this.password)
+      // Attempt migration from older versions
+      try {
+        if (await storage.needsMigration()) {
+          await storage.migrateToV2(this.password)
+        }
+      }
+      catch (err) {
+        // Migration failed — old data preserved (write-verify-delete pattern)
+        // Show private key so user can export and reset
+        console.error('Migration failed:', err)
+        this.legacyPrivateKey = await storage.getLegacyPrivateKey(this.password)
+        if (this.legacyPrivateKey) {
+          this.migrationFailed = true
+        } else {
+          this.passwordError = 'Migration failed and wallet data could not be read.'
+        }
+        return
       }
 
-      const publicKey = await storage.getPublicKey(this.password)
-      const highestVersion = storage.getHighestWalletVersion()
-      const address = xe.wallet.deriveAddress(publicKey)
-      this.$store.commit('setAddress', address)
-      this.$store.commit('setVersion', highestVersion)
-      this.$store.commit('unlock')
+      try {
+        // Use actual stored version (reflects migration success)
+        this.$store.commit('setVersion', await storage.getWalletVersion())
+        this.$store.commit('unlock')
 
-      await this.$store.dispatch('loadWallets', this.password)
-      this.$store.dispatch('refresh')
+        // loadWallets derives addresses from vault (v2) or state (legacy)
+        await this.$store.dispatch('loadWallets', this.password)
 
-      this.afterUnlock()
+        // Verify wallet loaded before navigating away
+        if (!this.$store.state.address) {
+          this.$store.commit('lock')
+          this.passwordError = 'Failed to load wallet data. Please try again.'
+          return
+        }
+
+        this.$store.dispatch('refresh')
+        this.afterUnlock()
+      }
+      catch (err) {
+        // Roll back unlock state so user stays on unlock screen
+        this.$store.commit('lock')
+        this.passwordError = err.message || 'An error occurred while unlocking.'
+      }
     },
     unlockOnEnter(event) {
       if (event.charCode !== 13) return
diff --git a/src/components/wallet/WalletIndicator.vue b/src/components/wallet/WalletIndicator.vue
index 116ae50..4b90dde 100644
--- a/src/components/wallet/WalletIndicator.vue
+++ b/src/components/wallet/WalletIndicator.vue
@@ -98,7 +98,7 @@ export default {
   methods: {
     truncateAddress(addr) {
       if (!addr || addr.length < 11) return addr || ''
-      return `${addr.slice(0, 6)}...${addr.slice(-4)}`
+      return `${addr.slice(0, 7)}...${addr.slice(-4)}`
     },
     toggleDropdown() {
       this.showDropdown = !this.showDropdown
@@ -189,7 +189,7 @@ export default {
 }
 
 .wallet-indicator__address {
-  @apply font-mono text-sm;
+  @apply text-base3;
 }
 
 .wallet-indicator__chevron {
diff --git a/src/components/wallet/WalletListItem.vue b/src/components/wallet/WalletListItem.vue
index 986998a..7dceb33 100644
--- a/src/components/wallet/WalletListItem.vue
+++ b/src/components/wallet/WalletListItem.vue
@@ -27,7 +27,7 @@
 
       <span class="wallet-item__balance">
         <svg
-          v-if="loading"
+          v-if="loading && balance == null"
           class="wallet-item__spinner"
           viewBox="0 0 24 24"
           fill="none"
@@ -126,7 +126,7 @@ export default {
     truncatedAddress() {
       const addr = this.wallet.address || ''
       if (addr.length < 11) return addr
-      return `${addr.slice(0, 6)}...${addr.slice(-4)}`
+      return `${addr.slice(0, 7)}...${addr.slice(-4)}`
     },
     formattedBalance() {
       if (this.balance === undefined || this.balance === null) return '-.--'
@@ -202,7 +202,7 @@ export default {
 }
 
 .wallet-item__address {
-  @apply font-mono text-sm text-gray-400 leading-tight;
+  @apply text-sm2 text-gray-400 leading-tight;
 }
 
 .wallet-item--active .wallet-item__address {
@@ -216,6 +216,7 @@ export default {
 
 .wallet-item__balance {
   @apply ml-auto text-right text-sm flex-shrink-0 pl-16 text-gray-400;
+  min-width: 90px;
 }
 
 .wallet-item--active .wallet-item__balance {
diff --git a/src/store.js b/src/store.js
index c868791..f938645 100644
--- a/src/store.js
+++ b/src/store.js
@@ -30,9 +30,9 @@ const init = async () => {
     }
   })()
 
-  // If wallet-version exists (> 0), a wallet exists
-  // empty() clears all keys including wallet-version
-  const hasWallet = version > 0
+  // Detect wallet presence: v1/v2 have wallet-version set,
+  // v0 has no wallet-version but may have keys (p1) in IndexedDB
+  const hasWallet = version > 0 || await storage.needsMigration()
 
   return createStore({
     state: {
@@ -45,6 +45,7 @@ const init = async () => {
       nextNonce: 0,
 
       usdBalance: undefined,
+      usdPerXE: null,
 
       // TODO investigate whether we can set these in app mixin instead
       config: {
@@ -98,6 +99,9 @@ const init = async () => {
       setUSDBalance(state, usdBalance) {
         state.usdBalance = usdBalance
       },
+      setUsdPerXE(state, rate) {
+        state.usdPerXE = rate
+      },
       setVersion(state, version) {
         state.version = version
       },
@@ -168,6 +172,10 @@ const init = async () => {
 
           commit('setBalance', info.balance)
           commit('setNextNonce', info.nonce)
+          // Keep dropdown cache in sync
+          if (state.activeWalletId) {
+            commit('setWalletBalance', { walletId: state.activeWalletId, balance: info.balance })
+          }
           dispatch('refreshTokenValue')
         } catch (err) {
           // Ignore abort errors - these are expected during wallet switching
@@ -185,6 +193,7 @@ const init = async () => {
       },
       async refreshTokenValue({ commit, state }) {
         const tokenValue = await fetchTokenValue()
+        commit('setUsdPerXE', tokenValue.usdPerXE)
         commit('setUSDBalance', tokenValue.usdPerXE * (state.balance / 1e6))
       },
       async switchWallet({ commit, dispatch, state }, walletId) {
@@ -209,10 +218,16 @@ const init = async () => {
         commit('setActiveWalletId', walletId)
         commit('setAddress', wallet.address)
 
-        // Reset balance/nonce (will be fetched fresh)
-        commit('setBalance', 0)
+        // Use cached dropdown balance if available, otherwise reset to 0
+        const cachedBalance = state.walletBalances[walletId]
+        commit('setBalance', cachedBalance != null ? cachedBalance : 0)
         commit('setNextNonce', 0)
-        commit('setUSDBalance', undefined)
+        // Compute USD from cached rate and balance
+        if (cachedBalance != null && state.usdPerXE != null) {
+          commit('setUSDBalance', state.usdPerXE * (cachedBalance / 1e6))
+        } else {
+          commit('setUSDBalance', undefined)
+        }
 
         // Persist active wallet selection (plain storage, no password needed)
         await storage.setActiveWalletId(walletId)
diff --git a/src/utils/storage/migration-integration.test.js b/src/utils/storage/migration-integration.test.js
index 4cd1b05..2859800 100644
--- a/src/utils/storage/migration-integration.test.js
+++ b/src/utils/storage/migration-integration.test.js
@@ -7,7 +7,7 @@
  * These tests do NOT mock v0/v1 - they test actual data formats.
  */
 
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { clear, get } from 'idb-keyval'
 import { store, setWalletVersion, getWalletVersion } from './'
 import * as v0 from './v0'
@@ -241,6 +241,99 @@ describe('migration integration (real encryption)', () => {
     })
   })
 
+  describe('migration failure recovery', () => {
+    // Tests the safety guarantees that UnlockModal relies on:
+    // When migrateToV2 fails, original data must be preserved so
+    // getLegacyPrivateKey can still retrieve the key for export.
+
+    describe('v1 vault creation failure', () => {
+      beforeEach(async () => {
+        await v1.setPublicKey(wallet.publicKey)
+        await v1.setPrivateKey(wallet.privateKey, correctPassword)
+        await v1.setPassword(correctPassword)
+        await setWalletVersion(1)
+      })
+
+      it('preserves v1 data when vault creation throws', async () => {
+        // Simulate crypto failure during vault creation
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        // Version must not have changed
+        expect(await getWalletVersion()).toBe(1)
+
+        // v1 keys must still be readable
+        expect(await v1.getPrivateKey(correctPassword)).toBe(wallet.privateKey)
+        expect(await v1.getPublicKey()).toBe(wallet.publicKey)
+      })
+
+      it('getLegacyPrivateKey works after failed migration', async () => {
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        // Emergency recovery must still work
+        const key = await getLegacyPrivateKey(correctPassword)
+        expect(key).toBe(wallet.privateKey)
+      })
+
+      it('needsMigration still returns true after failed migration', async () => {
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        // Retry should be possible
+        expect(await needsMigration()).toBe(true)
+      })
+
+      it('migration succeeds on retry after previous failure', async () => {
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        // Spy was consumed by mockRejectedValueOnce — real createVault runs now
+        const result = await migrateToV2(correctPassword)
+        expect(result.address).toBe(wallet.address)
+
+        const migratedKey = await v2.getPrivateKey(correctPassword)
+        expect(migratedKey).toBe(wallet.privateKey)
+        expect(await getWalletVersion()).toBe(2)
+      })
+    })
+
+    describe('v0 vault creation failure', () => {
+      beforeEach(async () => {
+        await v0.setPublicKey(wallet.publicKey)
+        await v0.setPrivateKey(wallet.privateKey)
+        await v0.setPassword(correctPassword)
+        // v0 has no wallet-version key (version === 0)
+      })
+
+      it('preserves v0 data when vault creation throws', async () => {
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        // Version must still be 0 (no wallet-version key)
+        expect(await getWalletVersion()).toBe(0)
+
+        // v0 keys must still be readable
+        expect(await v0.getPrivateKey()).toBe(wallet.privateKey)
+        expect(await v0.getPublicKey()).toBe(wallet.publicKey)
+      })
+
+      it('getLegacyPrivateKey works after failed v0 migration', async () => {
+        vi.spyOn(v2, 'createVault').mockRejectedValueOnce(new Error('Simulated encryption failure'))
+
+        await expect(migrateToV2(correctPassword)).rejects.toThrow()
+
+        const key = await getLegacyPrivateKey(correctPassword)
+        expect(key).toBe(wallet.privateKey)
+      })
+    })
+  })
+
   describe('getLegacyPrivateKey (emergency recovery)', () => {
     it('can recover v0 key', async () => {
       await v0.setPrivateKey(wallet.privateKey)
diff --git a/src/views/Overview.vue b/src/views/Overview.vue
index 282dff2..7104d43 100644
--- a/src/views/Overview.vue
+++ b/src/views/Overview.vue
@@ -16,18 +16,13 @@
 
         <div class="mt-35">
           <h3>Recent transactions</h3>
-          <p v-if="loading">
-            Loading...
-          </p>
           <p v-if="error">{{error}}</p>
 
-          <p v-if="!loading">
-            <Overviews :overviews="overviews" :transactions="transactions" />
-          </p>
+          <Overviews :overviews="overviews" :transactions="transactions" />
         </div>
 
-        <div class="w-full text-right" v-if="transactions.length">
-          <a href="/transactions" class="button button--success">View all</a>
+        <div class="w-full text-right mt-20" v-if="transactions.length">
+          <router-link to="/transactions" class="button button--success">View all</router-link>
         </div>
       </div>
     </div>
@@ -48,6 +43,8 @@ import relativeTime from 'dayjs/plugin/relativeTime'
 
 dayjs.extend(relativeTime)
 
+const txCache = {}
+
 export default {
   name: 'ViewOverview',
   title: 'Overview',
@@ -71,6 +68,18 @@ export default {
     TestnetFaucet
   },
   computed: mapState(['address']),
+  watch: {
+    address(newAddr) {
+      const cached = txCache[newAddr]
+      if (cached) {
+        this.transactions = cached.transactions
+        this.metadata = cached.metadata
+      } else {
+        this.transactions = []
+      }
+      this.updateTransactions()
+    }
+  },
   mounted() {
     this.initialise()
   },
@@ -83,12 +92,17 @@ export default {
       this.pollData()
     },
     async updateTransactions() {
-      const { transactions, metadata } = await fetchTransactions(this.address, { limit: 5 })
+      const addr = this.address
+      if (!addr) return
+      const { transactions, metadata } = await fetchTransactions(addr, { limit: 5 })
 
-      // Update this.transactions & this.metadata only once promise has resolved
-      this.transactions = transactions
-      this.metadata = metadata
-      this.loading = false
+      txCache[addr] = { transactions, metadata }
+      // Only update display if address hasn't changed during fetch
+      if (this.address === addr) {
+        this.transactions = transactions
+        this.metadata = metadata
+        this.loading = false
+      }
     },
     pollData() {
       this.polling = setInterval(() => {