diff --git a/App.xaml.cs b/App.xaml.cs
index 5e4165e..c5091e3 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -19,7 +19,11 @@ namespace Justice
                 var dbHelper = new DatabaseHelper();
                 await dbHelper.InitializeAsync<EmergencyContact>();
                 await dbHelper.InitializeAsync<IncidentReport>();
-                await dbHelper.InitializeAsync<User>();// Asynchronously create the EmergencyContact table
+                await dbHelper.InitializeAsync<User>();
+                Task.Run(async () =>
+                {
+                    await dbHelper.InitializeAsync<User>(); // Initialize the User table
+                }).Wait();// Asynchronously create the EmergencyContact table
             }
             catch (Exception ex)
             {
diff --git a/AppShell.xaml b/AppShell.xaml
index 2d127ce..4f87549 100644
--- a/AppShell.xaml
+++ b/AppShell.xaml
@@ -10,6 +10,7 @@
     <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" />
+    <ShellContent Title="Register" ContentTemplate="{DataTemplate views:RegistrationPage}" Route="RegistrationPage" />
 
     <MenuItem Text="Logout" Command="{Binding LogoutCommand}" />
 </Shell>
diff --git a/Helpers/AuthHelper.cs b/Helpers/AuthHelper.cs
new file mode 100644
index 0000000..04a3456
--- /dev/null
+++ b/Helpers/AuthHelper.cs
@@ -0,0 +1,27 @@
+using Microsoft.Maui.Storage;
+
+namespace Justice.Helpers
+{
+    public static class AuthHelper
+    {
+        private const string IsLoggedInKey = "IsLoggedIn";
+        private const string UserRoleKey = "UserRole";
+
+        public static bool IsLoggedIn => Preferences.Get(IsLoggedInKey, false);
+
+        public static string UserRole => Preferences.Get(UserRoleKey, string.Empty);
+
+        public static void Login(string role)
+        {
+            Preferences.Set(IsLoggedInKey, true);
+            Preferences.Set(UserRoleKey, role);
+        }
+
+        public static void Logout()
+        {
+            Preferences.Remove(IsLoggedInKey);
+            Preferences.Remove(UserRoleKey);
+
+        }
+    }
+}
diff --git a/Models/User.cs b/Models/User.cs
index 15dd6d5..49c2924 100644
--- a/Models/User.cs
+++ b/Models/User.cs
@@ -13,6 +13,7 @@ namespace Justice.Models
         public string Password { get; set; }
         public string Role { get; set; }
         public string AuthorityType { get; set; }
+        public string IdentityFilePath { get; set; }
     }
     public class AuthorityUser : User
     { 
diff --git a/Views/DashboardPage.xaml b/Views/DashboardPage.xaml
index 2b4d2c6..177a4f6 100644
--- a/Views/DashboardPage.xaml
+++ b/Views/DashboardPage.xaml
@@ -3,19 +3,21 @@
              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"
-            
-            TextColor="DarkGray"/>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <VerticalStackLayout>
+                    <Label Grid.Column="0" Text="Welcome to the User Dashboard!" FontSize="Medium" HorizontalOptions="Center" Margin="10" FontAttributes="Bold" TextColor="DarkGray"/>
+                    <Border></Border> 
+                </VerticalStackLayout>
+                <Button Grid.Column="1" Text="Logout" Clicked="OnLogoutClicked" HorizontalOptions="Start" VerticalOptions="EndAndExpand" />
+            </Grid>
             <Grid RowSpacing="10" ColumnSpacing="10">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
diff --git a/Views/DashboardPage.xaml.cs b/Views/DashboardPage.xaml.cs
index ca5036b..13e7421 100644
--- a/Views/DashboardPage.xaml.cs
+++ b/Views/DashboardPage.xaml.cs
@@ -43,8 +43,10 @@ public partial class DashboardPage : ContentPage
         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 7d8c6c2..986ff7d 100644
--- a/Views/LoginPage.xaml
+++ b/Views/LoginPage.xaml
@@ -8,7 +8,7 @@
 
         <!-- Role Picker -->
         <Entry  x:Name="UsernameEntry"  Placeholder="Username"/>
-        <Entry x:Name="PasswordEntry"  Placeholder="Password"/>
+        <Entry x:Name="PasswordEntry"  Placeholder="Password" IsPassword="True"/>
 
 
         <Label Text="Select Role:" FontSize="Medium" />
@@ -23,5 +23,6 @@
 
         <!-- Login Button -->
         <Button Text="Login" Clicked="OnLoginButtonClicked" />
+        <Button Text="Register" Margin="5" BackgroundColor="Green" Clicked="OnRegisterButtonClicked"/>
     </StackLayout>
 </ContentPage>
diff --git a/Views/LoginPage.xaml.cs b/Views/LoginPage.xaml.cs
index 0fca58e..6456285 100644
--- a/Views/LoginPage.xaml.cs
+++ b/Views/LoginPage.xaml.cs
@@ -8,13 +8,22 @@ namespace Justice.Views
         {
             InitializeComponent();
         }
+        protected override void OnAppearing()
+        {
+            base.OnAppearing();
+
+            // Clear the fields when the page is loaded
+            UsernameEntry.Text = string.Empty;
+            PasswordEntry.Text = string.Empty;
+            RolePicker.SelectedItem = null; // Clear role selection if needed
+        }
 
         private async void OnLoginButtonClicked(object sender, EventArgs e)
         {
-            var endvalidUsername = "test";
-            var endvalidPassword = "test123";
-            var authvalidUsername = "auth";
-            var authvalidPassword = "auth123";
+            var endvalidUsername = "enduser";
+            var endvalidPassword = "enduser123";
+            var authvalidUsername = "authuser";
+            var authvalidPassword = "authuser123";
 
             var enteredUsername = UsernameEntry?.Text?.Trim();
             var enteredPassword = PasswordEntry?.Text?.Trim();
@@ -47,5 +56,10 @@ namespace Justice.Views
                 await DisplayAlert("Error", "Invalid credentials. Please try again.", "OK");
             }
         }
+        private async void OnRegisterButtonClicked(object sender, EventArgs e)
+        {
+            await Shell.Current.GoToAsync("//RegistrationPage");
+        }
+
     }
 }
diff --git a/Views/RegistrationPage.xaml b/Views/RegistrationPage.xaml
index c8f7e3f..1740e85 100644
--- a/Views/RegistrationPage.xaml
+++ b/Views/RegistrationPage.xaml
@@ -4,21 +4,29 @@
              Title="Register">
 
     <StackLayout Padding="20">
-        <Label Text="Register" FontSize="Large" HorizontalOptions="Center" />
+        <Label Text="Register as End User" FontSize="Large" HorizontalOptions="Center" />
 
-        <Entry x:Name="UsernameEntry" Placeholder="Username" />
-        <Entry x:Name="PasswordEntry" Placeholder="Password" IsPassword="True" />
+        <!-- Username -->
+        <Label Text="Username:" FontSize="Medium" />
+        <Entry x:Name="UsernameEntry" Placeholder="Enter your username" />
 
-        <Picker x:Name="RolePicker" Title="Select Role">
-            <Picker.ItemsSource>
-                <x:Array Type="{x:Type x:String}">
-                    <x:String>EndUser</x:String>
-                    <x:String>AuthorityUser</x:String>
-                </x:Array>
-            </Picker.ItemsSource>
-        </Picker>
+        <!-- Password -->
+        <Label Text="Password:" FontSize="Medium" />
+        <Entry x:Name="PasswordEntry" Placeholder="Enter your password" IsPassword="True" />
 
-        <Entry x:Name="AuthorityTypeEntry" Placeholder="Authority Type (Optional)" IsVisible="False" />
+        <!-- Confirm Password -->
+        <Label Text="Confirm Password:" FontSize="Medium" />
+        <Entry x:Name="ConfirmPasswordEntry" Placeholder="Confirm your password" IsPassword="True" />
+
+        <!-- Identity Upload -->
+        <Label Text="Upload Identity Document:" FontSize="Medium" />
+        <Button Text="Choose File" Clicked="OnChooseFileClicked" />
+        <Label x:Name="IdentityFileLabel" Text="No file selected" FontSize="Small" TextColor="Gray" />
+
+        <!-- Register Button -->
         <Button Text="Register" Clicked="OnRegisterClicked" />
+
+        <!-- Loader -->
+        <ActivityIndicator IsRunning="{Binding IsBusy}" IsVisible="{Binding IsBusy}" VerticalOptions="Center" />
     </StackLayout>
 </ContentPage>
diff --git a/Views/RegistrationPage.xaml.cs b/Views/RegistrationPage.xaml.cs
index 87600f0..c5412f4 100644
--- a/Views/RegistrationPage.xaml.cs
+++ b/Views/RegistrationPage.xaml.cs
@@ -1,53 +1,141 @@
 using Justice.Helpers;
 using Justice.Models;
-using Org.BouncyCastle.Crypto.Generators;
-using System;
+using Microsoft.Maui.Storage;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 
 namespace Justice.Views
 {
-    public partial class RegistrationPage : ContentPage
+    public partial class RegistrationPage : ContentPage, INotifyPropertyChanged
     {
         private readonly DatabaseHelper _dbHelper;
+        private string _identityFilePath;
+
+        private bool _isBusy;
+        public bool IsBusy
+        {
+            get => _isBusy;
+            set
+            {
+                _isBusy = value;
+                OnPropertyChanged();
+            }
+        }
 
         public RegistrationPage()
         {
             InitializeComponent();
             _dbHelper = new DatabaseHelper();
-            RolePicker.SelectedIndexChanged += (s, e) =>
-            {
-                AuthorityTypeEntry.IsVisible = RolePicker.SelectedItem?.ToString() == "AuthorityUser";
-            };
+            BindingContext = this;
         }
 
-        private async void OnRegisterClicked(object sender, EventArgs e)
+        private async void OnChooseFileClicked(object sender, EventArgs e)
         {
-            if (string.IsNullOrWhiteSpace(UsernameEntry.Text) || string.IsNullOrWhiteSpace(PasswordEntry.Text) || RolePicker.SelectedItem == null)
+            try
             {
-                await DisplayAlert("Error", "All fields are required.", "OK");
-                return;
-            }
+                var customFileType = new FilePickerFileType(new Dictionary<DevicePlatform, IEnumerable<string>>
+                {
+                    { DevicePlatform.Android, new[] { "*/*" } }, // Allow all files on Android
+                    { DevicePlatform.iOS, new[] { "public.data" } },
+                    { DevicePlatform.WinUI, new[] { "*" } }
+                });
+
+                var options = new PickOptions
+                {
+                    PickerTitle = "Select Identity Document",
+                    FileTypes = customFileType
+                };
 
-            var hashedPassword = BCrypt.Net.BCrypt.HashPassword(PasswordEntry.Text.Trim());
-            var user = new User
+                var result = await FilePicker.PickAsync(options);
+
+                if (result != null)
+                {
+                    _identityFilePath = result.FullPath;
+                    IdentityFileLabel.Text = $"Selected File: {result.FileName}";
+                }
+                else
+                {
+                    IdentityFileLabel.Text = "No file selected";
+                }
+            }
+            catch (Exception ex)
             {
-                Username = UsernameEntry.Text.Trim(),
-                Password = hashedPassword,
-                Role = RolePicker.SelectedItem.ToString(),
-                AuthorityType = AuthorityTypeEntry.IsVisible ? AuthorityTypeEntry.Text.Trim() : null
-            };
+                await DisplayAlert("Error", $"Failed to select file: {ex.Message}", "OK");
+            }
+        }
+
+        private async void OnRegisterClicked(object sender, EventArgs e)
+        {
+            if (IsBusy) return;
+            IsBusy = true;
 
             try
             {
+                var username = UsernameEntry?.Text?.Trim();
+                var password = PasswordEntry?.Text?.Trim();
+                var confirmPassword = ConfirmPasswordEntry?.Text?.Trim();
+
+                // Validate inputs
+                if (string.IsNullOrWhiteSpace(username) || string.IsNullOrWhiteSpace(password) || string.IsNullOrWhiteSpace(confirmPassword))
+                {
+                    await DisplayAlert("Error", "All fields are required.", "OK");
+                    return;
+                }
+
+                if (string.IsNullOrWhiteSpace(_identityFilePath))
+                {
+                    await DisplayAlert("Error", "Please upload an identity document.", "OK");
+                    return;
+                }
+
+                if (password != confirmPassword)
+                {
+                    await DisplayAlert("Error", "Passwords do not match.", "OK");
+                    return;
+                }
+
+                // Hash the password asynchronously
+                var hashedPassword = await Task.Run(() => BCrypt.Net.BCrypt.HashPassword(password));
+
+                var user = new User
+                {
+                    Username = username,
+                    Password = hashedPassword,
+                    Role = "End User", // Fixed role for End User
+                    IdentityFilePath = _identityFilePath // Save file path
+                };
+
+                // Save to database
                 await _dbHelper.InitializeAsync<User>();
+                var existingUser = await _dbHelper.FindAsync<User>("SELECT * FROM User WHERE Username = ?", username);
+
+                if (existingUser != null)
+                {
+                    await DisplayAlert("Error", "Username already exists.", "OK");
+                    return;
+                }
+
                 await _dbHelper.InsertAsync(user);
+                await DisplayAlert("Success", "Registration successful!", "OK");
 
-                await DisplayAlert("Success", "User registered successfully.", "OK");
-                await Navigation.PopAsync();
+                // Redirect to Login Page
+                await Shell.Current.GoToAsync("//LoginPage");
             }
             catch (Exception ex)
             {
                 await DisplayAlert("Error", $"Failed to register: {ex.Message}", "OK");
             }
+            finally
+            {
+                IsBusy = false;
+            }
+        }
+
+        // INotifyPropertyChanged Implementation
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
     }
 }