diff --git a/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj b/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
index 2d99233..9f998e0 100644
--- a/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
+++ b/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj
@@ -7,24 +7,28 @@
 		<RootNamespace>Connected.Common.Types</RootNamespace>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <Compile Remove="wwwroot\**" />
+	  <Content Remove="wwwroot\**" />
+	  <EmbeddedResource Remove="wwwroot\**" />
+	  <None Remove="wwwroot\**" />
+	</ItemGroup>
+
 
 	<ItemGroup>
 		<SupportedPlatform Include="browser" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0-rc.2.22476.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\connected.components\Connected.Components\Connected.Components.csproj" />
 		<ProjectReference Include="..\..\Connected\Connected.Client\Connected.Client.csproj" />
+		<ProjectReference Include="..\..\connected\Connected.UI\Connected.UI.csproj" />
 		<ProjectReference Include="..\..\Connected\Connected\Connected.csproj" />
 		<ProjectReference Include="..\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<Folder Include="wwwroot\" />
-	</ItemGroup>
-
 </Project>
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
index abfe1a8..5da15f3 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor
@@ -1,6 +1,6 @@
 @using Connected.Components;
 
-@inherits UIComponent
+@inherits UIComposition
 
 <h3 class="important">TaxRateAdd</h3>
 
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
index 99a33f3..0e53647 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Connected.Common.Types.TaxRates.Components;
 
-public partial class TaxRateAdd : UIComponent
+public partial class TaxRateAdd : UIComposition
 {
 	public TaxRateAdd()
 	{
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
index a9438e4..95cbf27 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor
@@ -1,6 +1,6 @@
 @using Connected.Components;
 
-@inherits UIComponent
+@inherits UIComposition
 
 
 <h3>TaxRateEditForm</h3>
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
index 544d94d..94c72fd 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor.cs
@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Connected.Common.Types.TaxRates.Components;
 
-public partial class TaxRateEdit : UIComponent
+public partial class TaxRateEdit : UIComposition
 {
 	[Parameter]
 	public int Id { get; set; }
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
index f36e213..c0f0744 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor
@@ -1,6 +1,6 @@
 @using Connected.Components;
 
-@inherits UIComponent
+@inherits UIComposition
 
 @if (DataSource is null)
 {
diff --git a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
index ff2d5d4..341a015 100644
--- a/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
+++ b/Connected.Common.Types.UI/TaxRates/Components/TaxRatesList.razor.cs
@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Components;
 
 namespace Connected.Common.Types.TaxRates.Components;
 
-public partial class TaxRatesList : UIComponent
+public partial class TaxRatesList : UIComposition
 {
 	private ImmutableList<ITaxRate>? DataSource { get; set; }
 
diff --git a/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor b/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
index 9edf046..1075c25 100644
--- a/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
+++ b/Connected.Common.Types.UI/TaxRates/Pages/TaxRatesPage.razor
@@ -1,10 +1,10 @@
 @attribute [Route(CommonTypesUIRoutes.TaxRates)]
 
-@using Common.Types.TaxRates.Components;
+@using Connected.Common.Types.TaxRates.Components;
 @using Connected.Components;
-@using Connected.Layouts;
+@using Connected.UI.Layouts;
 
-@inherits UIComponent
+@inherits UIComposition
 @layout DefaultLayout
 
 <h3>Tax rates</h3>
diff --git a/Connected.Common.Types.sln b/Connected.Common.Types.sln
index ab69234..89101b1 100644
--- a/Connected.Common.Types.sln
+++ b/Connected.Common.Types.sln
@@ -35,6 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "..\co
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "..\connected.components\Connected.Components\Connected.Components.csproj", "{8FB259E5-77B8-4357-831C-C381EA26E2A1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "..\connected\Connected.UI\Connected.UI.csproj", "{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -101,6 +103,10 @@ Global
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -115,6 +121,7 @@ Global
 		{00737C68-21CC-4FD0-9D29-965386AC16D6} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
 		{14DB124B-AE34-4D92-A734-EA18103EF96C} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
 		{8FB259E5-77B8-4357-831C-C381EA26E2A1} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
+		{3A5FB71E-F6F7-46F0-9173-24745E0EDA25} = {20087506-E20F-4FD6-ADFB-9D7ADBBD3998}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C661325-1729-4560-89F9-E2B51B111B72}