diff --git a/Projects/eCIA_v2/eCIA_v2.sln b/Projects/eCIA_v2/eCIA_v2.sln
index d497a41..d6b172d 100644
--- a/Projects/eCIA_v2/eCIA_v2.sln
+++ b/Projects/eCIA_v2/eCIA_v2.sln
@@ -17,6 +17,7 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{25569EC3-423B-4A5E-A0C5-6368A53D7DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25569EC3-423B-4A5E-A0C5-6368A53D7DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25569EC3-423B-4A5E-A0C5-6368A53D7DA6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{25569EC3-423B-4A5E-A0C5-6368A53D7DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25569EC3-423B-4A5E-A0C5-6368A53D7DA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C1E4D8F-828D-4D87-8B44-24E9C02182B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
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 79464f4..ada0572 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,34 +1,18 @@
 @inherits LayoutComponentBase
 
 <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
+        <div>
+            <RadzenText Text="ProjectName"></RadzenText>
         </div>
+        <div style="margin:0; padding:0;">
+            @Body
+        </div>        
     </RadzenBody>
     <RadzenFooter>
         <div>
-            <RadzenLabel Text="@("Copyright © 2024, SystemX Inc. All rights reserved.")"></RadzenLabel>          
+            <RadzenLabel Text="@("Copyright © 2025, SystemX Inc. All rights reserved.")"></RadzenLabel>          
         </div>        
     </RadzenFooter>
 </RadzenLayout>
-
-<RadzenComponents />
-
-@code {
-    bool sidebar1Expanded = true;
-}
\ No newline at end of file
+<RadzenComponents />
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor.css b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor.css
index ed63914..54b4538 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor.css
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/MainLayout.razor.css
@@ -1,4 +1,4 @@
-.page {
+.page {
     position: relative;
     display: flex;
     flex-direction: column;
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor
deleted file mode 100644
index fa25d6d..0000000
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">eCIA_v2</a>
-    </div>
-</div>
-
-<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
-
-<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
-    <nav class="flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="counter">
-                <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="weather">
-                <span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
-            </NavLink>
-        </div>
-    </nav>
-</div>
-
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor.css b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor.css
deleted file mode 100644
index 4e15395..0000000
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Layout/NavMenu.razor.css
+++ /dev/null
@@ -1,105 +0,0 @@
-.navbar-toggler {
-    appearance: none;
-    cursor: pointer;
-    width: 3.5rem;
-    height: 2.5rem;
-    color: white;
-    position: absolute;
-    top: 0.5rem;
-    right: 1rem;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
-}
-
-.navbar-toggler:checked {
-    background-color: rgba(255, 255, 255, 0.5);
-}
-
-.top-row {
-    height: 3.5rem;
-    background-color: rgba(0,0,0,0.4);
-}
-
-.navbar-brand {
-    font-size: 1.1rem;
-}
-
-.bi {
-    display: inline-block;
-    position: relative;
-    width: 1.25rem;
-    height: 1.25rem;
-    margin-right: 0.75rem;
-    top: -1px;
-    background-size: cover;
-}
-
-.bi-house-door-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
-}
-
-.bi-plus-square-fill-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
-}
-
-.bi-list-nested-nav-menu {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
-}
-
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
-    }
-
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item ::deep .nav-link {
-        color: #d7d7d7;
-        background: none;
-        border: none;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-        width: 100%;
-    }
-
-.nav-item ::deep a.active {
-    background-color: rgba(255,255,255,0.37);
-    color: white;
-}
-
-.nav-item ::deep .nav-link:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.nav-scrollable {
-    display: none;
-}
-
-.navbar-toggler:checked ~ .nav-scrollable {
-    display: block;
-}
-
-@media (min-width: 641px) {
-    .navbar-toggler {
-        display: none;
-    }
-
-    .nav-scrollable {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-
-        /* Allow sidebar to scroll for tall menus */
-        height: calc(100vh - 3.5rem);
-        overflow-y: auto;
-    }
-}
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Counter.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Counter.razor
index c483635..ec74213 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Counter.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Counter.razor
@@ -1,6 +1,4 @@
-@page "/counter"
-
-<PageTitle>Counter</PageTitle>
+<PageTitle>Counter</PageTitle>
 
 <h1>Counter</h1>
 
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Home.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Home.razor
deleted file mode 100644
index 85f425b..0000000
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Home.razor
+++ /dev/null
@@ -1,14 +0,0 @@
-@page "/"
-@using eCIA_v2.Shared.Services
-@inject IFormFactor FormFactor
-
-<PageTitle>Home</PageTitle>
-
-<h1>Hello, world!</h1>
-
-Welcome to your new app running on <em>@factor</em> using <em>@platform</em>.
-
-@code {
-    private string factor => FormFactor.GetFormFactor();
-    private string platform => FormFactor.GetPlatform();
-}
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Main.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Main.razor
new file mode 100644
index 0000000..ebfe564
--- /dev/null
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Main.razor
@@ -0,0 +1,26 @@
+@page "/"
+@using eCIA_v2.Shared.Services
+@inject IFormFactor FormFactor
+
+<div>
+    <RadzenTabs TabPosition="TabPosition.Top">
+        <Tabs>
+            <RadzenTabsItem Text="Home">
+                <Counter></Counter>
+            </RadzenTabsItem>
+            <RadzenTabsItem Text="JIG">
+                <Weather></Weather>
+            </RadzenTabsItem>
+            <RadzenTabsItem Text="PLC">
+
+            </RadzenTabsItem>
+            <RadzenTabsItem Text="Test List">
+
+            </RadzenTabsItem>
+        </Tabs>
+    </RadzenTabs>
+</div>
+
+@code {
+
+}
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Weather.razor b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Weather.razor
index 8eca4cc..9b406d4 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Weather.razor
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/Pages/Weather.razor
@@ -1,6 +1,4 @@
-@page "/weather"
-
-<PageTitle>Weather</PageTitle>
+<PageTitle>Weather</PageTitle>
 
 <h1>Weather</h1>
 
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 709d630..1556dd3 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
@@ -28,4 +28,8 @@
     <PackageReference Include="Radzen.Blazor" Version="7.1.5" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\res\" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/wwwroot/res/icon.JPG b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/wwwroot/res/icon.JPG
new file mode 100644
index 0000000..5a02fd5
Binary files /dev/null and b/Projects/eCIA_v2/eCIA_v2/eCIA_v2.Shared/wwwroot/res/icon.JPG differ
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/App.xaml.cs b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/App.xaml.cs
index fc699e8..b0512e5 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/App.xaml.cs
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/App.xaml.cs
@@ -9,7 +9,13 @@
 
         protected override Window CreateWindow(IActivationState? activationState)
         {
-            return new Window(new MainPage()) { Title = "eCIA_v2" };
+            return new Window(new MainPage()) { 
+                TitleBar = new TitleBar() 
+                {
+                     Title = "[eCIA] Operation - Common Platform - external Controller Interface Agent",
+                     Icon = $"wwwroot/res/icon.JPG",
+                } 
+            };
         }
     }
 }
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 d4a874f..9c37abd 100644
--- a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj
+++ b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/eCIA_v2.csproj
@@ -61,5 +61,9 @@
 
   <ItemGroup>
     <ProjectReference Include="..\eCIA_v2.Shared\eCIA_v2.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\res\" />
   </ItemGroup> 
 </Project>
diff --git a/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/res/icon.JPG b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/res/icon.JPG
new file mode 100644
index 0000000..5a02fd5
Binary files /dev/null and b/Projects/eCIA_v2/eCIA_v2/eCIA_v2/wwwroot/res/icon.JPG differ