diff --git a/src/aoWebWallet/Models/CreateTokenModel.cs b/src/aoWebWallet/Models/CreateTokenModel.cs
index eff9043..d1ff760 100644
--- a/src/aoWebWallet/Models/CreateTokenModel.cs
+++ b/src/aoWebWallet/Models/CreateTokenModel.cs
@@ -1,11 +1,15 @@
-namespace aoWebWallet.Models
+using aoWebWallet.Services;
+
+namespace aoWebWallet.Models
 {
     public class CreateTokenModel
     {
         public string? Name { get; set; }
         public string? Ticker { get; set; }
         public string? LogoUrl { get; set; }
-        public int Denomination { get; set; }
-        public int TotalSupply { get; set; }
+        public int Denomination { get; set; } = 2;
+        public decimal TotalSupply { get; set; } = 100;
+        public string MintQuantityForTag => BalanceHelper.DecimalToTokenAmount(TotalSupply, Denomination).ToString();
+
     }
 }
diff --git a/src/aoWebWallet/Pages/CreateTokenPage.razor b/src/aoWebWallet/Pages/CreateTokenPage.razor
index cb31428..2bbcf66 100644
--- a/src/aoWebWallet/Pages/CreateTokenPage.razor
+++ b/src/aoWebWallet/Pages/CreateTokenPage.razor
@@ -24,26 +24,28 @@
         <MudForm Model="tokenModel">
             <MudTextField @bind-Value="tokenModel.Name" Label="Token Name" Required="true" />
             <MudTextField @bind-Value="tokenModel.Ticker" Label="Ticker Symbol" MaxLength="5" Required="true" />
-            <MudTextField @bind-Value="tokenModel.LogoUrl" Label="Logo URL" />
+            <MudTextField @bind-Value="tokenModel.LogoUrl" Label="ArweaveId of logo" MaxLength="43"/>
             <MudNumericField @bind-Value="tokenModel.Denomination" Label="Denomination" Required="true" />
+            <MudNumericField @bind-Value="tokenModel.TotalSupply" Format="@DenominationFormat" Label="Initial mint amount" Required="true" />
 
-            <MudNumericField @bind-Value="tokenModel.TotalSupply" Label="Initial mint amount" Required="true" />
-
-            <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="Submit" Class="mt-8">Submit</MudButton>
+            <MudButton Color="Color.Primary" Variant="Variant.Filled" Disabled="@IsDisabled" OnClick="Submit" Class="mt-8">Submit</MudButton>
         </MudForm>
     }
     else
     {
         <SendTransactionProgress DataLoader="CreateTokenService.CreateTokenProgress.DataLoader" Title="Creating token..." />
 
-        @if (!string.IsNullOrEmpty(CreateTokenService.CreateTokenProgress.Data))
-        {
-            <MudText Class="mt-4">@CreateTokenService.CreateTokenProgress.Data</MudText>
-        }
-
         @if (CreateTokenService.CreateTokenProgress.DataLoader.LoadingState == LoadingState.Finished)
         {
-            <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="ReturnToWallet" Class="mt-8">Return to Wallet</MudButton>
+            if (!string.IsNullOrEmpty(CreateTokenService.CreateTokenProgress.Data))
+            {
+            
+                <br />
+                <MudText Class="mt-4">New tokenId: @CreateTokenService.CreateTokenProgress.Data</MudText>
+                <br />
+            }
+
+            <MudButton Color="Color.Primary" Variant="Variant.Filled"  OnClick="ReturnToWallet" Class="mt-8">Return to Wallet</MudButton>
         }
     }
 </MudContainer>
@@ -58,6 +60,9 @@
         new BreadcrumbItem("Create Token", href: null, disabled: true)
     };
 
+    public string DenominationFormat => "F" + (tokenModel.Denomination).ToString();
+    public bool IsDisabled => string.IsNullOrWhiteSpace(tokenModel.Name) || string.IsNullOrWhiteSpace(tokenModel.Ticker);
+
     private async Task Submit()
     {
         isSubmitting = true;
diff --git a/src/aoWebWallet/Pages/CreateTokenPage.razor.cs b/src/aoWebWallet/Pages/CreateTokenPage.razor.cs
index 8c74ebb..937217e 100644
--- a/src/aoWebWallet/Pages/CreateTokenPage.razor.cs
+++ b/src/aoWebWallet/Pages/CreateTokenPage.razor.cs
@@ -1,4 +1,5 @@
-using aoWebWallet.ViewModels;
+using aoWebWallet.Services;
+using aoWebWallet.ViewModels;
 using aoww.ProcesModels.Action;
 using Microsoft.AspNetCore.Components.Routing;
 
@@ -8,6 +9,8 @@ public partial class CreateTokenPage : MvvmComponentBase<MainViewModel>
     {
         protected override void OnInitialized()
         {
+            CreateTokenService.Reset();
+
             WatchProp(nameof(BindingContext.ActiveWalletAddress));
             WatchDataLoaderVM(BindingContext.WalletList);
             WatchDataLoaderVM(CreateTokenService.CreateTokenProgress);
diff --git a/src/aoWebWallet/Services/CreateTokenService.cs b/src/aoWebWallet/Services/CreateTokenService.cs
index 512f00d..fdf04d1 100644
--- a/src/aoWebWallet/Services/CreateTokenService.cs
+++ b/src/aoWebWallet/Services/CreateTokenService.cs
@@ -10,6 +10,11 @@ public class CreateTokenService(ArweaveService arweaveService, TransactionServic
     {
         public DataLoaderViewModel<string> CreateTokenProgress { get; set; } = new();
 
+        public void Reset()
+        {
+            CreateTokenProgress = new();
+        }
+
         public Task<string?> CreateToken(Wallet wallet, CreateTokenModel tokenModel)
             => CreateTokenProgress.DataLoader.LoadAsync(async () =>
             {
@@ -45,7 +50,8 @@ public class CreateTokenService(ArweaveService arweaveService, TransactionServic
 
                 if (string.IsNullOrWhiteSpace(newProcessId))
                 {
-                    return "Failed to create new process";
+                    CreateTokenProgress.DataLoader.ProgressMsg = "Failed to create new process";
+                    return null;
                 }
                 else
                 {
@@ -80,7 +86,8 @@ public class CreateTokenService(ArweaveService arweaveService, TransactionServic
 
                 if (dataId == null)
                 {
-                   return $"Failed to reach process after maximum retries ({maxRetries})";
+                    CreateTokenProgress.DataLoader.ProgressMsg = $"Failed to reach process after maximum retries ({maxRetries})";
+                    return null;
                 }
 
                 if (dataId != null)
@@ -92,13 +99,14 @@ public class CreateTokenService(ArweaveService arweaveService, TransactionServic
                     {
                         new ArweaveBlazor.Models.Tag { Name = "Target", Value = newProcessId},
                         new ArweaveBlazor.Models.Tag { Name = "Action", Value = "Mint"},
-                        new ArweaveBlazor.Models.Tag { Name = "Quantity", Value = tokenModel.TotalSupply.ToString()}
+                        new ArweaveBlazor.Models.Tag { Name = "Quantity", Value = tokenModel.MintQuantityForTag}
                     });
                     Console.WriteLine("mintResult: " + mintResult);
 
                 }
 
-                return "Token created successfully!";
+                CreateTokenProgress.DataLoader.ProgressMsg = "Token created successfully!";
+                return newProcessId;
             }, x => CreateTokenProgress.Data = x);
     }
 }
\ No newline at end of file
diff --git a/src/aoWebWallet/Shared/Components/SendTransactionProgress.razor b/src/aoWebWallet/Shared/Components/SendTransactionProgress.razor
index 2b7e453..3e0a7f7 100644
--- a/src/aoWebWallet/Shared/Components/SendTransactionProgress.razor
+++ b/src/aoWebWallet/Shared/Components/SendTransactionProgress.razor
@@ -4,7 +4,11 @@
     return;
 
 <MudText Typo="Typo.overline">@Title</MudText>
-<MudText Typo="Typo.overline">@DataLoader?.ProgressMsg</MudText>
+@if (!string.IsNullOrWhiteSpace(DataLoader?.ProgressMsg))
+{
+    <br />
+    <MudText Typo="Typo.overline">@DataLoader?.ProgressMsg</MudText>
+}
 <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
 
 @code {
diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
index 4f1c47b..c3fd66e 100644
--- a/src/aoWebWallet/aoWebWallet.csproj
+++ b/src/aoWebWallet/aoWebWallet.csproj
@@ -21,7 +21,7 @@
 		<PackageReference Include="ArweaveBlazor" Version="0.0.11" />
 		<PackageReference Include="ClipLazor" Version="2.1.1" />
 		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="7.0.1" />
-		<PackageReference Include="MudBlazor" Version="7.7.0" />
+		<PackageReference Include="MudBlazor" Version="7.8.0" />
 		<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
 		<PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />