diff --git a/AppShell.xaml b/AppShell.xaml
index b5ce1b2..2d127ce 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -7,7 +7,9 @@
     Shell.FlyoutBehavior="Flyout"
     Title="Justice">
 
-    <ShellContent Title="Login" ContentTemplate="{DataTemplate views:LoginPage}" />
-    <ShellContent Title="Register" ContentTemplate="{DataTemplate views:RegistrationPage}" />
-    <ShellContent Title="Home" ContentTemplate="{DataTemplate views:DashboardPage}" Route="DashboardPage" />
+    <ShellContent Title="Login" ContentTemplate="{DataTemplate views:LoginPage}" Route="LoginPage" />
+    <ShellContent Title="Dashboard" ContentTemplate="{DataTemplate views:DashboardPage}" Route="DashboardPage" />
+    <ShellContent Title="View Reports" ContentTemplate="{DataTemplate views:ViewReportsPage}" Route="ViewReportsPage" />
+
+    <MenuItem Text="Logout" Command="{Binding LogoutCommand}" />
 </Shell>
diff --git a/AppShell.xaml.cs b/AppShell.xaml.cs
index d89c2e3..5d609f4 100644
--- a/AppShell.xaml.cs
+++ b/AppShell.xaml.cs
@@ -1,10 +1,39 @@
-namespace Justice
+using Justice.Helpers;
+
+namespace Justice
 {
     public partial class AppShell : Shell
     {
+        public Command LogoutCommand { get; }
         public AppShell()
         {
             InitializeComponent();
+
+            Routing.RegisterRoute("LoginPage", typeof(Views.LoginPage));
+            Routing.RegisterRoute("DashboardPage", typeof(Views.DashboardPage));
+            Routing.RegisterRoute("ViewReportsPage", typeof(Views.ViewReportsPage));
+            
+            LogoutCommand = new Command(async () =>
+            {
+                AuthHelper.Logout();
+                await Shell.Current.GoToAsync("//LoginPage");
+            });
+
+            BindingContext = this;
+
+
+        }
+
+        protected override async void OnNavigating(ShellNavigatingEventArgs args)
+        {
+            base.OnNavigating(args);
+
+            // Check if user is authenticated 
+            if (!AuthHelper.IsLoggedIn && args.Target.Location.OriginalString.Contains("ViewReportsPage") || !AuthHelper.IsLoggedIn && args.Target.Location.OriginalString.Contains("DashboardPage"))
+            {
+                args.Cancel(); // Prevent navigation
+                await Shell.Current.GoToAsync("//LoginPage");
+            }
         }
     }
 }
diff --git a/Views/DashboardPage.xaml b/Views/DashboardPage.xaml
index 0a6e931..2b4d2c6 100644
--- a/Views/DashboardPage.xaml
+++ b/Views/DashboardPage.xaml
@@ -3,8 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Justice.Views.DashboardPage"
              Title="DashboardPage" BackgroundColor="WhiteSmoke">
+    
     <ScrollView>
+        
         <VerticalStackLayout>
+            <Label Text="Welcome to the End User Dashboard!" FontSize="Large" HorizontalOptions="Center" />
+
+            <!-- Logout Button -->
+            <Button Text="Logout" Clicked="OnLogoutClicked" HorizontalOptions="Center" VerticalOptions="EndAndExpand" />
             <Button Text="Get Current Location" 
             HorizontalOptions="Fill" 
             BackgroundColor="White"
diff --git a/Views/DashboardPage.xaml.cs b/Views/DashboardPage.xaml.cs
index 7d62a96..ca5036b 100644
--- a/Views/DashboardPage.xaml.cs
+++ b/Views/DashboardPage.xaml.cs
@@ -1,5 +1,6 @@
 using Justice.Helpers;
 using Microsoft;
+using Justice.Views;
 
 
 namespace Justice.Views;
@@ -11,33 +12,39 @@ public partial class DashboardPage : ContentPage
 		InitializeComponent();
 
     }
-
     private async void OnInformationCenterClicked(object sender, EventArgs e)
     {
         await Navigation.PushAsync(new InformationCenterPage());
     }
 
-
     private void OnHelpLineNumberClicked(object sender, EventArgs e)
     {
         Navigation.PushAsync(new HelplinePage());
     }
     private void OnViewReportClicked(object sender, EventArgs e)
     {
+
          Navigation.PushAsync(new ViewReportsPage());
     }
     private void OnIncidentReportClicked(object sender, EventArgs e)
     {
         Navigation.PushAsync(new IncidentReportPage());
     }
-
     private void OnSOSButtonClicked(object sender, EventArgs e)
     {
         Navigation.PushAsync(new SosPage());
     }
-
 	private void OnAddContactClicked(object sender, EventArgs e)
 	{
 		Navigation.PushAsync(new AddContactPage());
     }
+    private async void OnLogoutClicked(object sender, EventArgs e)
+    {
+        bool confirm = await DisplayAlert("Logout", "Are you sure you want to log out?", "Yes", "No");
+        if (confirm)
+        {
+            // Redirect to Login Page
+            await Shell.Current.GoToAsync("//LoginPage");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Views/LoginPage.xaml b/Views/LoginPage.xaml
index 1233c2d..7d8c6c2 100644
--- a/Views/LoginPage.xaml
+++ b/Views/LoginPage.xaml
@@ -6,9 +6,22 @@
     <StackLayout Padding="20">
         <Label Text="Login" FontSize="Large" HorizontalOptions="Center" />
 
-        <Entry x:Name="UsernameEntry" Placeholder="Username" />
-        <Entry x:Name="PasswordEntry" Placeholder="Password" IsPassword="True" />
+        <!-- Role Picker -->
+        <Entry  x:Name="UsernameEntry"  Placeholder="Username"/>
+        <Entry x:Name="PasswordEntry"  Placeholder="Password"/>
 
-        <Button Text="Login" Clicked="OnLoginClicked" />
+
+        <Label Text="Select Role:" FontSize="Medium" />
+        <Picker x:Name="RolePicker" Title="Choose a role">
+            <Picker.ItemsSource>
+                <x:Array Type="{x:Type x:String}">
+                    <x:String>End User</x:String>
+                    <x:String>Authority User</x:String>
+                </x:Array>
+            </Picker.ItemsSource>
+        </Picker>
+
+        <!-- Login Button -->
+        <Button Text="Login" Clicked="OnLoginButtonClicked" />
     </StackLayout>
 </ContentPage>
diff --git a/Views/LoginPage.xaml.cs b/Views/LoginPage.xaml.cs
index fbfd4c6..0fca58e 100644
--- a/Views/LoginPage.xaml.cs
+++ b/Views/LoginPage.xaml.cs
@@ -1,54 +1,50 @@
 using Justice.Helpers;
-using Justice.Models;
-using Org.BouncyCastle.Crypto.Generators;
-using System;
-using BCrypt.Net;
 
 namespace Justice.Views
 {
     public partial class LoginPage : ContentPage
     {
-        private readonly DatabaseHelper _dbHelper;
-
         public LoginPage()
         {
             InitializeComponent();
-            _dbHelper = new DatabaseHelper();
         }
 
-        private async void OnLoginClicked(object sender, EventArgs e)
+        private async void OnLoginButtonClicked(object sender, EventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(UsernameEntry.Text) || string.IsNullOrWhiteSpace(PasswordEntry.Text))
+            var endvalidUsername = "test";
+            var endvalidPassword = "test123";
+            var authvalidUsername = "auth";
+            var authvalidPassword = "auth123";
+
+            var enteredUsername = UsernameEntry?.Text?.Trim();
+            var enteredPassword = PasswordEntry?.Text?.Trim();
+            var selectedRole = RolePicker?.SelectedItem?.ToString();
+
+            if (string.IsNullOrEmpty(selectedRole))
             {
-                await DisplayAlert("Error", "Username and password are required.", "OK");
+                await DisplayAlert("Error", "Please select a role to proceed.", "OK");
                 return;
             }
 
-            try
+            if (string.IsNullOrWhiteSpace(enteredUsername) || string.IsNullOrWhiteSpace(enteredPassword))
             {
-                var user = await _dbHelper.FindAsync<User>("SELECT * FROM User WHERE Username = ?", UsernameEntry.Text.Trim());
-
-                if (user == null || !BCrypt.Net.BCrypt.Verify(PasswordEntry.Text.Trim(), user.Password))
-                {
-                    await DisplayAlert("Error", "Invalid username or password.", "OK");
-                    return;
-                }
-
-                await DisplayAlert("Success", $"Welcome {user.Username}!", "OK");
+                await DisplayAlert("Error", "Please enter both username and password.", "OK");
+                return;
+            }
 
-                // Navigate based on role
-                if (user.Role == "EndUser")
-                {
-                    await Navigation.PushAsync(new DashboardPage());
-                }
-                else if (user.Role == "AuthorityUser")
-                {
-                    await Navigation.PushAsync(new AuthorityDashboardPage());
-                }
+            if (enteredUsername == endvalidUsername && enteredPassword == endvalidPassword && selectedRole == "End User")
+            {
+                AuthHelper.Login("EndUser");
+                await Shell.Current.GoToAsync("//DashboardPage");
+            }
+            else if (enteredUsername == authvalidUsername && enteredPassword == authvalidPassword && selectedRole == "Authority User")
+            {
+                AuthHelper.Login("AuthorityUser");
+                await Shell.Current.GoToAsync("//ViewReportsPage");
             }
-            catch (Exception ex)
+            else
             {
-                await DisplayAlert("Error", $"Failed to login: {ex.Message}", "OK");
+                await DisplayAlert("Error", "Invalid credentials. Please try again.", "OK");
             }
         }
     }
diff --git a/Views/ViewReportsPage.xaml b/Views/ViewReportsPage.xaml
index 0307a7d..41eb8bd 100644
--- a/Views/ViewReportsPage.xaml
+++ b/Views/ViewReportsPage.xaml
@@ -5,7 +5,6 @@
 
     <StackLayout Padding="20">
         <Label Text="Submitted Reports" FontSize="Large" HorizontalOptions="Center" />
-
         <!-- List of Reports -->
         <ListView x:Name="ReportsListView"
                   HasUnevenRows="True"
@@ -21,9 +20,9 @@
                            FontSize="Small" />
                                 <Label Text="{Binding Description}" FontSize="Small" />
                             </StackLayout>
-                            <Button Text="Delete" 
+                            <Button x:Name="DeleteName" Text="Delete" 
                         Clicked="OnDeleteReportClicked" 
-                        CommandParameter="{Binding .}" HeightRequest="10" />
+                        CommandParameter="{Binding .}" HeightRequest="10" IsVisible="True"/>
                         </StackLayout>
                     </ViewCell>
                 </DataTemplate>
diff --git a/Views/ViewReportsPage.xaml.cs b/Views/ViewReportsPage.xaml.cs
index 6a457f4..fc67c73 100644
--- a/Views/ViewReportsPage.xaml.cs
+++ b/Views/ViewReportsPage.xaml.cs
@@ -85,7 +85,15 @@ namespace Justice.Views
                 }
             }
         }
-
+        private async void OnLogoutClicked(object sender, EventArgs e)
+        {
+            bool confirm = await DisplayAlert("Logout", "Are you sure you want to log out?", "Yes", "No");
+            if (confirm)
+            {
+                // Redirect to Login Page
+                await Shell.Current.GoToAsync("//LoginPage");
+            }
+        }
         private void MenuItem_Clicked(object sender, EventArgs e)
         {
 
diff --git a/bin/Debug/net9.0-android/Justice.dll b/bin/Debug/net9.0-android/Justice.dll
index f06c7ef..c1ce1f9 100644
Binary files a/bin/Debug/net9.0-android/Justice.dll and b/bin/Debug/net9.0-android/Justice.dll differ
diff --git a/bin/Debug/net9.0-android/Justice.pdb b/bin/Debug/net9.0-android/Justice.pdb
index 15933aa..cbdb412 100644
Binary files a/bin/Debug/net9.0-android/Justice.pdb and b/bin/Debug/net9.0-android/Justice.pdb differ
diff --git a/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk b/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk
index ba2cdc9..a177962 100644
Binary files a/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk and b/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk differ
diff --git a/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk.idsig b/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk.idsig
index 2c2efff..8e4e37e 100644
Binary files a/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk.idsig and b/bin/Debug/net9.0-android/com.companyname.justice-Signed.apk.idsig differ
diff --git a/bin/Debug/net9.0-android/com.companyname.justice.apk b/bin/Debug/net9.0-android/com.companyname.justice.apk
index d1f1084..b71aac5 100644
Binary files a/bin/Debug/net9.0-android/com.companyname.justice.apk and b/bin/Debug/net9.0-android/com.companyname.justice.apk differ
diff --git a/bin/Debug/net9.0-ios/iossimulator-x64/Justice.dll b/bin/Debug/net9.0-ios/iossimulator-x64/Justice.dll
index 6aa1f78..ef3bd3f 100644
Binary files a/bin/Debug/net9.0-ios/iossimulator-x64/Justice.dll and b/bin/Debug/net9.0-ios/iossimulator-x64/Justice.dll differ
diff --git a/bin/Debug/net9.0-ios/iossimulator-x64/Justice.pdb b/bin/Debug/net9.0-ios/iossimulator-x64/Justice.pdb
index 4b10274..3240b5e 100644
Binary files a/bin/Debug/net9.0-ios/iossimulator-x64/Justice.pdb and b/bin/Debug/net9.0-ios/iossimulator-x64/Justice.pdb differ
diff --git a/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.dll b/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.dll
index fcf1e8f..9e2f752 100644
Binary files a/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.dll and b/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.dll differ
diff --git a/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.pdb b/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.pdb
index 5861a1e..9d969ea 100644
Binary files a/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.pdb and b/bin/Debug/net9.0-maccatalyst/maccatalyst-x64/Justice.pdb differ
diff --git a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.dll b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.dll
index fa3e811..8ad01c7 100644
Binary files a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.dll and b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.dll differ
diff --git a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.exe b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.exe
index 38d6fd2..345dd2d 100644
Binary files a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.exe and b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.exe differ
diff --git a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.pdb b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.pdb
index 275689b..846269b 100644
Binary files a/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.pdb and b/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/Justice.pdb differ