diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs
index d4f96f14b..e17f87f1d 100644
--- a/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs
+++ b/src/Features/Blockcore.Features.ColdStaking/UI/NavItem.cs
@@ -4,7 +4,7 @@ namespace Blockcore.Features.Wallet.UI
 {
     public class ColdStakingNavigationItem : INavigationItem
     {
-        public string Name => "ColdStaking";
+        public string Name => "Cold Staking";
 
         public string Navigation => "ColdStaking";
     }
diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor
index f815449cc..75d33774b 100644
--- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor
+++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStake.razor
@@ -11,11 +11,33 @@
 
 @if (!NodeDeployments.GetFlags().ScriptFlags.HasFlag(ScriptVerify.CheckColdStakeVerify))
 {
-    <h2>Coldstaking is not activated</h2>
+    <h2>Cold staking is not activated</h2>
     return;
 }
 
-<h2>Coldstaking Wallets</h2>
+<h2>Cold staking wallets</h2>
+
+<p>Enable cold staking on an existing wallet.</p>
+
+    <hr />
+    <div class="input-group mb-3">
+        <div class="input-group-prepend">
+            <span style="min-width: 10em" class="input-group-text" id="basic-addon1">Wallet Name:</span>
+        </div>
+        <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
+    </div>
+
+    <div class="input-group mb-3">
+        <div class="input-group-prepend">
+            <span style="min-width: 10em" class="input-group-text">Password:</span>
+        </div>
+        <input @bind="Password" type="password" class="form-control" placeholder="password" />
+    </div>
+
+    <div class="input-group mb-3">
+        <button class="btn btn-info" @onclick="CreateColdStakeAccount">Create account</button>
+    </div>
+    <hr />
 
 <p>Information about the deployed wallets.</p>
 
@@ -23,10 +45,10 @@
     <table class="table">
         <thead>
             <tr>
-                <th>Wallet / account</th>
-                <th>Confirmed blanace</th>
+                <th>Wallet / Account</th>
+                <th>Confirmed balance</th>
                 <th>Unconfirmed balance</th>
-                <th>Actione</th>
+                <th>Action</th>
             </tr>
         </thead>
         <tbody>
@@ -66,7 +88,7 @@
                         var hotAccountBalance = ColdStakingManager.GetBalances(walletName, hotStakingAccount.Name).Single();
 
                         <tr>
-                            <td> @walletName <strong>/</strong>@hotStakingAccount.Name</td>
+                            <td> @walletName <strong>/</strong> @hotStakingAccount.Name</td>
                             <td>@hotAccountBalance.AmountConfirmed</td>
                             <td>@hotAccountBalance.AmountUnconfirmed</td>
                             <td>
@@ -94,7 +116,7 @@
                             <td>
                                 @if (accountBalance.AmountConfirmed + accountBalance.AmountUnconfirmed > 0)
                                 {
-                                    <button class="btn btn-link btn-sm" @onclick="() => { NavigateToSetup(walletName); }">Setup</button>
+                                    <button class="btn btn-link btn-sm" @onclick="() => { NavigateToSetup(walletName); }">Delegate</button>
                                 }
                             </td>
                         </tr>
@@ -103,26 +125,6 @@
             }
         </tbody>
     </table>
-    <hr />
-    <div class="input-group mb-3">
-        <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">Wallet Name:</span>
-        </div>
-        <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
-    </div>
-
-    <div class="input-group mb-3">
-        <div class="input-group-prepend">
-            <span class="input-group-text">Password:</span>
-        </div>
-        <input @bind="Password" type="password" class="form-control" placeholder="password" />
-    </div>
-
-    <div class="input-group mb-3">
-        <button class="btn btn-info" @onclick="CreateColdStakeAccount">Create account</button>
-    </div>
-    <hr />
-
 }
 
 @code
@@ -146,8 +148,8 @@
 
     private void CreateColdStakeAccount()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; }
-        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; }
         this.Alert = string.Empty;
 
         this.ColdStakingManager.GetOrCreateColdStakingAccount(this.WalletName, true, this.Password);
diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor
index dccc6db8f..610435b3f 100644
--- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor
+++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeSetup.razor
@@ -20,19 +20,31 @@
 @{
     var accountBalance = this.WalletManager.GetBalances(walletname, "account 0").Single();
 
-    <p>Amount Confirmed: <strong> @accountBalance.AmountConfirmed</strong></p>
-    <p>Amount Unconfirmed: <strong>@accountBalance.AmountUnconfirmed</strong></p>
-    <p>Spendable Amount: <strong> @accountBalance.SpendableAmount</strong></p>
-
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Amount Confirmed</th>
+                <th>Amount Unconfirmed</th>
+                <th>Spendable Amount</th>
+            </tr>
+        </thead>
+        <tbody>
+                    <tr>
+                        <td>@accountBalance.AmountConfirmed</td>
+                        <td>@accountBalance.AmountUnconfirmed</td>
+                        <td>@accountBalance.SpendableAmount</td>
+                    </tr>
+        </tbody>
+    </table>
     <hr />
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">ColdWalletAddress:</span>
+            <span style="min-width: 10em" class="input-group-text" id="basic-addon1">ColdWalletAddress:</span>
         </div>
         <input @bind="ColdWalletAddress" type="text" class="form-control" placeholder="ColdWalletAddress" />
         <div class="input-group-append">
-            <span class="input-group-text">from wallet: @walletname</span>
+            <span style="min-width: 10em" class="input-group-text">from wallet: @walletname</span>
         </div>
     </div>
 
@@ -45,34 +57,34 @@
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">HotWalletAddress:</span>
+            <span style="min-width: 10em" class="input-group-text" id="basic-addon1">HotWalletAddress:</span>
         </div>
         <input @bind="HotWalletAddress" type="text" class="form-control" placeholder="HotWalletAddress" />
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Amount:</span>
+            <span style="min-width: 10em" class="input-group-text">Amount:</span>
         </div>
         <input @bind="Amount" type="text" class="form-control" placeholder="amount" />
         <div class="input-group-append">
-            <span class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
+            <span style="min-width: 10em" class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
         </div>
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Fee:</span>
+            <span style="min-width: 10em" class="input-group-text">Fee:</span>
         </div>
         <input @bind="Fee" type="text" class="form-control" placeholder="fee" />
         <div class="input-group-append">
-            <span class="input-group-text">Optional (default to low)</span>
+            <span style="min-width: 10em" class="input-group-text">Optional (default to low)</span>
         </div>
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Password:</span>
+            <span style="min-width: 10em" class="input-group-text">Password:</span>
         </div>
         <input @bind="Password" type="password" class="form-control" placeholder="password" />
     </div>
@@ -156,9 +168,9 @@
 
     private async Task Setup()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; }
-        if (string.IsNullOrEmpty(this.ColdWalletAddress)) { this.Alert = "No ColdWalletAddress"; return; }
-        if (string.IsNullOrEmpty(this.HotWalletAddress)) { this.Alert = "No HotWalletAddress"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.ColdWalletAddress)) { this.Alert = "Your cold wallet address is missing"; return; }
+        if (string.IsNullOrEmpty(this.HotWalletAddress)) { this.Alert = "Your hot wallet address is missing"; return; }
 
         this.Alert = string.Empty;
 
diff --git a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor
index 385724e17..d79c8d80c 100644
--- a/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor
+++ b/src/Features/Blockcore.Features.ColdStaking/UI/Pages/ColdStakeWithdraw.razor
@@ -30,14 +30,14 @@
     <hr />
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Password:</span>
+            <span style="min-width: 10em" class="input-group-text">Password:</span>
         </div>
         <input @bind="Password" type="password" class="form-control" placeholder="password" />
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">Address:</span>
+            <span style="min-width: 10em" class="input-group-text" id="basic-addon1">Address:</span>
         </div>
         <input @bind="Address" type="text" class="form-control" placeholder="address" />
         <button class="btn btn-light btn-sm" @onclick="GenerateAddress">Get address from: @walletname</button>
@@ -45,21 +45,21 @@
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Amount:</span>
+            <span style="min-width: 10em" class="input-group-text">Amount:</span>
         </div>
         <input @bind="Amount" type="text" class="form-control" placeholder="amount" />
         <div class="input-group-append">
-            <span class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
+            <span style="min-width: 10em" class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
         </div>
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Fee:</span>
+            <span style="min-width: 10em" class="input-group-text">Fee:</span>
         </div>
         <input @bind="Fee" type="text" class="form-control" placeholder="fee" />
         <div class="input-group-append">
-            <span class="input-group-text">Optional (default to low)</span>
+            <span style="min-width: 10em" class="input-group-text">Optional (default to low)</span>
         </div>
     </div>
 
@@ -112,8 +112,8 @@
 
     private async Task Withdraw()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; }
-        if (string.IsNullOrEmpty(this.Address)) { this.Alert = "No Address"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.Address)) { this.Alert = "Please enter a withdrawal address"; return; }
         this.Alert = string.Empty;
 
         try
diff --git a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor
index b773e1c75..66e25c972 100644
--- a/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor
+++ b/src/Features/Blockcore.Features.Miner/UI/Pages/Stake.razor
@@ -35,8 +35,8 @@
     <table class="table table-sm">
         <thead>
             <tr>
-                <th>Wallet/account</th>
-                <th>Blanace</th>
+                <th>Wallet / Account</th>
+                <th>Balance</th>
             </tr>
         </thead>
         <tbody>
@@ -61,14 +61,14 @@
     {
         <div class="input-group mb-3">
             <div class="input-group-prepend">
-                <span class="input-group-text" id="basic-addon1">Wallet Name:</span>
+                <span style="min-width: 10em" class="input-group-text" id="basic-addon1">Wallet Name:</span>
             </div>
             <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
         </div>
 
         <div class="input-group mb-3">
             <div class="input-group-prepend">
-                <span class="input-group-text">Password:</span>
+                <span style="min-width: 10em" class="input-group-text">Password:</span>
             </div>
             <input @bind="Password" type="password" class="form-control" placeholder="password" />
         </div>
@@ -139,8 +139,8 @@
 
     private void StartStaking()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; }
-        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No password"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; }
 
         var wallet = this.WalletManager.GetWallet(this.WalletName);
 
diff --git a/src/Features/Blockcore.Features.NodeHost/UI/Pages/PeersNodes.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/AddNodes.razor
similarity index 91%
rename from src/Features/Blockcore.Features.NodeHost/UI/Pages/PeersNodes.razor
rename to src/Features/Blockcore.Features.NodeHost/UI/Pages/AddNodes.razor
index 7ed6708f3..b2ddc3595 100644
--- a/src/Features/Blockcore.Features.NodeHost/UI/Pages/PeersNodes.razor
+++ b/src/Features/Blockcore.Features.NodeHost/UI/Pages/AddNodes.razor
@@ -1,12 +1,12 @@
-@page "/peers-nodes"
+@page "/add-nodes"
 
 @using Blockcore.Utilities.Extensions
 
 @inject Blockcore.Connection.IConnectionManager ConnectionManager
 
-<h2>Connected peers</h2>
+<h2>Add new nodes</h2>
 
-<p>Information about connected peers.</p>
+<p>Add the IP address of known network peers.</p>
 
 @{
     <div class="input-group mb-3">
diff --git a/src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor
index 9dd077305..042863632 100644
--- a/src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor
+++ b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Logs.razor
@@ -5,7 +5,7 @@
 <h2>Node logs</h2>
 
 @{
-<textarea class="w-100" rows="50">
-@(((Blockcore.FullNode)this.FullNode).LastLogOutput.TrimStart(' '));
-</textarea>
+<pre>
+@(((Blockcore.FullNode)this.FullNode).LastLogOutput.TrimStart(' '))
+</pre>
 }
\ No newline at end of file
diff --git a/src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor
index e3b7b24b4..2fa770b77 100644
--- a/src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor
+++ b/src/Features/Blockcore.Features.NodeHost/UI/Pages/Peers.razor
@@ -9,7 +9,7 @@
 
 @{
     <div class="input-group mb-3">
-        <button class="btn btn-info" @onclick="NavigateToPeernodes">Add nodes</button>
+        <button class="btn btn-info" @onclick="NavigateToAddNodes">Add nodes</button>
     </div>
     <hr />
     <table class="table">
@@ -37,8 +37,8 @@
 
 @code
 {
-    private void NavigateToPeernodes()
+    private void NavigateToAddNodes()
     {
-        NavigationManager.NavigateTo("peers-nodes");
+        NavigationManager.NavigateTo("add-nodes");
     }
 }
\ No newline at end of file
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor
index 7dc90f2cd..a5b8ef2fc 100644
--- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletAccount.razor
@@ -9,28 +9,32 @@
 @inject IWalletManager WalletManager
 @inject Network Network
 
-<button class="btn btn-link" @onclick="() => { NavigateToWallets(); }">
-    Back to wallets
-</button>
-<br />
-
-<h3>Wallet Account</h3>
-<p>Information about <strong>@walletname / @accountname</strong></p>
-
+<h3>Wallet Account: <strong>@walletname / @accountname</strong></h3>
 @{
     var accountBalance = this.WalletManager.GetBalances(walletname, accountname).Single();
 
     <br />
-
-    <p>Amount Confirmed: <strong> @accountBalance.AmountConfirmed</strong></p>
-    <p>Amount Unconfirmed: <strong>@accountBalance.AmountUnconfirmed</strong></p>
-    <p>Spendable Amount: <strong> @accountBalance.SpendableAmount</strong></p>
-
-    <button @onclick="() => { NavigateToReceiveWallet(walletname, accountname); }" class="btn btn-primary">Recieve</button>
+    <button @onclick="() => { NavigateToReceiveWallet(walletname, accountname); }" class="btn btn-primary">Receive</button>
     <button @onclick="() => { NavigateToSendWallet(walletname, accountname); }" class="btn btn-info">Send</button>
-
     <br />
     <br />
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Amount Confirmed</th>
+                <th>Amount Unconfirmed</th>
+                <th>Spendable Amount</th>
+            </tr>
+        </thead>
+        <tbody>
+                    <tr>
+                        <td>@accountBalance.AmountConfirmed</td>
+                        <td>@accountBalance.AmountUnconfirmed</td>
+                        <td>@accountBalance.SpendableAmount</td>
+                    </tr>
+        </tbody>
+    </table>
+    <br />
 
     <h3>Wallet History</h3>
 
@@ -40,10 +44,11 @@
     <table class="table">
         <thead>
             <tr>
-                <th>To Address</th>
-                <th>Amount</th>
-                <th>Confirmed In Block</th>
                 <th>Type</th>
+                <th>Block</th>
+                <th>Amount</th>
+                <th>To Address</th>
+                <th>TxID</th>
             </tr>
         </thead>
         <tbody>
@@ -52,10 +57,11 @@
                 foreach (var transaction in history.TransactionsHistory)
                 {
                     <tr>
-                        <td>@transaction.ToAddress</td>
-                        <td>@transaction.Amount</td>
-                        <td>@transaction.ConfirmedInBlock</td>
                         <td>@transaction.Type</td>
+                        <td>@transaction.ConfirmedInBlock</td>
+                        <td>@transaction.Amount</td>
+                        <td>@transaction.ToAddress</td>
+                        <td>@transaction.Id</td>
                     </tr>
                 }
             }
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor
index 8d627a465..c89bf59d0 100644
--- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletCreate.razor
@@ -1,4 +1,4 @@
-@page "/walletcrate"
+@page "/walletcreate"
 
 @using Blockcore.Features.Wallet.Interfaces
 @using NBitcoin;
@@ -9,50 +9,46 @@
 @inject Blockcore.Utilities.IDateTimeProvider DateTimeProvider
 @inject IWalletSyncManager WalletSyncManager
 
-<button class="btn btn-link" @onclick="() => { NavigateToWallets(); }">
-    Back to wallets
-</button>
-<br />
-
 <h3>Create a Wallet</h3>
-
+<p>Create your wallet by generating a Mnemonic & adding an optional phrase. Then give your wallet a name & password.</p>
 @{
-    <div class="input-group">
+
+    <div class="input-group mb-3">
+        <button class="btn btn-primary" @onclick="GenerateMnemonic">Generate mnemonic</button>
+    </div>
+
+    <div class="input-group mb-3" style="max-width: 90%">
         <div class="input-group-prepend">
-            <span class="input-group-text">Mnemonic</span>
+            <span style="min-width: 15em" class="input-group-text"><b>Mnemonic:</b></span>
         </div>
-        <textarea @bind="Mnemonic" class="form-control" rows="5">@Mnemonic</textarea>
+            <textarea @bind="Mnemonic" class="form-control" rows="2">@Mnemonic</textarea>
     </div>
     <p><strong>Important:</strong> The Mnemonic is your wallet and must be kept safe and secure.</p>
 
-    <div class="input-group mb-3">
+    <div class="input-group mb-3" style="max-width: 90%">
         <div class="input-group-prepend">
-            <span class="input-group-text">Passphrase (optional):</span>
+            <span style="min-width: 15em" class="input-group-text"><b>Passphrase (optional):</b></span>
         </div>
-        <input @bind="Passphrase" type="password" class="form-control" placeholder="passphrase" />
+            <input @bind="Passphrase" type="password" class="form-control" placeholder="passphrase" />
     </div>
-    <p><strong>Important:</strong> The Passphrase is permanently linked to the wallet and must be kept safe and secure.</p>
+     <p><strong>Important:</strong> The Passphrase is permanently linked to the wallet and must be kept safe and secure.</p>
 
-    <div class="input-group mb-3">
-        <button class="btn btn-primary" @onclick="GenerateMnemonic">Generate mnemonic</button>
-    </div>
 
-    <div class="input-group mb-3">
+    <div class="input-group mb-3" style="max-width: 90%">
         <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">Wallet name:</span>
+            <span id="basic-addon1" style="min-width: 15em" class="input-group-text"><b>Wallet name:</b></span>
         </div>
-        <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
+            <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
     </div>
 
-    <div class="input-group mb-3">
+    <div class="input-group mb-3" style="max-width: 90%">
         <div class="input-group-prepend">
-            <span class="input-group-text">Wallet Password:</span>
+            <span style="min-width: 15em" class="input-group-text"><b>Wallet Password:</b></span>
         </div>
-        <input @bind="Password" type="password" class="form-control" placeholder="password" />
+            <input @bind="Password" type="password" class="form-control" placeholder="password" />
     </div>
 
     <button class="btn btn-primary" @onclick="CreateWallet">Create wallet</button>
-    <button class="btn btn-primary" @onclick="RecoverWallet">Recover wallet</button>
 
     <br />
     <div class="input-group mb-3">
@@ -61,13 +57,11 @@
 }
 
 @code {
-
     public string WalletName { get; set; }
     public string AccountName { get; set; }
     public string Mnemonic { get; set; }
     private string Password { get; set; }
     private string Passphrase { get; set; }
-
     string Alert { get; set; }
 
     private void GenerateMnemonic()
@@ -90,28 +84,11 @@
     {
         NavigationManager.NavigateTo("wallets");
     }
-
-    private void RecoverWallet()
-    {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No Password"; return; }
-        if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "No Mnemonic"; return; }
-        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; }
-
-        if (this.Passphrase == null)
-            this.Passphrase = string.Empty;
-
-        this.Alert = string.Empty;
-
-        var wallet = this.WalletManager.RecoverWallet(this.Password, this.WalletName, this.Mnemonic, this.DateTimeProvider.GetUtcNow(), passphrase: this.Passphrase);
-
-        NavigationManager.NavigateTo("walletaccount/" + WalletName + "/account 0");
-    }
-
     private void CreateWallet()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No Password"; return; }
-        if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "No Mnemonic"; return; }
-        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "No WalletName"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "Ensure that you have generated a new Mnemonic"; return; }
+        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; }
 
         if (this.Passphrase == null)
             this.Passphrase = string.Empty;
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor
index 0a97e262b..d3d918f5c 100644
--- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletReceive.razor
@@ -7,11 +7,6 @@
 @inject IWalletManager WalletManager
 @inject NavigationManager NavigationManager
 
-<button class="btn btn-link" @onclick="() => { NavigateToWalletAccount(walletname, accountname); }">
-    Back to wallet account
-</button>
-<br />
-
 <h3>Receive Coins</h3>
 
 <p>Generate receive address for <strong> @walletname / @accountname</strong></p>
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor
new file mode 100644
index 000000000..7992a7148
--- /dev/null
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletRecover.razor
@@ -0,0 +1,94 @@
+@page "/walletrecover"
+
+@using Blockcore.Features.Wallet.Interfaces
+@using NBitcoin;
+@using Blockcore.Features.Wallet.Api.Controllers
+
+@inject NavigationManager NavigationManager
+@inject IWalletManager WalletManager
+@inject Blockcore.Utilities.IDateTimeProvider DateTimeProvider
+@inject IWalletSyncManager WalletSyncManager
+
+<h3>Recover a Wallet</h3>
+<p>Recover your wallet by entering your Mnemonic & your passphrase. Then give your wallet a name & password.</p>
+@{
+    <div class="input-group">
+        <div class="input-group-prepend">
+            <span style="min-width: 15em" class="input-group-text">Mnemonic</span>
+        </div>
+        <textarea @bind="Mnemonic" class="form-control" rows="2">@Mnemonic</textarea>
+    </div>
+    <p><strong>Reminder:</strong> The Mnemonic is your wallet and must be kept safe and secure.</p>
+
+    <div class="input-group mb-3">
+        <div class="input-group-prepend">
+            <span style="min-width: 15em" class="input-group-text">Passphrase (optional):</span>
+        </div>
+        <input @bind="Passphrase" type="password" class="form-control" placeholder="passphrase" />
+    </div>
+    <p><strong>Reminder:</strong> The Passphrase is permanently linked to the wallet and must be kept safe and secure.</p>
+
+    <div class="input-group mb-3">
+        <div class="input-group-prepend">
+            <span style="min-width: 15em" class="input-group-text" id="basic-addon1">Wallet name:</span>
+        </div>
+        <input @bind="WalletName" type="text" class="form-control" placeholder="wallet name" />
+    </div>
+
+    <div class="input-group mb-3">
+        <div class="input-group-prepend">
+            <span style="min-width: 15em" class="input-group-text">Wallet Password:</span>
+        </div>
+        <input @bind="Password" type="password" class="form-control" placeholder="password" />
+    </div>
+
+    <button class="btn btn-primary" @onclick="RecoverWallet">Recover wallet</button>
+
+    <br />
+    <div class="input-group mb-3">
+        <div class="alert-warning">@Alert</div>
+    </div>
+}
+
+@code {
+
+    public string WalletName { get; set; }
+    public string AccountName { get; set; }
+    public string Mnemonic { get; set; }
+    private string Password { get; set; }
+    private string Passphrase { get; set; }
+
+    string Alert { get; set; }
+
+    private void NavigateToReceiveWallet(string walletName, string accountname)
+    {
+        NavigationManager.NavigateTo("walletreceive/" + walletName + "/" + accountname);
+    }
+
+    private void NavigateToSendWallet(string walletName, string accountname)
+    {
+        NavigationManager.NavigateTo("walletsend/" + walletName + "/" + accountname);
+    }
+
+    private void NavigateToWallets()
+    {
+        NavigationManager.NavigateTo("wallets");
+    }
+
+    private void RecoverWallet()
+    {
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.Mnemonic)) { this.Alert = "Ensure that you have entered your Mnemonic"; return; }
+        if (string.IsNullOrEmpty(this.WalletName)) { this.Alert = "Please enter a wallet name"; return; }
+
+        if (this.Passphrase == null)
+            this.Passphrase = string.Empty;
+
+        this.Alert = string.Empty;
+
+        var wallet = this.WalletManager.RecoverWallet(this.Password, this.WalletName, this.Mnemonic, this.DateTimeProvider.GetUtcNow(), passphrase: this.Passphrase);
+
+        NavigationManager.NavigateTo("walletaccount/" + WalletName + "/account 0");
+    }
+
+}
\ No newline at end of file
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor
index c67b46660..2ce1d9d7b 100644
--- a/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/WalletSend.razor
@@ -14,14 +14,7 @@
 @inject IWalletTransactionHandler WalletTransactionHandler
 @inject IBroadcasterManager BroadcasterManager
 
-<button class="btn btn-link" @onclick="() => { NavigateToWalletAccount(walletname, accountname); }">
-    Back to wallet account
-</button>
-<br />
-
-<h3>Send Coins</h3>
-
-<p>Send coins from account <strong> @walletname / @accountname</strong></p>
+<h3>Send Coins: <strong>@walletname / @accountname</strong></h3>
 
 @{
 
@@ -29,40 +22,54 @@
 
     <br />
 
-    <p>Amount Confirmed: <strong> @accountBalance.AmountConfirmed</strong></p>
-    <p>Amount Unconfirmed: <strong>@accountBalance.AmountUnconfirmed</strong></p>
-    <p>Spendable Amount: <strong> @accountBalance.SpendableAmount</strong></p>
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Amount Confirmed</th>
+                <th>Amount Unconfirmed</th>
+                <th>Spendable Amount</th>
+            </tr>
+        </thead>
+        <tbody>
+                    <tr>
+                        <td>@accountBalance.AmountConfirmed</td>
+                        <td>@accountBalance.AmountUnconfirmed</td>
+                        <td>@accountBalance.SpendableAmount</td>
+                    </tr>
+        </tbody>
+    </table>
+
     <hr />
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text" id="basic-addon1">To Address:</span>
+            <span style="min-width: 15em" class="input-group-text" id="basic-addon1">To Address:</span>
         </div>
         <input @bind="Address" type="text" class="form-control" placeholder="address" />
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Amount:</span>
+            <span style="min-width: 15em" class="input-group-text">Amount:</span>
         </div>
         <input @bind="Amount" type="text" class="form-control" placeholder="amount" />
         <div class="input-group-append">
-            <span class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
+            <span style="min-width: 15em" class="input-group-text">@this.Network.CoinTicker.ToUpper()</span>
         </div>
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Fee:</span>
+            <span style="min-width: 15em" class="input-group-text">Fee:</span>
         </div>
         <input @bind="Fee" type="text" class="form-control" placeholder="fee" />
         <div class="input-group-append">
-            <span class="input-group-text">Optional (default to low)</span>
+            <span style="min-width: 15em" class="input-group-text">Optional (default to low)</span>
         </div>
     </div>
 
     <div class="input-group mb-3">
         <div class="input-group-prepend">
-            <span class="input-group-text">Wallet Password:</span>
+            <span style="min-width: 15em" class="input-group-text">Wallet Password:</span>
         </div>
         <input @bind="Password" type="password" class="form-control" placeholder="password" />
     </div>
@@ -82,7 +89,7 @@
 
     <div class="input-group">
         <div class="input-group-prepend">
-            <span class="input-group-text">Raw Transaction</span>
+            <span style="min-width: 15em" class="input-group-text">Raw Transaction</span>
         </div>
         <textarea @bind="TransactionHex" class="form-control" rows="5">@TransactionHex</textarea>
     </div>
@@ -151,13 +158,13 @@
 
     private async Task Broadcast()
     {
-        if (string.IsNullOrEmpty(this.TransactionHex)) { this.Alert = "No trx"; return; }
+        if (string.IsNullOrEmpty(this.TransactionHex)) { this.Alert = "No transaction details, please click send coins first"; return; }
 
         this.Alert = string.Empty;
 
         if (!this.ConnectionManager.ConnectedPeers.Any())
         {
-            this.Alert = "No peers connected";
+            this.Alert = "No peers connected. You need connections before a transaction can be brodcast to the network.";
             return;
         }
 
@@ -169,7 +176,7 @@
 
         if (transactionBroadCastEntry.TransactionBroadcastState == TransactionBroadcastState.FailedBroadcast)
         {
-            this.Alert = "Error occurred: " + transactionBroadCastEntry.ErrorMessage;
+            this.Alert = "An error occurred: " + transactionBroadCastEntry.ErrorMessage;
             return;
         }
 
@@ -178,10 +185,10 @@
 
     private void SendCoins()
     {
-        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "No password"; return; }
-        if (string.IsNullOrEmpty(this.Address)) { this.Alert = "No address"; return; }
-        if (this.Amount == 0) { this.Alert = "No amount"; return; }
-        if (this.Fee == 0) { this.Alert = "No fee"; return; }
+        if (string.IsNullOrEmpty(this.Password)) { this.Alert = "Please enter a password"; return; }
+        if (string.IsNullOrEmpty(this.Address)) { this.Alert = "Please enter a valid address"; return; }
+        if (this.Amount == 0) { this.Alert = "Please enter the number of coins you want to send"; return; }
+        if (this.Fee == 0) { this.Alert = "Please ensure you enter a fee"; return; }
 
         this.Alert = string.Empty;
 
diff --git a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor
index 44dafaf00..16f9099d0 100644
--- a/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor
+++ b/src/Features/Blockcore.Features.Wallet/UI/Pages/Wallets.razor
@@ -17,21 +17,18 @@
 <p>Information about the deployed wallets.</p>
 
 @{
-
     <p>Wallet Tip: <strong> @this.WalletSyncManager.WalletTip.Height / @ChainIndexer.Height</strong></p>
 
     <button @onclick="NavigateToWalletCreate" class="btn btn-primary">Create Wallet</button>
-    <button @onclick="Resync" class="btn btn-primary">Resync Wallets from genesis</button>
-    <button @onclick="Rebroadcast" class="btn btn-primary">Rebroadcast unconfirmed</button>
-
-    <br />
-    <br />
-    <hr />
+    <button @onclick="NavigateToWalletRecover" class="btn btn-primary">Recover Wallet</button>
+    <button @onclick="Resync" class="btn btn-primary">Resync wallets from genesis</button>
+    <button @onclick="Rebroadcast" class="btn btn-primary">Re-broadcast unconfirmed</button>
+    <br /><br />
     <table class="table">
         <thead>
             <tr>
-                <th>Wallet / account</th>
-                <th>Confirmed blanace</th>
+                <th>Wallet / Account</th>
+                <th>Confirmed balance</th>
                 <th>Unconfirmed balance</th>
             </tr>
         </thead>
@@ -44,7 +41,7 @@
                         var accountBalance = this.WalletManager.GetBalances(walletName, account.Name).Single();
 
                         <tr @onclick="() => { NavigateToWallet(walletName, account.Name); }" style="cursor:pointer">
-                            <td> @walletName <strong>/</strong> @account.Name</td>
+                            <td><strong>@walletName / @account.Name</strong></td>
                             <td>@accountBalance.AmountConfirmed</td>
                             <td>@accountBalance.AmountUnconfirmed</td>
                         </tr>
@@ -64,9 +61,12 @@
 
     private void NavigateToWalletCreate()
     {
-        NavigationManager.NavigateTo("walletcrate");
+        NavigationManager.NavigateTo("walletcreate");
+    }
+    private void NavigateToWalletRecover()
+    {
+        NavigationManager.NavigateTo("walletrecover");
     }
-
     private void Resync()
     {
         this.WalletSyncManager.SyncFromHeight(1);