diff --git a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
index 2b57ccc..b64efc2 100644
--- a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
+++ b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
@@ -2,16 +2,20 @@
 
 @inherits UIComposition
 
-<div>
+<h4>
+	Insert new tax rate
+</h4>
+
+<div class="grid grid-col-2 gap-3">
 	<div>
-		<InputText id="name" @bind-Value="DataSource.Name" />
+		<InputText @bind-Value="DataSource.Name" Label="Name" HelperText="The tax rate name" Required=true/>
 	</div>
 	
 	<div>
-		<InputNumber id="rate" @bind-Value="DataSource.Rate" />
-	</div>
-
-	<Button @onclick="OnInsert">Submit</Button>
-	<Button @onclick="OnCancel">Cancel</Button>
-
+		<InputNumber DisableMouseWheel=true @bind-Value="DataSource.Rate" Label="Rate" Required=true HelperText="The tax rate" />
+	</div>	
+</div>
+<div class="py-3">
+	<Button Size="Size.Small" @onclick="OnInsert" Class="mr-3">Submit</Button>
+	<Button Size="Size.Small" @onclick="OnCancel">Cancel</Button>
 </div>
\ No newline at end of file
diff --git a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
index 95cbf27..88aba81 100644
--- a/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
+++ b/src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
@@ -2,24 +2,20 @@
 
 @inherits UIComposition
 
+<h4>
+	Update tax rate
+</h4>
 
-<h3>TaxRateEditForm</h3>
-
-<EditForm Model="@DataSource" OnValidSubmit="@OnUpdate">
-	<DataAnnotationsValidator />
-	<ValidationSummary />
-
+<div class="grid grid-col-2 gap-3">
 	<div>
-		<label for="name">Name</label>
-		<InputText id="name" @bind-Value="DataSource.Name" />
+		<InputText @bind-Value="DataSource.Name" Label="Name" HelperText="The tax rate name" Required=true/>
 	</div>
 
 	<div>
-		<label for="rate">Rate</label>
-		<InputNumber id="rate" @bind-Value="DataSource.Rate" />
-	</div>
-
-	<button type="submit">Submit</button>
-	<button @onclick="OnCancel">Cancel</button>
-
-</EditForm>
\ No newline at end of file
+		<InputNumber DisableMouseWheel=true @bind-Value="DataSource.Rate" Label="Rate" Required=true HelperText="The tax rate" />
+</div>	
+</div>
+<div class="py-3">
+	<Button Size="Size.Small" @onclick="OnUpdate" Class="mr-3">Submit</Button>
+	<Button Size="Size.Small" @onclick="OnCancel">Cancel</Button>
+</div>
\ No newline at end of file
diff --git a/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor b/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
index 0fed7a0..1b73874 100644
--- a/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
+++ b/src/Connected.Common.Types.UI/TaxRates/Pages/TaxRateAddPage.razor
@@ -2,6 +2,4 @@
 
 @using Connected.Common.Types.TaxRates.Components
 
-<h3>TaxRateAdd</h3>
-
 <TaxRateAdd></TaxRateAdd>
\ No newline at end of file
diff --git a/tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs b/tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
index b985684..4e2017c 100644
--- a/tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
+++ b/tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs
@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Connected.Common.Types.TaxRates;
 using Connected.Entities;
 using Connected.ServiceModel;
 using static Connected.Common.Types.TaxRates.TaxRateOps;