diff --git a/docs/offline.html b/docs/offline.html
index 3398d97..7fa7fcf 100644
--- a/docs/offline.html
+++ b/docs/offline.html
@@ -47,7 +47,7 @@
             <b-nav-item size="sm" @click="settings.tabIndex = 2; saveSettings();" :active="settings.tabIndex == 2" active-class="active" v-b-popover.hover="'ERC-20'">ERC-20</b-nav-item>
             <b-nav-item size="sm" @click="settings.tabIndex = 3; saveSettings();" :active="settings.tabIndex == 3" active-class="active" v-b-popover.hover="'ERC-721'">ERC-721</b-nav-item>
             <b-nav-item size="sm" @click="settings.tabIndex = 4; saveSettings();" :active="settings.tabIndex == 4" active-class="active" v-b-popover.hover="'Sign and check messages'">Messages</b-nav-item>
-            <b-nav-item size="sm" @click="settings.tabIndex = 5; saveSettings();" :active="settings.tabIndex == 5" active-class="active" v-b-popover.hover="'Explore Mnemonic and Private Key Wallets'">Wallet</b-nav-item>
+            <b-nav-item size="sm" @click="settings.tabIndex = 5; saveSettings();" :active="settings.tabIndex == 5" active-class="active" v-b-popover.hover="'Explore Mnemonic and Private Key Wallets'">Wallet Tool</b-nav-item>
             <!-- <b-nav-item size="sm" @click="settings.tabIndex = 2; saveSettings();" :active="settings.tabIndex == 2" active-class="active" v-b-popover.hover="'Accounts'">Accounts</b-nav-item> -->
             <!-- <b-avatar v-if="coinbase && coinbase != nameOrAddress(coinbase)" rounded variant="light" size="3.0rem" :src="'https://metadata.ens.domains/mainnet/avatar/' + nameOrAddress(coinbase, 100)" v-b-popover.hover="'Your ENS avatar if set'"></b-avatar> -->
             <!-- <b-button size="sm" variant="outline-primary" class="ml-1" @click="connectToWeb3(); processNewBlock(0);" v-b-popover.hover.bottom="'Click to update wallet'">{{ coinbase ? nameOrAddress(coinbase, 16) : 'Connect' }}</b-button> -->
@@ -65,7 +65,7 @@
           </b-card>
 
           <!-- :MODALGENERATEMNEMONIC -->
-          <b-modal id="modal-generatemnemonic" hide-footer size="sm">
+          <!-- <b-modal id="modal-generatemnemonic" hide-footer size="sm">
             <template #modal-title>
               Generate New Mnemonic
             </template>
@@ -75,7 +75,7 @@
             <b-form-group label="" label-for="modal-generatemnemonic-generate" label-size="sm" label-cols-sm="6" label-align-sm="right" class="mx-0 my-1 p-0">
               <b-button size="sm" id="modal-generatemnemonic-generate" @click="generateRandomMnemonic()" variant="primary">Generate</b-button>
             </b-form-group>
-          </b-modal>
+          </b-modal> -->
 
           <!-- :MODALLOADPRIVATEKEYFROMKEYSTORE -->
           <b-modal id="modal-loadprivatekeyfromkeystore" hide-footer size="lg">
@@ -101,7 +101,7 @@
             <b-form-group label="Keystore File Password:" label-for="modal-saveprivatekeytokeystore-password" label-size="sm" label-cols-sm="5" label-align-sm="right" class="mx-0 my-1 p-0">
               <b-form-input type="password" autocomplete="current-password" size="sm" id="modal-saveprivatekeytokeystore-password" v-model="wallet.keystoreFilePassword"></b-form-input>
             </b-form-group>
-            <b-form-group label="" label-for="modal-saveprivatekeytokeystore-save" label-size="sm" label-cols-sm="5" label-align-sm="right" description="Encrypting will take around half a minute" class="mx-0 my-1 p-0">
+            <b-form-group label="" label-for="modal-saveprivatekeytokeystore-save" label-size="sm" label-cols-sm="5" label-align-sm="right" description="The encryption process may take up to half a minute" class="mx-0 my-1 p-0">
               <b-button size="sm" :disabled="!wallet.keystoreFilePassword" id="modal-saveprivatekeytokeystore-save" @click="savePrivateKeyToKeystore()" variant="primary">Save</b-button>
             </b-form-group>
           </b-modal>
@@ -145,19 +145,10 @@
                 </font>
               </template>
               <template #cell(path)="data">
-                <font size="-1">
-                  {{ data.item.path }}
-                </font>
+                {{ data.item.path }}
               </template>
               <template #cell(address)="data">
-                <font size="-1">
-                  {{ data.item.address }}
-                </font>
-              </template>
-              <template #cell(privateKey)="data">
-                <font size="-1">
-                  {{ data.item.privateKey.substring(0, 10) + '...' + data.item.privateKey.slice(-8) }}
-                </font>
+                {{ data.item.address }}
               </template>
             </b-table>
           </b-modal>
@@ -215,7 +206,7 @@
             <b-form-group label="Confirm Password:" label-for="newwalletfromprivatekey-confirmpassword" label-size="sm" label-cols-sm="3" label-align-sm="right" description="Confirm password above" class="mx-0 my-1 p-0">
               <b-form-input type="password" size="sm" id="newwalletfromprivatekey-confirmpassword" v-model.trim="newWalletFromPrivateKey.confirmPassword" style="max-width: 300px;"></b-form-input>
             </b-form-group>
-            <b-form-group label="" label-for="newwalletfromprivatekey-add" label-size="sm" label-cols-sm="3" label-align-sm="right" description="Encrypting will take around half a minute" class="mx-0 my-1 p-0">
+            <b-form-group label="" label-for="newwalletfromprivatekey-add" label-size="sm" label-cols-sm="3" label-align-sm="right" description="The encryption process may take up to half a minute" class="mx-0 my-1 p-0">
               <b-button size="sm" :disabled="!newWalletFromPrivateKey.address || !newWalletFromPrivateKey.password || (newWalletFromPrivateKey.password != newWalletFromPrivateKey.confirmPassword)" id="newwalletfromprivatekey-add" @click="newWalletFromPrivateKeyAdd()" variant="primary">Add</b-button>
             </b-form-group>
           </b-modal>
@@ -408,8 +399,10 @@
 
           </b-card>
 
-          <b-card v-if="settings.tabIndex == 5" class="m-0 p-0 border-0" body-class="m-1 p-0">
-            <b-form-group label-cols-lg="1" label="Wallet" label-size="md" label-class="font-weight-bold pt-0" class="mt-3 mb-0">
+          <!-- :WALLETTOOL -->
+          <b-card v-if="settings.tabIndex == 5" sub-title="Wallet Tool" bg-variant="light" class="p-0 m-1" style="max-width: 1000px;">
+          <!-- <b-card v-if="settings.tabIndex == 5" class="m-0 p-0 border-0" body-class="m-1 p-0"> -->
+            <!-- <b-form-group label-cols-lg="1" label="Wallet Tool" label-size="md" label-class="font-weight-bold pt-0" class="mt-3 mb-0"> -->
               <b-card bg-variant="light" no-body class="p-0 m-1">
                 <b-tabs card align="left" no-body v-model="wallet.tab" active-tab-class="m-0 p-0">
                   <b-tab v-for="t in tabs" :key="'dyn-tabx-' + t.name" @click="updateURL(t.name);" :title="t.text" title-item-class="p-0" title-link-class="mt-2 px-3">
@@ -419,9 +412,37 @@
                   <b-form-group v-if="wallet.tab == 0" label="Phrase:" label-for="wallet-mnemonicphrase" label-size="sm" label-cols-sm="2" label-align-sm="right" :state="!wallet.mnemonic.phraseError" :invalid-feedback="wallet.mnemonic.phraseError" class="mx-0 my-2 p-0">
                     <b-form-textarea size="sm" id="wallet-mnemonicphrase" v-model="wallet.mnemonic.phrase" @change="generateDerivedAddresses();" rows="3" placeholder="Type/paste your mnemnonic seed phrase here or click [Generate New]" style="max-width: 800px;"></b-form-textarea>
                   </b-form-group>
-                  <b-form-group v-if="wallet.tab == 0" label="" label-for="wallet-showgeneratemnemonicmodal" label-size="sm" label-cols-sm="2" label-align-sm="right" class="mx-0 my-1 p-0">
+
+                  <!-- <b-form-group v-if="wallet.tab == 0" label="" label-for="wallet-showgeneratemnemonicmodal" label-size="sm" label-cols-sm="2" label-align-sm="right" class="mx-0 my-1 p-0">
                     <b-button size="sm" id="wallet-showgeneratemnemonicmodal" @click="showGenerateMnemonicModal()" variant="primary">Generate New</b-button>
+                  </b-form-group> -->
+
+                  <!-- <b-form-group label="" label-for="newwalletfrommnemonic-generaterandom" label-size="sm" label-cols-sm="3" label-align-sm="right" class="mx-0 my-1 p-0">
+                    <b-input-group style="max-width: 300px;">
+                      <b-form-select size="sm" v-model="newWalletFromMnemonic.randomBytesLength" :options="randomBytesLengthMnemonicWordsOptions"></b-form-select>
+                      <b-input-group-append>
+                        <b-button size="sm" id="newwalletfrommnemonic-generaterandom" @click="newWalletFromMnemonicGenerateRandom()" variant="primary">Generate Random</b-button>
+                      </b-input-group-append>
+                    </b-input-group>
+                  </b-form-group> -->
+
+                  <b-form-group label="" label-for="wallet-generaterandom" label-size="sm" label-cols-sm="2" label-align-sm="right" class="mx-0 my-1 p-0">
+                    <b-input-group style="max-width: 300px;">
+                      <b-form-select size="sm" v-model="wallet.randomBytesLength" :options="randomBytesLengthMnemonicWordsOptions"></b-form-select>
+                      <b-input-group-append>
+                        <b-button size="sm" id="wallet-generaterandom" @click="generateRandomMnemonic()" variant="primary">Generate Random</b-button>
+                      </b-input-group-append>
+                    </b-input-group>
                   </b-form-group>
+
+                  <!-- <b-form-group label="Number of words:" label-for="modal-generatemnemonic-numberofwords" label-size="sm" label-cols-sm="6" label-align-sm="right" class="mx-0 my-1 p-0">
+                    <b-form-select size="sm" id="modal-generatemnemonic-numberofwords" v-model="wallet.randomBytesLength" :options="randomBytesLengthMnemonicWordsOptions"></b-form-select>
+                  </b-form-group>
+                  <b-form-group label="" label-for="modal-generatemnemonic-generate" label-size="sm" label-cols-sm="6" label-align-sm="right" class="mx-0 my-1 p-0">
+                    <b-button size="sm" id="modal-generatemnemonic-generate" @click="generateRandomMnemonic()" variant="primary">Generate</b-button>
+                  </b-form-group> -->
+
+
                   <b-form-group v-if="wallet.tab == 0" label="Passphrase:" label-for="wallet-mnemonicpassphrase" label-size="sm" label-cols-sm="2" label-align-sm="right" class="mx-0 my-2 p-0">
                     <b-form-input type="text" size="sm" id="wallet-mnemonicpassphrase" v-model="wallet.mnemonic.passphrase" @change="generateDerivedAddresses();" placeholder="Optional" style="max-width: 300px;"></b-form-input>
                   </b-form-group>
@@ -490,7 +511,7 @@
                   </b-form-group>
                 </b-card-text>
               </b-card>
-            </b-form-group>
+            <!-- </b-form-group> -->
           </b-card>
 
         </b-card>
@@ -642,7 +663,7 @@
           forceRefresh: 0,
 
           settings: {
-            tabIndex: 0,
+            tabIndex: 5,
             addressesTable: {
               filter: null,
               currentPage: 1,
@@ -720,10 +741,10 @@
           ],
 
           newWalletFromMnemonicAddressesFields: [
-            { key: 'index', label: '#', sortable: false, thStyle: 'width: 5%;', tdClass: 'text-truncate' },
-            { key: 'path', label: 'Path', sortable: false, thStyle: 'width: 15%;', thClass: 'text-left', tdClass: 'text-left' },
-            { key: 'address', label: 'Address', sortable: false, thStyle: 'width: 50%;', thClass: 'text-left', tdClass: 'text-left' },
-            { key: 'privateKey', label: 'Private Key', sortable: false, thStyle: 'width: 30%;', thClass: 'text-left', tdClass: 'text-left' },
+            { key: 'index', label: '#', sortable: false, thStyle: 'width: 10%;', tdClass: 'text-truncate' },
+            { key: 'path', label: 'Path', sortable: false, thStyle: 'width: 30%;', thClass: 'text-left', tdClass: 'text-left' },
+            { key: 'address', label: 'Address', sortable: false, thStyle: 'width: 60%;', thClass: 'text-left', tdClass: 'text-left' },
+            // { key: 'privateKey', label: 'Private Key', sortable: false, thStyle: 'width: 30%;', thClass: 'text-left', tdClass: 'text-left' },
           ],
 
           generatedAddressesFields: [
@@ -900,10 +921,10 @@
             }
           },
 
-          showGenerateMnemonicModal() {
-            console.log(moment().format("HH:mm:ss") + " showGenerateMnemonicModal");
-            this.$bvModal.show('modal-generatemnemonic');
-          },
+          // showGenerateMnemonicModal() {
+          //   console.log(moment().format("HH:mm:ss") + " showGenerateMnemonicModal");
+          //   this.$bvModal.show('modal-generatemnemonic');
+          // },
           showLoadPrivateKeyFromKeystoreModal() {
             console.log(moment().format("HH:mm:ss") + " showLoadPrivateKeyFromKeystoreModal");
             this.$bvModal.show('modal-loadprivatekeyfromkeystore');