diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs
index 0ec1b97..a728d8b 100644
--- a/FruitBank.Common/FruitBankConstClient.cs
+++ b/FruitBank.Common/FruitBankConstClient.cs
@@ -7,11 +7,11 @@ public static class FruitBankConstClient
 {
     public static string DefaultLocale = "en-US";
 
-    //public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
+    public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop
     //public static string BaseUrl = "http://localhost:5000"; //FrutiBank nop
 
     #if RELEASE
-        public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
+        //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop
     #endif
 
     //public static string BaseUrl = "http://10.0.2.2:59579"; //FrutiBank (android) nop
diff --git a/FruitBankHybrid.Shared/wwwroot/app.css b/FruitBankHybrid.Shared/wwwroot/app.css
index 8bc5755..097605d 100644
--- a/FruitBankHybrid.Shared/wwwroot/app.css
+++ b/FruitBankHybrid.Shared/wwwroot/app.css
@@ -72,7 +72,11 @@ h1:focus {
 }
 
 .measuring-form-layout {
-	margin-top: 15px;
+    margin-top: 15px;
+    margin-bottom: 25px;
+    padding: 8px;
+    background-color: lightgrey;
+    border-radius: 8px;
 }
 
 .dd-body-class,
diff --git a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
index b2054b1..fd520e1 100644
--- a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
+++ b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj
@@ -44,6 +44,9 @@
 		<Reference Include="DevExpress.Blazor.v25.1.Viewer"></Reference>
 		<Reference Include="DevExpress.Data.v25.1"></Reference>
 		<Reference Include="DevExpress.Utils.v25.1"></Reference>
+		<Reference Include="Mango.Nop.Core">
+		  <HintPath>..\FruitBank.Common\bin\Debug\net9.0\Mango.Nop.Core.dll</HintPath>
+		</Reference>
 	</ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/FruitBankHybrid.sln b/FruitBankHybrid.sln
index 0a21e44..9880a46 100644
--- a/FruitBankHybrid.sln
+++ b/FruitBankHybrid.sln
@@ -87,8 +87,10 @@ Global
 		{B5B3A879-3F16-E125-B942-CBFE55D3B3E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F7C67754-A59C-C355-2A10-C614F0585627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7C67754-A59C-C355-2A10-C614F0585627}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7C67754-A59C-C355-2A10-C614F0585627}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{F7C67754-A59C-C355-2A10-C614F0585627}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7C67754-A59C-C355-2A10-C614F0585627}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7C67754-A59C-C355-2A10-C614F0585627}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj
index 65e89e5..7fc20f5 100644
--- a/FruitBankHybrid/FruitBankHybrid.csproj
+++ b/FruitBankHybrid/FruitBankHybrid.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net9.0-android;net9.0-ios</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.26100.0</TargetFrameworks>
 
 		<OutputType>Exe</OutputType>
 		<RootNamespace>FruitBankHybrid</RootNamespace>
@@ -16,7 +16,7 @@
 		<ApplicationTitle>FruitBank Measuring</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.blazorapp.1</ApplicationId>
+		<ApplicationId>com.mango.fruitbank</ApplicationId>
 
 		<!-- Versions -->
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -27,9 +27,17 @@
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">29.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+		<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+		<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+		<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+		<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+		<GenerateTestArtifacts>True</GenerateTestArtifacts>
+		<HoursBetweenUpdateChecks>24</HoursBetweenUpdateChecks>
+		<WindowsPackageType>MSIX</WindowsPackageType>
 	</PropertyGroup>
 
 
@@ -45,6 +53,19 @@
 		<UseInterpreter>true</UseInterpreter>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-android|AnyCPU'">
+	  <AndroidPackageFormat>apk</AndroidPackageFormat>
+	  <AndroidUseAapt2>True</AndroidUseAapt2>
+	  <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
+	  <DebugSymbols>True</DebugSymbols>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
+	  <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
+	  <AndroidUseAapt2>True</AndroidUseAapt2>
+	  <AndroidPackageFormat>apk</AndroidPackageFormat>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<!-- App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />