diff --git a/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj b/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj
index a193795..a4ce1a6 100644
--- a/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj
+++ b/AdventureWorks.MAUI/AdventureWorks.MAUI.csproj
@@ -64,4 +64,34 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Compile Update="Views\LoginView.xaml.cs">
+	    <DependentUpon>LoginView.xaml</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <MauiXaml Update="Views\ColorListView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\CustomerDetailView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\LoginView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\PhoneTypesListView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\ProductDetailView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\UserDetailView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="Views\UserListView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	</ItemGroup>
+
 </Project>
diff --git a/AdventureWorks.MAUI/AppShell.xaml b/AdventureWorks.MAUI/AppShell.xaml
index 6cbee92..70b2b9b 100644
--- a/AdventureWorks.MAUI/AppShell.xaml
+++ b/AdventureWorks.MAUI/AppShell.xaml
@@ -4,13 +4,40 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:AdventureWorks.MAUI"
+    xmlns:views="clr-namespace:AdventureWorks.MAUI.Views"
     Title="Adventure Works"
     Shell.TitleColor="Blue"
     Shell.BackgroundColor="LightBlue">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
+    <TabBar>
+        <ShellContent
+            Title="Home"
+            ContentTemplate="{DataTemplate local:MainPage}"
+            Route="MainPage" />
+        <ShellContent
+            Title="Users"
+            ContentTemplate="{DataTemplate views:UserListView}"
+            Route="UserListView" />
+        <ShellContent
+            Title="Products"
+            ContentTemplate="{DataTemplate views:ProductDetailView}"
+            Route="ProductDetailView" />
+        <ShellContent
+            Title="Customerss"
+            ContentTemplate="{DataTemplate views:CustomerDetailView}"
+            Route="CustomerDetailView" />
+        <Tab Title="Maintenance">
+            <ShellContent
+            Title="Colors"
+            ContentTemplate="{DataTemplate views:ColorListView}"
+            Route="ColorListView" />
+            <ShellContent
+            Title="Phone Types"
+            ContentTemplate="{DataTemplate views:PhoneTypesListView}"
+            Route="PhoneTypesListView" />
+        </Tab>
+        <ShellContent
+            Title="Login"
+            ContentTemplate="{DataTemplate views:LoginView}"
+            Route="LoginView" />
+    </TabBar>
 </Shell>
diff --git a/AdventureWorks.MAUI/AppShell.xaml.cs b/AdventureWorks.MAUI/AppShell.xaml.cs
index ffd9973..7e4e4d3 100644
--- a/AdventureWorks.MAUI/AppShell.xaml.cs
+++ b/AdventureWorks.MAUI/AppShell.xaml.cs
@@ -5,6 +5,10 @@
         public AppShell()
         {
             InitializeComponent();
+
+            // Register routes for navigation
+            Routing.RegisterRoute(nameof(Views.UserDetailView), typeof(Views.UserDetailView));
+
         }
     }
 }
diff --git a/AdventureWorks.MAUI/MainPage.xaml b/AdventureWorks.MAUI/MainPage.xaml
index 4d4e6db..b418bd3 100644
--- a/AdventureWorks.MAUI/MainPage.xaml
+++ b/AdventureWorks.MAUI/MainPage.xaml
@@ -4,79 +4,9 @@
              x:Class="AdventureWorks.MAUI.MainPage"
              Title="{StaticResource ApplicationTitle}">
 
-
-    <Grid RowDefinitions="Auto,Auto,Auto, Auto, Auto,Auto, Auto, Auto , Auto"
-          ColumnDefinitions="Auto, *"
-          Style="{StaticResource Grid.Page}">
-
-        <Label Grid.Row="0"
-           Grid.ColumnSpan="2"
-           Text="User Information"
-           FontSize="Title" />
-        
-        <Label Grid.Row="1"
-            Grid.ColumnSpan="2"
-            Text="Use this Screen to Modify User Information."
-            FontSize="Body" />
-
-        <BoxView Grid.Row="2"
-                 Grid.ColumnSpan="2"
-                 Margin="0,0,0,20"
-                 HeightRequest="1"
-                 Color="Black" />
-        
-        
-        <Label Grid.Row="3"
-               Text="Login ID" />
-        <VerticalStackLayout Grid.Row="3"
-                             Grid.Column="1">
-            <Entry Text="" 
-                   Placeholder="Please use a combination of letters and numbers."/>
-            <Label FontSize="Micro"
-                   Text="Please use a combination of letters and numbers." />
-        </VerticalStackLayout>
-        <Label Grid.Row="4"
-               Text="First Name" />
-        <Entry Grid.Row="4"
-               Grid.Column="1"
-               Text=""/>
-        <Label Grid.Row="5"
-               Text="Last Name" />
-        <Entry Grid.Row="5"
-               Grid.Column="1"
-               Text=""/>
-        <Label Grid.Row="6"
-               Text="Email Address" />
-        <Entry Grid.Row="6"
-               Grid.Column="1"
-               Text=""/>
-        <FlexLayout Grid.Row="7"
-                    Grid.Column="1"
-                    Wrap="Wrap"
-                    Direction="Row">
-            <HorizontalStackLayout>
-                <Label Text="401k?"/>
-                <CheckBox IsChecked="True"/>
-            </HorizontalStackLayout>
-            <HorizontalStackLayout >
-                <Label Text="Flex Time?"/>
-                <CheckBox IsChecked="False"/>
-            </HorizontalStackLayout>
-            <HorizontalStackLayout >
-                <Label Text="Health Care?"/>
-                <CheckBox IsChecked="True"/>
-            </HorizontalStackLayout>
-            <HorizontalStackLayout >
-                <Label Text="Health Savings Account?"/>
-                <CheckBox IsChecked="True"/>
-            </HorizontalStackLayout>
-        </FlexLayout>
-        <HorizontalStackLayout Grid.Row="8"
-                               Grid.Column="1"
-                               Spacing="5">
-            <Button Text="Save" />
-            <Button Text="Cancel" />
-        </HorizontalStackLayout>
-    </Grid>
+<Label Text="{StaticResource ApplicationTitle}"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
 
 </ContentPage>
diff --git a/AdventureWorks.MAUI/Resources/Styles/AppStyles.xaml b/AdventureWorks.MAUI/Resources/Styles/AppStyles.xaml
index 2b4e814..0df153c 100644
--- a/AdventureWorks.MAUI/Resources/Styles/AppStyles.xaml
+++ b/AdventureWorks.MAUI/Resources/Styles/AppStyles.xaml
@@ -22,7 +22,7 @@
         <Setter Property="Spacing" Value="5" />
     </Style>
     <Style TargetType="Button">
-        <Setter Property="WidthRequest" Value="100"/>
+        <Setter Property="WidthRequest" Value="150"/>
         <Setter Property="BackgroundColor" Value="Blue"/>
         <Setter Property="TextColor" Value="White"/>
     </Style>
diff --git a/AdventureWorks.MAUI/Views/ColorListView.xaml b/AdventureWorks.MAUI/Views/ColorListView.xaml
new file mode 100644
index 0000000..57d3580
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/ColorListView.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.ColorListView"
+             Title="Color List">
+    <Label Text="Color List"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/ColorListView.xaml.cs b/AdventureWorks.MAUI/Views/ColorListView.xaml.cs
new file mode 100644
index 0000000..db6f08d
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/ColorListView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class ColorListView : ContentPage
+{
+	public ColorListView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/CustomerDetailView.xaml b/AdventureWorks.MAUI/Views/CustomerDetailView.xaml
new file mode 100644
index 0000000..5603300
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/CustomerDetailView.xaml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.CustomerDetailView"
+             Title="Customer Details">
+    <Label Text="Customer Details"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
+
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/CustomerDetailView.xaml.cs b/AdventureWorks.MAUI/Views/CustomerDetailView.xaml.cs
new file mode 100644
index 0000000..9a7e331
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/CustomerDetailView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class CustomerDetailView : ContentPage
+{
+	public CustomerDetailView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/LoginView.xaml b/AdventureWorks.MAUI/Views/LoginView.xaml
new file mode 100644
index 0000000..bdb4a42
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/LoginView.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.LoginView"
+             Title="Login">
+    <Label Text="Login"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/LoginView.xaml.cs b/AdventureWorks.MAUI/Views/LoginView.xaml.cs
new file mode 100644
index 0000000..6c9d1c6
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/LoginView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class LoginView : ContentPage
+{
+    public LoginView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml b/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml
new file mode 100644
index 0000000..0a7aab7
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.PhoneTypesListView"
+             Title="Phone Types">
+    <Label Text="Phone Types"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
+</ContentPage>
diff --git a/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml.cs b/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml.cs
new file mode 100644
index 0000000..de07f9d
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/PhoneTypesListView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class PhoneTypesListView : ContentPage
+{
+	public PhoneTypesListView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/ProductDetailView.xaml b/AdventureWorks.MAUI/Views/ProductDetailView.xaml
new file mode 100644
index 0000000..8482883
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/ProductDetailView.xaml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.ProductDetailView"
+             Title="Product Details">
+    <Label Text="Product Details"
+       FontSize="Large"
+       HorizontalOptions="Center"
+       VerticalOptions="Center" />
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs b/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs
new file mode 100644
index 0000000..3bcca9d
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/ProductDetailView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class ProductDetailView : ContentPage
+{
+	public ProductDetailView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/UserDetailView.xaml b/AdventureWorks.MAUI/Views/UserDetailView.xaml
new file mode 100644
index 0000000..a357262
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/UserDetailView.xaml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.UserDetailView"
+             Title="User Information">
+
+    <Grid RowDefinitions="Auto,Auto,Auto, Auto, Auto,Auto, Auto, Auto , Auto"
+          ColumnDefinitions="Auto, *"
+          Style="{StaticResource Grid.Page}">
+
+        <Label Grid.Row="0"
+           Grid.ColumnSpan="2"
+           Text="User Information"
+           FontSize="Title" />
+
+        <Label Grid.Row="1"
+            Grid.ColumnSpan="2"
+            Text="Use this Screen to Modify User Information."
+            FontSize="Body" />
+
+        <BoxView Grid.Row="2"
+                 Grid.ColumnSpan="2"
+                 Margin="0,0,0,20"
+                 HeightRequest="1"
+                 Color="Black" />
+
+
+        <Label Grid.Row="3"
+               Text="Login ID" />
+        <VerticalStackLayout Grid.Row="3"
+                             Grid.Column="1">
+            <Entry Text="" 
+                   Placeholder="Please use a combination of letters and numbers."/>
+            <Label FontSize="Micro"
+                   Text="Please use a combination of letters and numbers." />
+        </VerticalStackLayout>
+        <Label Grid.Row="4"
+               Text="First Name" />
+        <Entry Grid.Row="4"
+               Grid.Column="1"
+               Text=""/>
+        <Label Grid.Row="5"
+               Text="Last Name" />
+        <Entry Grid.Row="5"
+               Grid.Column="1"
+               Text=""/>
+        <Label Grid.Row="6"
+               Text="Email Address" />
+        <Entry Grid.Row="6"
+               Grid.Column="1"
+               Text=""/>
+        <FlexLayout Grid.Row="7"
+                    Grid.Column="1"
+                    Wrap="Wrap"
+                    Direction="Row">
+            <HorizontalStackLayout>
+                <Label Text="401k?"/>
+                <CheckBox IsChecked="True"/>
+            </HorizontalStackLayout>
+            <HorizontalStackLayout >
+                <Label Text="Flex Time?"/>
+                <CheckBox IsChecked="False"/>
+            </HorizontalStackLayout>
+            <HorizontalStackLayout >
+                <Label Text="Health Care?"/>
+                <CheckBox IsChecked="True"/>
+            </HorizontalStackLayout>
+            <HorizontalStackLayout >
+                <Label Text="Health Savings Account?"/>
+                <CheckBox IsChecked="True"/>
+            </HorizontalStackLayout>
+        </FlexLayout>
+        <HorizontalStackLayout Grid.Row="8"
+                               Grid.Column="1"
+                               Spacing="5">
+            <Button Text="Save" />
+            <Button Text="Cancel" />
+        </HorizontalStackLayout>
+    </Grid>
+
+
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs b/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs
new file mode 100644
index 0000000..664c571
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/UserDetailView.xaml.cs
@@ -0,0 +1,9 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class UserDetailView : ContentPage
+{
+	public UserDetailView()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/UserListView.xaml b/AdventureWorks.MAUI/Views/UserListView.xaml
new file mode 100644
index 0000000..2dfca07
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/UserListView.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="AdventureWorks.MAUI.Views.UserListView"
+             Title="User List">
+    <VerticalStackLayout VerticalOptions="Center"
+                         HorizontalOptions="Center"
+                         Spacing="10">
+        <Label 
+            Text="User List"
+            FontSize="Header"
+            HorizontalOptions="Center" />
+        <Button Text="Navigate to Detali"
+                Clicked="NavigateToDetail_Clicked" />
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/AdventureWorks.MAUI/Views/UserListView.xaml.cs b/AdventureWorks.MAUI/Views/UserListView.xaml.cs
new file mode 100644
index 0000000..02c74d5
--- /dev/null
+++ b/AdventureWorks.MAUI/Views/UserListView.xaml.cs
@@ -0,0 +1,14 @@
+namespace AdventureWorks.MAUI.Views;
+
+public partial class UserListView : ContentPage
+{
+    public UserListView()
+    {
+        InitializeComponent();
+    }
+
+    private async void NavigateToDetail_Clicked(object sender, EventArgs e)
+    {
+        await Shell.Current.GoToAsync(nameof(Views.UserDetailView));
+    }
+}
\ No newline at end of file