diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor
index 78624f3..79464f4 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor
@@ -1,23 +1,34 @@
 @inherits LayoutComponentBase
 
-<div class="page">
-    <div class="sidebar">
-        <NavMenu />
-    </div>
-
-    <main>
-        <div class="top-row px-4">
-            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
-        </div>
-
-        <article class="content px-4">
+<RadzenLayout>
+    <RadzenHeader>
+        <RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" Gap="0">
+            <RadzenSidebarToggle Click="@(() => sidebar1Expanded = !sidebar1Expanded)" />
+            @* <HeaderBar /> *@
+        </RadzenStack>
+    </RadzenHeader>
+    <RadzenSidebar @bind-Expanded="@sidebar1Expanded">
+        <RadzenPanelMenu>
+            <RadzenPanelMenuItem Text="Home" Icon="home" Path="/counter" />
+           @*  <RadzenPanelMenuItem Text="VPKI.API" Icon="compare_arrows" Path="/vpki/api" />
+            <RadzenPanelMenuItem Text="VPKI.Manager" Icon="description" Path="/vpki/manager" /> *@
+            @* <RadzenPanelMenuItem Text="Users" Icon="account_box" Path="/user" /> *@
+        </RadzenPanelMenu>      
+    </RadzenSidebar>
+    <RadzenBody>
+        <div class="rz-p-4">
             @Body
-        </article>
-    </main>
-</div>
+        </div>
+    </RadzenBody>
+    <RadzenFooter>
+        <div>
+            <RadzenLabel Text="@("Copyright © 2024, SystemX Inc. All rights reserved.")"></RadzenLabel>          
+        </div>        
+    </RadzenFooter>
+</RadzenLayout>
 
-<div id="blazor-error-ui" data-nosnippet>
-    An unhandled error has occurred.
-    <a href="." class="reload">Reload</a>
-    <span class="dismiss">🗙</span>
-</div>
+<RadzenComponents />
+
+@code {
+    bool sidebar1Expanded = true;
+}
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/_Imports.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/_Imports.razor
index d88eed9..aee1adf 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/_Imports.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/_Imports.razor
@@ -6,3 +6,6 @@
 @using static Microsoft.AspNetCore.Components.Web.RenderMode
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
+
+@using Radzen
+@using Radzen.Blazor
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/eCIA_v2.Shared.csproj b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/eCIA_v2.Shared.csproj
index 36f7ff8..709d630 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/eCIA_v2.Shared.csproj
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/eCIA_v2.Shared.csproj
@@ -6,12 +6,26 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+    <WarningLevel>6</WarningLevel>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <NoWarn>1701;1702</NoWarn>
+    <WarningLevel>6</WarningLevel>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+  </PropertyGroup>
+
   <ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.7" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Radzen.Blazor" Version="7.1.5" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/App.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/App.razor
index 8e15a6d..8c3b7c3 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/App.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/App.razor
@@ -9,12 +9,17 @@
     <link rel="stylesheet" href="_content/eCIA_v2.Shared/app.css" />
     <link rel="stylesheet" href="eCIA_v2.Web.styles.css" />
     <link rel="icon" type="image/png" href="_content/eCIA_v2.Shared/favicon.png" />
-    <HeadOutlet @rendermode="InteractiveServer" />
+    <link href="_content/Radzen.Blazor/css/default-base.css" rel="stylesheet" />
+    <HeadOutlet />
+    <RadzenTheme Theme="material" />
 </head>
 
 <body>
-    <Routes @rendermode="InteractiveServer" />
+    <Routes />
     <script src="_framework/blazor.web.js"></script>
+
+    <script src="_content/Radzen.Blazor/Radzen.Blazor.js?v=@(typeof(Radzen.Colors).Assembly.GetName().Version)"></script>
+    <script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
 </body>
 
 </html>
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/_Imports.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/_Imports.razor
index e9dc4cf..2da0bb8 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/_Imports.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Components/_Imports.razor
@@ -9,3 +9,6 @@
 @using eCIA_v2.Shared
 @using eCIA_v2.Web
 @using eCIA_v2.Web.Components
+
+@using Radzen
+@using Radzen.Blazor
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Program.cs b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Program.cs
index a5b20b4..8c10574 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Program.cs
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/Program.cs
@@ -1,6 +1,7 @@
 using eCIA_v2.Shared.Services;
 using eCIA_v2.Web.Components;
 using eCIA_v2.Web.Services;
+using Radzen;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -11,6 +12,8 @@ builder.Services.AddRazorComponents()
 // Add device-specific services used by the eCIA_v2.Shared project
 builder.Services.AddSingleton<IFormFactor, FormFactor>();
 
+builder.Services.AddRadzenComponents();
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/eCIA_v2.Web.csproj b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/eCIA_v2.Web.csproj
index 18ad150..8f9ab8f 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/eCIA_v2.Web.csproj
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Web/eCIA_v2.Web.csproj
@@ -6,6 +6,21 @@
     <ImplicitUsings>enable</ImplicitUsings>	
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <WarningLevel>6</WarningLevel>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <WarningLevel>6</WarningLevel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.7" />
+    <PackageReference Include="Radzen.Blazor" Version="7.1.5" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\eCIA_v2.Shared\eCIA_v2.Shared.csproj" />
   </ItemGroup>
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/Components/_Imports.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/Components/_Imports.razor
index 46207aa..7c96e52 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/Components/_Imports.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/Components/_Imports.razor
@@ -8,3 +8,6 @@
 @using eCIA_v2
 @using eCIA_v2.Components
 @using eCIA_v2.Shared
+
+@using Radzen
+@using Radzen.Blazor
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/MauiProgram.cs b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/MauiProgram.cs
index d9d11c5..61350e7 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/MauiProgram.cs
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/MauiProgram.cs
@@ -1,6 +1,7 @@
 using eCIA_v2.Services;
 using eCIA_v2.Shared.Services;
 using Microsoft.Extensions.Logging;
+using Radzen;
 
 namespace eCIA_v2
 {
@@ -20,6 +21,7 @@ namespace eCIA_v2
             builder.Services.AddSingleton<IFormFactor, FormFactor>();
 
             builder.Services.AddMauiBlazorWebView();
+            builder.Services.AddRadzenComponents();
 
 #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj
index c171851..d4a874f 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj
@@ -42,17 +42,21 @@
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-windows10.0.19041.0|AnyCPU'">
     <WarningLevel>6</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <NoWarn>1605</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-windows10.0.19041.0|AnyCPU'">
     <WarningLevel>6</WarningLevel>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <NoWarn>1605</NoWarn>
   </PropertyGroup>
 	
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.7" />
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+    <PackageReference Include="Radzen.Blazor" Version="7.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/index.html b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/index.html
index 9c53972..d11e80f 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/index.html
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/index.html
@@ -8,6 +8,7 @@
     <link rel="stylesheet" href="_content/eCIA_v2.Shared/bootstrap/bootstrap.min.css" />
     <link rel="stylesheet" href="_content/eCIA_v2.Shared/app.css" />
     <link rel="stylesheet" href="app.css" />
+    <link href="_content/Radzen.Blazor/css/default-base.css" rel="stylesheet" />
     <link rel="stylesheet" href="eCIA_v2.styles.css" />
     <link rel="icon" href="data:,">
 </head>
@@ -18,8 +19,8 @@
 
     <div id="app">Loading...</div>
 
+    <script src="_content/Radzen.Blazor/Radzen.Blazor.js"></script>
     <script src="_framework/blazor.webview.js" autostart="false"></script>
-
 </body>
 
 </html>
\ No newline at end of file