diff --git a/MauiProject/App.xaml.cs b/MauiProject/App.xaml.cs
index 71ba8db..921f801 100644
--- a/MauiProject/App.xaml.cs
+++ b/MauiProject/App.xaml.cs
@@ -6,6 +6,9 @@ public App()
 	{
 		InitializeComponent();
 		Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("NjA0NzI4QDMyMzAyZTMxMmUzMElnd0owNjFveXpldXBBVW9aQ3BkR2VGQUZRK2doVFZPak92T2VzNm5MR1k9");
-		MainPage = new AppShell();
 	}
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new MainPage());
+    }
 }
diff --git a/MauiProject/AppShell.xaml b/MauiProject/AppShell.xaml
deleted file mode 100644
index 457693b..0000000
--- a/MauiProject/AppShell.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="MauiProject.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiProject"
-    Shell.FlyoutBehavior="Disabled">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
-</Shell>
diff --git a/MauiProject/AppShell.xaml.cs b/MauiProject/AppShell.xaml.cs
deleted file mode 100644
index ae6151c..0000000
--- a/MauiProject/AppShell.xaml.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace MauiProject;
-
-public partial class AppShell : Shell
-{
-	public AppShell()
-	{
-		InitializeComponent();
-	}
-}
diff --git a/MauiProject/EmployeeInfo.cs b/MauiProject/EmployeeInfo.cs
index b9682a1..f64aea4 100644
--- a/MauiProject/EmployeeInfo.cs
+++ b/MauiProject/EmployeeInfo.cs
@@ -10,14 +10,14 @@ namespace MauiProject
     public class EmployeeInfo
     {
         [Required(AllowEmptyStrings = false, ErrorMessage = "First Name should not be empty")]
-        public string FirstName { get; set; }
-        public string MiddleName { get; set; }
-        public string LastName { get; set; }
+        public string FirstName { get; set; } = string.Empty;
+        public string MiddleName { get; set; } = string.Empty;
+        public string LastName { get; set; } = string.Empty;
         [StringLength(10, ErrorMessage = "Contact number should not exceed 10 digits")]
-        public string ContactNumber { get; set; }
-        public string Email { get; set; }
+        public string ContactNumber { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
         [DataType(DataType.MultilineText)]
-        public string Address { get; set; }
+        public string Address { get; set; } = string.Empty;
         public DateTime? DateJoined { get; set; }
         public bool Confirmed { get; set; }
     }
diff --git a/MauiProject/MainPage.xaml b/MauiProject/MainPage.xaml
index 23bbbc0..1022104 100644
--- a/MauiProject/MainPage.xaml
+++ b/MauiProject/MainPage.xaml
@@ -9,7 +9,9 @@
         <local:ViewModel/>
     </ContentPage.BindingContext>
     
-    <sf:SfDataForm DataObject="{Binding Employee}"
+    <sf:SfDataForm 
+        x:DataType="local:ViewModel"
+        DataObject="{Binding Employee}"
                    LayoutType="TextInputLayout"/>
 
 </ContentPage>
diff --git a/MauiProject/MauiProject.csproj b/MauiProject/MauiProject.csproj
index fd22fea..321d2c4 100644
--- a/MauiProject/MauiProject.csproj
+++ b/MauiProject/MauiProject.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>MauiProject</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>MauiProject</ApplicationTitle>
@@ -49,8 +50,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-		<PackageReference Include="Syncfusion.Maui.DataForm" Version="21.1.41" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.DataForm" Version="*" />
 	</ItemGroup>
 
 </Project>
diff --git a/MauiProject/MauiProject.csproj.user b/MauiProject/MauiProject.csproj.user
index 29606d7..fc2823d 100644
--- a/MauiProject/MauiProject.csproj.user
+++ b/MauiProject/MauiProject.csproj.user
@@ -2,9 +2,12 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
-    <ActiveDebugFramework>net7.0-android</ActiveDebugFramework>
-    <ActiveDebugProfile>Pixel 5 - API 32 (Android 12.1 - API 32)</ActiveDebugProfile>
+    <ActiveDebugFramework>net9.0-windows10.0.19041.0</ActiveDebugFramework>
+    <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
     <SelectedPlatformGroup>Emulator</SelectedPlatformGroup>
-    <DefaultDevice>pixel_5_-_api_32</DefaultDevice>
+    <DefaultDevice>pixel_5_-_api_34</DefaultDevice>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-android|AnyCPU'">
+    <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>
\ No newline at end of file