diff --git a/src/aoWebWallet/Pages/ReceivePage.razor b/src/aoWebWallet/Pages/ReceivePage.razor
index b220e0a..b54778f 100644
--- a/src/aoWebWallet/Pages/ReceivePage.razor
+++ b/src/aoWebWallet/Pages/ReceivePage.razor
@@ -82,12 +82,20 @@
         {
             <MudItem xs="12">
                 <MudPaper Class="pa-4">
-
+                    @{
+                        var itemName = "AOS Command";
+                    var aosCommandText = "Send({ Target = \"" + BindingContext.Token.TokenId + "\", Action = \"Transfer\", Recipient = \"" + Address + "\", Quantity = \"TOKEN_AMOUNT\"})";
+                    }
                     <MudStack>
                         <MudText Typo="Typo.h6">aos command</MudText>
-                        <MudText Class="KodeMono" Typo="Typo.subtitle1">
-                            Send({ Target = "@BindingContext.Token.TokenId", Action = "Transfer", Recipient = "@Address", Quantity = "TOKEN_AMOUNT"})
-                        </MudText>
+                        <MudStack Row="true">
+                            <MudText Class="KodeMono" Typo="Typo.subtitle1">
+                                @aosCommandText
+                            </MudText>
+                            <MudIconButton Class="copy-clipboard" Icon="@Icons.Material.Filled.ContentCopy" Color="Color.Default" OnClick="async () => { await ClipboardService.CopyToClipboard(aosCommandText, itemName); }" />
+
+                        </MudStack>
+                        
                     </MudStack>
                 </MudPaper>
             </MudItem>
diff --git a/src/aoWebWallet/Pages/WalletDetail.razor b/src/aoWebWallet/Pages/WalletDetail.razor
index deaef49..191234d 100644
--- a/src/aoWebWallet/Pages/WalletDetail.razor
+++ b/src/aoWebWallet/Pages/WalletDetail.razor
@@ -35,7 +35,11 @@
                     <MudText Typo="Typo.body2">@BindingContext.SelectedWallet?.Wallet.Name</MudText>
                     @if (BindingContext.SelectedWallet?.Wallet.OwnerAddress != null)
                     {
-                        <MudChip>owner: @BindingContext.SelectedWallet?.Wallet.OwnerAddress</MudChip>
+                        string ownerUrl = $"/wallet/{BindingContext.SelectedWallet.Wallet.OwnerAddress}";
+
+                        <MudLink Href="@ownerUrl">
+                            <MudChip>owner: @BindingContext.SelectedWallet?.Wallet.OwnerAddress</MudChip>
+                        </MudLink>
                     }
                 </MudStack>
                 @if (BindingContext.SelectedWallet?.Wallet.NeedsBackup ?? false)
diff --git a/src/aoWebWallet/Services/ClipboardService.cs b/src/aoWebWallet/Services/ClipboardService.cs
index aa8919e..7413129 100644
--- a/src/aoWebWallet/Services/ClipboardService.cs
+++ b/src/aoWebWallet/Services/ClipboardService.cs
@@ -6,7 +6,7 @@ namespace aoWebWallet.Services
 {
     public class ClipboardService(IClipLazor clipboard, ISnackbar snackbar)
     {
-        public async Task CopyToClipboard(string? text)
+        public async Task CopyToClipboard(string? text, string? itemName = "Address")
         {
             bool isSupported = await clipboard.IsClipboardSupported();
             bool isWritePermitted = await clipboard.IsPermitted(PermissionCommand.Write);
@@ -17,7 +17,7 @@ public async Task CopyToClipboard(string? text)
                     var isCopied = await clipboard.WriteTextAsync(text.AsMemory());
                     if (isCopied)
                     {
-                        snackbar.Add("Address copied to clipboard", Severity.Success);
+                        snackbar.Add($"{itemName} copied to clipboard", Severity.Success);
                     }
                 }
             }
diff --git a/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor b/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor
index 2540f7e..55fd863 100644
--- a/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor
+++ b/src/aoWebWallet/Shared/Components/ActionQuantityComponent.razor
@@ -5,46 +5,46 @@
 @* <p>@ActionParam.Key = @ActionParam.Value | @ActionParam.ParamType</p> *@
 
 <MudItem>
-@if(Token == null)
-{
-    <MudText>Loading token data...</MudText>
-    <MudProgressLinear Color="Color.Primary" Indeterminate="true" />
-    return;
-}
-@if (ActionParam.ParamType == ActionParamType.Balance && string.IsNullOrEmpty(Address))
-{
-    <MudText>Please select a wallet...</MudText>
-    return;
-}
-@if (ActionParam.ParamType == ActionParamType.Balance && BalanceData == null && !ReadOnly)
-{
-    <MudText>Loading balance...</MudText>
-    <MudProgressLinear Color="Color.Primary" Indeterminate="true" />
-    return;
-}
+    @if (Token == null)
+    {
+        <MudText>Loading token data...</MudText>
+        <MudProgressLinear Color="Color.Primary" Indeterminate="true" />
+        return;
+    }
+    @if (ActionParam.ParamType == ActionParamType.Balance && string.IsNullOrEmpty(Address))
+    {
+        <MudText>Please select a wallet...</MudText>
+        return;
+    }
+    @if (ActionParam.ParamType == ActionParamType.Balance && BalanceData == null && !ReadOnly)
+    {
+        <MudText>Loading balance...</MudText>
+        <MudProgressLinear Color="Color.Primary" Indeterminate="true" />
+        return;
+    }
 
-@if (ReadOnly)
-{
+    @if (ReadOnly)
+    {
         <MudChip>@ActionParam.Key</MudChip> <MudChip Color="Color.Secondary"> @BalanceHelper.FormatBalance(long.Parse(ActionParam.Value ?? "0"), Token?.TokenData?.Denomination ?? 0) @Token?.TokenData?.Ticker</MudChip>
     }
     else
     {
         if (ActionParam.ParamType == ActionParamType.Quantity
-    || ActionParam.ParamType == ActionParamType.Balance)
+        || ActionParam.ParamType == ActionParamType.Balance)
         {
             var label = $"{ActionParam.Key} ({Token?.TokenData?.Ticker})";
 
             <MudStack Row="true">
                 <MudTextField @ref="mudTextField" T="decimal" Label="@label" Variant="Variant.Text" ValueChanged="UpdateDecimalValue" Format="@DenominationFormat" Validation="@(new Func<decimal, IEnumerable<string>>(ValidateBalance))"></MudTextField>
                 @*<MudText>@Token?.TokenData?.Ticker</MudText>*@
-        </MudStack>
+            </MudStack>
 
-        if (ActionParam.ParamType == ActionParamType.Balance)
-        {
-                <MudChip style="border-radius:0;" Variant="Variant.Text" Color="Color.Success">Balance available: <br/> @BalanceHelper.FormatBalance(BalanceData?.Balance, Token?.TokenData?.Denomination ?? 1) @Token?.TokenData?.Ticker</MudChip>
+            if (ActionParam.ParamType == ActionParamType.Balance)
+            {
+                <MudChip style="border-radius:0;" Variant="Variant.Text" Color="Color.Success" OnClick="SetBalance">Balance available: <br /> @BalanceHelper.FormatBalance(BalanceData?.Balance, Token?.TokenData?.Denomination ?? 1) @Token?.TokenData?.Ticker</MudChip>
+            }
         }
     }
-}
 </MudItem>
 
 @code {
@@ -103,7 +103,7 @@
             yield return "Must be greater or equal than 0.";
         }
 
-        if(e > 0)
+        if (e > 0)
         {
 
             if (ActionParam.ParamType == ActionParamType.Balance)
@@ -149,4 +149,12 @@
         StateHasChanged();
     }
 
+    private void SetBalance()
+    {
+        if(mudTextField != null)
+        {
+            mudTextField.SetText(BalanceHelper.FormatBalance(BalanceData?.Balance, Token?.TokenData?.Denomination ?? 1));
+        }
+    }
+
 }