diff --git a/AdventureWorks.MAUI/MauiProgram.cs b/AdventureWorks.MAUI/MauiProgram.cs
index 22c06e3..6658fcd 100644
--- a/AdventureWorks.MAUI/MauiProgram.cs
+++ b/AdventureWorks.MAUI/MauiProgram.cs
@@ -21,6 +21,7 @@ namespace AdventureWorks.MAUI
 
 #if WINDOWS
             SetWindowOptions(builder);
+            SetWindowHandlers();
 #endif
 
 #if DEBUG
@@ -53,5 +54,20 @@ namespace AdventureWorks.MAUI
                 });
         }
 #endif
+#if WINDOWS
+    public static void SetWindowHandlers()
+    {
+    // Customize the Switch control for Windows
+        Microsoft.Maui.Handlers.SwitchHandler.Mapper
+            .AppendToMapping("Custom", (h,v) =>
+            {
+                h.PlatformView.OffContent = "No";
+                h.PlatformView.OnContent = "Yes";
+
+                h.PlatformView.MinWidth = 0;
+            });
+    }
+#endif
+
     }
 }
diff --git a/AdventureWorks.MAUI/Views/UserDetailView.xaml b/AdventureWorks.MAUI/Views/UserDetailView.xaml
index d2affd9..084a753 100644
--- a/AdventureWorks.MAUI/Views/UserDetailView.xaml
+++ b/AdventureWorks.MAUI/Views/UserDetailView.xaml
@@ -7,7 +7,7 @@
 
     <Border Style="{StaticResource Border.Page}">
         <ScrollView>
-            <Grid RowDefinitions="Auto, Auto, Auto, Auto,Auto, Auto, Auto , Auto"
+            <Grid RowDefinitions="Auto, Auto, Auto, Auto, Auto, Auto,Auto, Auto, Auto , Auto"
           ColumnDefinitions="Auto, *"
           Style="{StaticResource Grid.Page}">
 
@@ -66,10 +66,31 @@
                     </HorizontalStackLayout>
                 </FlexLayout>
 
-                <partial:AddressView Grid.Row="6"
+                <Label Grid.Row="6"
+                       Text="Still Employed"/>
+                <Switch Grid.Row="6"
+                       Grid.Column="1"/>
+                <Label Text="Employee Type"
+                       Grid.Row="7"/>
+                <FlexLayout Grid.Row="7"
+                            Grid.Column="1"
+                            Wrap="Wrap"
+                            Direction="Row">
+                    <HorizontalStackLayout>
+                        <Label Text="Full-Time"/>
+                        <RadioButton IsChecked="True"
+                                     GroupName="EmployeeType"/>
+                    </HorizontalStackLayout>
+                    <HorizontalStackLayout>
+                        <Label Text="Part-Time"/>
+                        <RadioButton GroupName="EmployeeType"/>
+                    </HorizontalStackLayout>
+                </FlexLayout>
+                
+                <partial:AddressView Grid.Row="8"
                               Grid.ColumnSpan="2" />
 
-                <HorizontalStackLayout Grid.Row="7"
+                <HorizontalStackLayout Grid.Row="9"
                                Grid.Column="1"
                                Spacing="5">
                     <Button Text="Save" />