diff --git a/FlowHub.DataAccess/Platforms/Windows/DataAccessRepo.cs b/FlowHub.DataAccess/Platforms/Windows/DataAccessRepo.cs
index ed0b0d5..3bd37ce 100644
--- a/FlowHub.DataAccess/Platforms/Windows/DataAccessRepo.cs
+++ b/FlowHub.DataAccess/Platforms/Windows/DataAccessRepo.cs
@@ -7,7 +7,7 @@ namespace FlowHub.DataAccess;
 
 public class DataAccessRepo : IDataAccessRepo
 {
-    LiteDatabaseAsync db = null;
+    LiteDatabaseAsync db;
     public LiteDatabaseAsync GetDb() //this function returns the path where the db file is saved
     {
         string path;
diff --git a/FlowHub.Main/FlowHub.Main.csproj b/FlowHub.Main/FlowHub.Main.csproj
index ef80287..968b20e 100644
--- a/FlowHub.Main/FlowHub.Main.csproj
+++ b/FlowHub.Main/FlowHub.Main.csproj
@@ -228,6 +228,9 @@
 	  <MauiXaml Update="Views\Mobile\Statistics\StatisticsPageM.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\UpSertExpendituresPopUp.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -273,6 +276,9 @@
 	  <Compile Update="Views\Mobile\Incomes\UpSertIncomePageM.xaml.cs">
 	    <DependentUpon>UpSertIncomePageM.xaml</DependentUpon>
 	  </Compile>
+	  <Compile Update="Views\UpSertExpendituresPopUp.xaml.cs">
+	    <DependentUpon>UpSertExpendituresPopUp.xaml</DependentUpon>
+	  </Compile>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FlowHub.Main/MainPage.xaml.cs b/FlowHub.Main/MainPage.xaml.cs
index bdf7889..6356665 100644
--- a/FlowHub.Main/MainPage.xaml.cs
+++ b/FlowHub.Main/MainPage.xaml.cs
@@ -2,7 +2,7 @@
 
 public partial class MainPage : ContentPage
 {
-	int count = 0;
+	int count;
 
 	public MainPage()
 	{
diff --git a/FlowHub.Main/PopUpPages/InputPopUpPage.xaml b/FlowHub.Main/PopUpPages/InputPopUpPage.xaml
index 6801bb5..5ce24e7 100644
--- a/FlowHub.Main/PopUpPages/InputPopUpPage.xaml
+++ b/FlowHub.Main/PopUpPages/InputPopUpPage.xaml
@@ -5,8 +5,7 @@
              x:Class="FlowHub.Main.PopUpPages.InputPopUpPage"
              xmlns:validation="clr-namespace:InputKit.Shared.Validations;assembly=InputKit.Maui"  
              xmlns:material="clr-namespace:UraniumUI.Material.Controls;assembly=UraniumUI.Material"
-             CanBeDismissedByTappingOutsideOfPopup="False"
-            
+             CanBeDismissedByTappingOutsideOfPopup="False"            
              Size="300,180"
              Color="Transparent">
     <Border
diff --git a/FlowHub.Main/PopUpPages/InputPopUpPage.xaml.cs b/FlowHub.Main/PopUpPages/InputPopUpPage.xaml.cs
index 52d7fbd..f5be692 100644
--- a/FlowHub.Main/PopUpPages/InputPopUpPage.xaml.cs
+++ b/FlowHub.Main/PopUpPages/InputPopUpPage.xaml.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui.Views;
+using FlowHub.Main.Utilities;
 using FlowHub.Models;
 using System.Diagnostics;
 
@@ -84,17 +85,6 @@ private void OnDeleteButton_Clicked(object sender, EventArgs e)
     }
 }
 
-public class PopUpCloseResult
-{
-    public object Data { get; set; }
-    public PopupResult Result { get; set; }
-}
-public enum PopupResult
-{
-    OK,
-    Cancel,
-    Delete
-}
 [Flags]
 public enum InputType
 {
diff --git a/FlowHub.Main/Resources/Styles/Colors.xaml b/FlowHub.Main/Resources/Styles/Colors.xaml
index eac2c80..a324532 100644
--- a/FlowHub.Main/Resources/Styles/Colors.xaml
+++ b/FlowHub.Main/Resources/Styles/Colors.xaml
@@ -51,6 +51,7 @@
     <!-- Color Paletter 'Power' from Twitter -->
 
     <Color x:Key="BackGroundDark">#201F24</Color>
+    <Color x:Key="BorderDark">#1B1B1B</Color>
     <Color x:Key="BackGroundLight">#F2F0F4</Color>
     <Color x:Key="DataGridColorDark">#263238</Color>
     <Color x:Key="PositiveActionBtnDark">#6B69D6</Color>
diff --git a/FlowHub.Main/Resources/Styles/Styles.xaml b/FlowHub.Main/Resources/Styles/Styles.xaml
index bcaea26..4d42fcf 100644
--- a/FlowHub.Main/Resources/Styles/Styles.xaml
+++ b/FlowHub.Main/Resources/Styles/Styles.xaml
@@ -17,7 +17,7 @@
     </Style>
 
     <Style TargetType="Border">
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Dark=#29343E, Light=#F5F5F5}"/>
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Dark={StaticResource BackGroundDark}, Light=#F5F5F5}"/>
         <Setter Property="Stroke" Value="{StaticResource Primary}" />
         <Setter Property="StrokeShape" Value="RoundRectangle 10"/>
         <Setter Property="StrokeThickness" Value="2"/>
diff --git a/FlowHub.Main/Utilities/PopUpCloseResult.cs b/FlowHub.Main/Utilities/PopUpCloseResult.cs
new file mode 100644
index 0000000..1e9f6fa
--- /dev/null
+++ b/FlowHub.Main/Utilities/PopUpCloseResult.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FlowHub.Main.Utilities;
+
+public class PopUpCloseResult
+{
+    public object Data { get; set; }
+    public PopupResult Result { get; set; }
+}
+
+public enum PopupResult
+{
+    OK,
+    Cancel,
+    Delete
+}
\ No newline at end of file
diff --git a/FlowHub.Main/ViewModels/Expenditures/ManageExpendituresVM.cs b/FlowHub.Main/ViewModels/Expenditures/ManageExpendituresVM.cs
index 81ef2a6..ce5a472 100644
--- a/FlowHub.Main/ViewModels/Expenditures/ManageExpendituresVM.cs
+++ b/FlowHub.Main/ViewModels/Expenditures/ManageExpendituresVM.cs
@@ -7,6 +7,8 @@
 using FlowHub.Main.PDF_Classes;
 using FlowHub.Main.Platforms.NavigationMethods;
 using FlowHub.Main.PopUpPages;
+using FlowHub.Main.Utilities;
+using FlowHub.Main.Views;
 using FlowHub.Models;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -52,10 +54,10 @@ public ManageExpendituresVM(IExpendituresRepository expendituresRepository, IUse
     private bool activ;
 
     [ObservableProperty]
-    private bool showDayFilter = false;
+    private bool showDayFilter;
 
     [ObservableProperty]
-    private bool showStatisticBtn = false;
+    private bool showStatisticBtn;
 
     [ObservableProperty]
     private int dayFilterMonth ;
@@ -70,13 +72,13 @@ public ManageExpendituresVM(IExpendituresRepository expendituresRepository, IUse
     private string filterTitle;
 
     [ObservableProperty]
-    private bool showClearDayButton = false;
+    private bool showClearDayButton;
 
     [ObservableProperty]
-    private bool isExpanderExpanded = false;
+    private bool isExpanderExpanded;
 
     [ObservableProperty]
-    private bool isSyncing = false;
+    private bool isSyncing;
 
     private string filterOption;
     private int GlobalSortNamePosition = 1;
@@ -95,9 +97,8 @@ public async void PageloadedAsync()
         UserCurrency = ActiveUser.UserCurrency;
         await expendituresService.GetAllExpendituresAsync();
         filterOption = "Filter_Curr_Month";
-        //FilterGetExpOfToday(GlobalSortNamePosition);        
+
         FilterGetAllExp();
-      //  FilterGetAllExp();
     }
 
     [RelayCommand]
@@ -360,39 +361,43 @@ public void FilterGetExpOfSpecificDayMonth()
     }
 
     [RelayCommand]
-    public async void GoToAddExpenditurePage()
+    public async void ShowAddExpenditurePopUp()
     {
         if (ActiveUser is null)
         {
-            Debug.WriteLine("Can't go");
+            Debug.WriteLine("Can't Open PopUp");
            await Shell.Current.DisplayAlert("Wait", "Cannot go", "Ok");
         }
         else
         {
-            Dictionary<string, object> navParam = new()
-            {
-                { "SingleExpenditureDetails", new ExpendituresModel { DateSpent = DateTime.Now } },
-                { "PageTitle", new string("Add New Flow Out") },
-                { "IsAdd", true },
-                { "ActiveUser", ActiveUser }
-            };
+            var newExpenditure = new ExpendituresModel() { DateSpent = DateTime.Now };
+            string pageTitle = "Add New Flow Out";
+            bool isAdd = true;
 
-            NavFunction.FromManageExpToUpsertExpenditures(navParam);
+            await AddEditExpediture(newExpenditure, pageTitle, isAdd);
         }
     }
 
+
     [RelayCommand]
-    public void GoToEditExpenditurePage(ExpendituresModel expenditure)
+    public async void ShowEditExpenditurePopUp(ExpendituresModel expenditure)
     {
-        var navParam = new Dictionary<string, object>
-        {
-            { "SingleExpenditureDetails", expenditure },
-            { "PageTitle", new string("Edit Flow Out") },
-            { "IsAdd", false },
-            { "ActiveUser", ActiveUser }
-        };
+        await AddEditExpediture(expenditure, "Edit Flow Out", false);
+    }
+    private async Task AddEditExpediture(ExpendituresModel newExpenditure, string pageTitle, bool isAdd)
+    {
+        ExpendituresModel nExp = newExpenditure;
+        var NewUpSertVM = new UpSertExpenditureVM(expendituresService, userService, nExp, pageTitle, isAdd, ActiveUser);
+        var UpSertResult = (PopUpCloseResult)await Shell.Current.ShowPopupAsync(new UpSertExpendituresPopUp(NewUpSertVM));
 
-        NavFunction.FromManageExpToUpsertExpenditures(navParam);
+        if (UpSertResult.Result == PopupResult.OK)
+        {
+            ExpendituresModel exp = (ExpendituresModel)UpSertResult.Data;
+            ExpendituresList.Add(exp);
+            expendituresService.OfflineExpendituresList.Add(exp);
+            TotalAmount += exp.AmountSpent;
+            TotalExpenditures++;
+        }
     }
 
     [RelayCommand]
@@ -439,7 +444,7 @@ public async void DeleteExpenditureBtn(ExpendituresModel expenditure)
         const ToastDuration duration = ToastDuration.Short;
         const double fontSize = 14;
         string text;
-        bool response = (bool)(await Shell.Current.ShowPopupAsync(new AcceptCancelPopUpAlert("Do You want to delete?")))!;
+        bool response = (bool)(await Shell.Current.ShowPopupAsync(new AcceptCancelPopUpAlert("Do You want to DELETE?")))!;
         if (response)
         {
             IsBusy = true;
diff --git a/FlowHub.Main/ViewModels/Expenditures/PlannedExpenditures/MonthlyPlannedExp/UpSertMonthlyPlannedExpVM.cs b/FlowHub.Main/ViewModels/Expenditures/PlannedExpenditures/MonthlyPlannedExp/UpSertMonthlyPlannedExpVM.cs
index 77a1ca9..755dbe8 100644
--- a/FlowHub.Main/ViewModels/Expenditures/PlannedExpenditures/MonthlyPlannedExp/UpSertMonthlyPlannedExpVM.cs
+++ b/FlowHub.Main/ViewModels/Expenditures/PlannedExpenditures/MonthlyPlannedExp/UpSertMonthlyPlannedExpVM.cs
@@ -53,15 +53,15 @@ public UpSertMonthlyPlannedExpVM(IPlannedExpendituresRepository monthlyPlannedEx
     private UsersModel activeUser;
 
     [ObservableProperty]
-    bool hasComment = false;
+    bool hasComment;
 
     [ObservableProperty]
     private bool addAnotherExp;
 
     int expCounter;
 
-    double InitialSingleMonthlyPlannedExp = 0;
-    double InitialExpenditureAmount = 0;
+    double InitialSingleMonthlyPlannedExp;
+    double InitialExpenditureAmount;
 
     [RelayCommand]
     public void PageLoaded()
diff --git a/FlowHub.Main/ViewModels/Expenditures/UpSertExpenditureVM.cs b/FlowHub.Main/ViewModels/Expenditures/UpSertExpenditureVM.cs
index 8422a33..35f5e95 100644
--- a/FlowHub.Main/ViewModels/Expenditures/UpSertExpenditureVM.cs
+++ b/FlowHub.Main/ViewModels/Expenditures/UpSertExpenditureVM.cs
@@ -8,51 +8,58 @@
 using FlowHub.Main.Platforms.NavigationMethods;
 using CommunityToolkit.Maui.Views;
 using FlowHub.Main.PopUpPages;
+using FlowHub.Main.Utilities;
 
 namespace FlowHub.Main.ViewModels.Expenditures;
 
-[QueryProperty(nameof(SingleExpenditureDetails), "SingleExpenditureDetails")]
-[QueryProperty(nameof(PageTitle), nameof(PageTitle))]
-[QueryProperty(nameof(ActiveUser), "ActiveUser")]
-[QueryProperty(nameof(IsAdd), "IsAdd")]
+//[QueryProperty(nameof(SingleExpenditureDetails), "SingleExpenditureDetails")]
+//[QueryProperty(nameof(PageTitle), nameof(PageTitle))]
+//[QueryProperty(nameof(ActiveUser), "ActiveUser")]
+//[QueryProperty(nameof(IsAdd), "IsAdd")]
 public partial class UpSertExpenditureVM : ObservableObject
 {
     private readonly IExpendituresRepository _expenditureService;
     private readonly IUsersRepository userService;
     private readonly ManageExpendituresNavs NavFunctions = new();
-    public UpSertExpenditureVM(IExpendituresRepository expendituresRepository, IUsersRepository usersRepository)
+    public UpSertExpenditureVM(IExpendituresRepository expendituresRepository, IUsersRepository usersRepository, ExpendituresModel singleExpendituresDetails, string pageTitle, bool isAdd, UsersModel activeUser)
     {
         _expenditureService = expendituresRepository;
         userService = usersRepository;
+        SingleExpenditureDetails = singleExpendituresDetails;
+        PageTitle = pageTitle;
+        IsAdd = isAdd;
+        ActiveUser = activeUser;
     }
 
     [ObservableProperty]
-    private ExpendituresModel _SingleExpenditureDetails = new(){ DateSpent = DateTime.Now };
+    ExpendituresModel singleExpenditureDetails = new(){ DateSpent = DateTime.Now };
 
     [ObservableProperty]
-    private string _pageTitle;
+    string _pageTitle;
 
     [ObservableProperty]
-    private UsersModel _activeUser;
+    UsersModel _activeUser;
 
     [ObservableProperty]
-    private bool isAdd;
+    bool isAdd;
 
     [ObservableProperty]
-    private bool addAnotherExp;
+    double totalAmountSpent;
 
     [ObservableProperty]
-    public double totalAmountSpent;
+    double resultingBalance;
 
     [ObservableProperty]
-    public double resultingBalance;
+    PopupResult thisPopUpResult;
+    [ObservableProperty]
+    bool closePopUp;
 
-    private int expCounter;
     private double _initialUserPocketMoney;
     private double _initialExpenditureAmount;
 
     private double _initialTotalExpAmount;
 
+
     [RelayCommand]
     public void PageLoaded()
     {
@@ -63,7 +70,7 @@ public void PageLoaded()
         {
             IsAddTaxesChecked = true;
         }
-        expCounter = 1;
+        
         ResultingBalance = ActiveUser.PocketMoney;
         TotalAmountSpent = SingleExpenditureDetails.AmountSpent;
     }
@@ -73,41 +80,27 @@ public async void UpSertExpenditure()
     {
         if (ResultingBalance < 0)
         {
-            await Shell.Current.ShowPopupAsync(new ErrorNotificationPopUpAlert("Not Enough balance to save"));
-            return;
-        }
 
-        bool response = (bool)(await Shell.Current.ShowPopupAsync(new AcceptCancelPopUpAlert("Do You Want To Save?")))!;
-        if (!response)
-        {
-            Debug.WriteLine("Action cancelled by user");
+            ThisPopUpResult = PopupResult.Cancel;
+            ClosePopUp = true;
+            await Shell.Current.ShowPopupAsync(new ErrorNotificationPopUpAlert("Not Enough balance to save"));
             return;
         }
-
         CancellationTokenSource cancellationTokenSource = new();
 
         if (SingleExpenditureDetails.Id is not null)
         {
             UpdateExpenditureAsync(14, cancellationTokenSource);
-            return;
         }
-
-        string ToastNotifMessage = (await AddExpenditureAsync(SingleExpenditureDetails)) ? "Flow Out Added" : "Nothing was added";
-
-        IToast toast = Toast.Make(ToastNotifMessage, ToastDuration.Short, 14);
-        await toast.Show(cancellationTokenSource.Token);
-
-        if (!AddAnotherExp)
+        else
         {
-            NavFunctions.ReturnOnce();
-            return;
+            await AddExpenditureAsync(14, cancellationTokenSource);
         }
-
-        expCounter++;
-        PageTitle = $"Add Flow Out N° {expCounter}";
-        SingleExpenditureDetails = new() { DateSpent = DateTime.Now };
-        AddAnotherExp = false;
+        ThisPopUpResult = PopupResult.OK;
+        ClosePopUp = true;
     }
+
+
     private async void UpdateExpenditureAsync( double fontsize, CancellationTokenSource tokenSource)
     {
         double difference = TotalAmountSpent - _initialExpenditureAmount;
@@ -124,28 +117,31 @@ private async void UpdateExpenditureAsync( double fontsize, CancellationTokenSou
 
             await UpdateUserAsync(FinalTotalExp);
 
-            const string toastNotifMessage = "Expenditure Updated";
+            const string toastNotifMessage = "Flow Out Updated";
             var toast = Toast.Make(toastNotifMessage, ToastDuration.Short, fontsize);
             await toast.Show(tokenSource.Token);
 
-            NavFunctions.ReturnOnce();
+            ClosePopUp = true;
         }
     }
 
-    private async Task<bool> AddExpenditureAsync(ExpendituresModel expenditure)
+    private async Task<bool> AddExpenditureAsync(double fontSize, CancellationTokenSource tokenSource)
     {
-        expenditure.Currency = ActiveUser.UserCurrency;
-
-        expenditure.AmountSpent = TotalAmountSpent;
-        expenditure.Id = Guid.NewGuid().ToString();
-        expenditure.AddedDateTime = DateTime.UtcNow;
-
-        expenditure.UserId = userService.OfflineUser.UserIDOnline;
+        SingleExpenditureDetails.Currency = ActiveUser.UserCurrency;
+        SingleExpenditureDetails.AmountSpent = TotalAmountSpent;
+        SingleExpenditureDetails.Id = Guid.NewGuid().ToString();
+        SingleExpenditureDetails.AddedDateTime = DateTime.UtcNow;
+        SingleExpenditureDetails.UserId = userService.OfflineUser.UserIDOnline;
 
-        if (!await _expenditureService.AddExpenditureAsync(expenditure))
+        if (!await _expenditureService.AddExpenditureAsync(SingleExpenditureDetails))
+        {
             return false;
+        }
         await UpdateUserAsync(TotalAmountSpent);
 
+        const string toastNotifMessage = "Flow Out Added";
+        var toast = Toast.Make(toastNotifMessage, ToastDuration.Short, fontSize);
+        await toast.Show(tokenSource.Token);
         return true;
     }
 
@@ -160,7 +156,9 @@ private async Task UpdateUserAsync(double ExpAmountSpent)
     [RelayCommand]
     public void CancelBtn()
     {
-        NavFunctions.ReturnOnce();
+        Debug.WriteLine("Action cancelled by user");
+        ThisPopUpResult = PopupResult.Cancel;
+        ClosePopUp = true;
     }
 
     public void UnitPriceOrQuantityChanged()
@@ -177,38 +175,6 @@ public void UnitPriceOrQuantityChanged()
     [ObservableProperty]
     bool isAddTaxesChecked;
 
-    public void AddTax(TaxModel tax)
-    {
-        SingleExpenditureDetails.Taxes ??= new List<TaxModel>();
-
-        tax.IsChecked = true;
-        if (!SingleExpenditureDetails.Taxes.Exists(t => t.Name == tax.Name))
-        {
-            double taxAmount = (tax.Rate / 100) * SingleExpenditureDetails.AmountSpent;
-            TotalAmountSpent += taxAmount;
-            ResultingBalance -= taxAmount;
-            SingleExpenditureDetails.Taxes.Add(tax);
-        }
-    }
-
-    public void ApplyTax()
-    {
-        double totalTaxPercentage = SingleExpenditureDetails.Taxes?.Sum(tax => tax.Rate) ?? 0;
-        var taxedAmount = SingleExpenditureDetails.AmountSpent * (totalTaxPercentage / 100);
-        TotalAmountSpent = SingleExpenditureDetails.AmountSpent + taxedAmount;
-        ResultingBalance -= taxedAmount;
-    }
-    public void RemoveTax(TaxModel tax)
-    {
-        tax.IsChecked = false;
-        if (SingleExpenditureDetails.Taxes.Any(t => t.Name == tax.Name))
-        {
-            double taxMount = (tax.Rate / 100) * SingleExpenditureDetails.AmountSpent;
-            TotalAmountSpent -= taxMount;
-            ResultingBalance += taxMount;
-            SingleExpenditureDetails.Taxes.RemoveAll(t=>t.Name == tax.Name);
-        }
-    }
 
     [RelayCommand]
     public async void HardResetUserBalance()
@@ -242,4 +208,37 @@ public void GoToManageExpenditures()
     {
         NavFunctions.ReturnOnce();
     }
+
+    public void AddTax(TaxModel tax)
+    {
+        SingleExpenditureDetails.Taxes ??= new List<TaxModel>();
+
+        tax.IsChecked = true;
+        if (!SingleExpenditureDetails.Taxes.Exists(t => t.Name == tax.Name))
+        {
+            double taxAmount = (tax.Rate / 100) * SingleExpenditureDetails.AmountSpent;
+            TotalAmountSpent += taxAmount;
+            ResultingBalance -= taxAmount;
+            SingleExpenditureDetails.Taxes.Add(tax);
+        }
+    }
+
+    public void ApplyTax()
+    {
+        double totalTaxPercentage = SingleExpenditureDetails.Taxes?.Sum(tax => tax.Rate) ?? 0;
+        var taxedAmount = SingleExpenditureDetails.AmountSpent * (totalTaxPercentage / 100);
+        TotalAmountSpent = SingleExpenditureDetails.AmountSpent + taxedAmount;
+        ResultingBalance -= taxedAmount;
+    }
+    public void RemoveTax(TaxModel tax)
+    {
+        tax.IsChecked = false;
+        if (SingleExpenditureDetails.Taxes.Any(t => t.Name == tax.Name))
+        {
+            double taxMount = (tax.Rate / 100) * SingleExpenditureDetails.AmountSpent;
+            TotalAmountSpent -= taxMount;
+            ResultingBalance += taxMount;
+            SingleExpenditureDetails.Taxes.RemoveAll(t => t.Name == tax.Name);
+        }
+    }
 }
diff --git a/FlowHub.Main/ViewModels/HomePageVM.cs b/FlowHub.Main/ViewModels/HomePageVM.cs
index d57e493..252649f 100644
--- a/FlowHub.Main/ViewModels/HomePageVM.cs
+++ b/FlowHub.Main/ViewModels/HomePageVM.cs
@@ -4,6 +4,10 @@
 using FlowHub.Models;
 using FlowHub.Main.Platforms.NavigationMethods;
 using System.Diagnostics;
+using CommunityToolkit.Maui.Views;
+using FlowHub.Main.ViewModels.Expenditures;
+using FlowHub.Main.Views;
+using FlowHub.Main.Utilities;
 
 //This is the view model for the HOME PAGE
 namespace FlowHub.Main.ViewModels;
@@ -35,7 +39,7 @@ public HomePageVM(IExpendituresRepository expendituresRepository, ISettingsServi
     [ObservableProperty]
     public string userCurrency;
     [ObservableProperty]
-    public double pocketMoney = 0;
+    public double pocketMoney;
 
     [ObservableProperty]
     private UsersModel activeUser = new ();
@@ -74,18 +78,25 @@ public async void GoToAddExpenditurePage()
     {
         if (ActiveUser is null)
         {
+            Debug.WriteLine("Can't Open PopUp");
             await Shell.Current.DisplayAlert("Wait", "Cannot go", "Ok");
         }
         else
         {
-            Dictionary<string, object> navParam = new()
+            var newExpenditure = new ExpendituresModel() { DateSpent = DateTime.Now };
+            string pageTitle = "Add New Flow Out";
+            bool isAdd = true;
+
+            var NewUpSertVM = new UpSertExpenditureVM(_expendituresService, userService, newExpenditure, pageTitle, isAdd, ActiveUser);
+            var UpSertResult = (PopUpCloseResult)await Shell.Current.ShowPopupAsync(new UpSertExpendituresPopUp(NewUpSertVM));
+
+            if (UpSertResult.Result == PopupResult.OK)
             {
-                { "SingleExpenditureDetails", new ExpendituresModel { DateSpent = DateTime.Now } },
-                { "PageTitle", new string("Add New Flow Out") },
-                { "IsAdd", true },
-                { "ActiveUser", ActiveUser }
-            };
-            NavFunction.FromHomePageToUpsertExpenditure(navParam);
+                ExpendituresModel exp = (ExpendituresModel)UpSertResult.Data;
+                //add logic if this exp is the latest in terms of datetime
+                ExpendituresDetails = exp;
+                PocketMoney -= exp.AmountSpent;
+            }
         }
     }
 }
diff --git a/FlowHub.Main/ViewModels/Incomes/UpSertIncomeVM.cs b/FlowHub.Main/ViewModels/Incomes/UpSertIncomeVM.cs
index 611e500..3d155cf 100644
--- a/FlowHub.Main/ViewModels/Incomes/UpSertIncomeVM.cs
+++ b/FlowHub.Main/ViewModels/Incomes/UpSertIncomeVM.cs
@@ -35,9 +35,9 @@ public UpSertIncomeVM(IIncomeRepository incomeRepository, IUsersRepository users
     [ObservableProperty]
     private UsersModel activeUser;
 
-    double InitialUserPockerMoney = 0;
-    double InitialIncomeAmout = 0;
-    double _initialTotalIncAmount = 0;
+    double InitialUserPockerMoney;
+    double InitialIncomeAmout;
+    double _initialTotalIncAmount;
 
     [RelayCommand]
     public void PageLoaded()
diff --git a/FlowHub.Main/ViewModels/Settings/UserSettingsVM.cs b/FlowHub.Main/ViewModels/Settings/UserSettingsVM.cs
index 1c21975..d6b8463 100644
--- a/FlowHub.Main/ViewModels/Settings/UserSettingsVM.cs
+++ b/FlowHub.Main/ViewModels/Settings/UserSettingsVM.cs
@@ -7,6 +7,7 @@
 using FlowHub.Main.AdditionalResourcefulAPIClasses;
 using FlowHub.Main.Platforms.NavigationMethods;
 using FlowHub.Main.PopUpPages;
+using FlowHub.Main.Utilities;
 using FlowHub.Main.Views.Mobile.Settings;
 using FlowHub.Models;
 using System.Collections.ObjectModel;
diff --git a/FlowHub.Main/Views/Desktop/Expenditures/ManageExpendituresD.xaml b/FlowHub.Main/Views/Desktop/Expenditures/ManageExpendituresD.xaml
index 371920c..feee02b 100644
--- a/FlowHub.Main/Views/Desktop/Expenditures/ManageExpendituresD.xaml
+++ b/FlowHub.Main/Views/Desktop/Expenditures/ManageExpendituresD.xaml
@@ -69,7 +69,7 @@
         <VerticalStackLayout HorizontalOptions="Start" toolkit:DockLayout.DockPosition="Right">
             <ImageButton Source="{AppThemeBinding Dark=add_btn_d.png}" HeightRequest="60" 
                     BackgroundColor="Transparent"
-                    Command="{Binding GoToAddExpenditurePageCommand}"
+                    Command="{Binding ShowAddExpenditurePopUpCommand}"
                     ToolTipProperties.Text="Add New Income"/>
             <ImageButton Margin="10" Source="save_to_pdf_d.png" HeightRequest="60"
                         ToolTipProperties.Text="Click to Save to PDF" 
@@ -110,7 +110,9 @@
                         </material:DataGridColumn.TitleView>
                     <material:DataGridColumn.CellItemTemplate>
                         <DataTemplate>                            
-                            <Label Text="{Binding DateSpent, StringFormat='{0:MMMM dd, yyyy}'}"/>                            
+                            <Label Text="{Binding DateSpent, StringFormat='{0:MMMM dd, yyyy}'}"
+                                   VerticalOptions="Center"
+                                   HorizontalOptions="Center"/>
                         </DataTemplate>
                     </material:DataGridColumn.CellItemTemplate>
                 </material:DataGridColumn>
@@ -120,7 +122,8 @@
                 <material:DataGridColumn Title="Amount Spent">
                     <material:DataGridColumn.CellItemTemplate>
                         <DataTemplate>
-                            <Label>
+                                <Label VerticalOptions="Center"
+                                   HorizontalOptions="Center">
                                 <Label.Text>
                                     <MultiBinding StringFormat="{} {0:n2} {1}">
                                         <Binding Path="AmountSpent"/>
@@ -138,7 +141,7 @@
                                 <HorizontalStackLayout >
                                     <ImageButton Source="{AppThemeBinding Light=edit_l.png, Dark=edit_d.png}" WidthRequest="50"
                                                  Command="{Binding Source={x:Reference page}, 
-                                            Path=BindingContext.GoToEditExpenditurePageCommand}"  
+                                            Path=BindingContext.ShowEditExpenditurePopUpCommand}"  
                                                    CommandParameter="{Binding .}" />
                                     <ImageButton Source="{AppThemeBinding Light=delete_l.png, Dark=delete_d.png}" WidthRequest="50" 
                                                  Command="{Binding Source={x:Reference page}, 
diff --git a/FlowHub.Main/Views/Desktop/Expenditures/UpSertExpenditurePageD.xaml b/FlowHub.Main/Views/Desktop/Expenditures/UpSertExpenditurePageD.xaml
index f707aea..c5084eb 100644
--- a/FlowHub.Main/Views/Desktop/Expenditures/UpSertExpenditurePageD.xaml
+++ b/FlowHub.Main/Views/Desktop/Expenditures/UpSertExpenditurePageD.xaml
@@ -18,8 +18,7 @@
             <Style TargetType="Label">
                 <Setter Property="FontSize" Value="12"/>
                 <Setter Property="FontAttributes" Value="Bold"/>
-            </Style>
-            
+            </Style>            
 
         </ResourceDictionary>
     </ContentPage.Resources>
diff --git a/FlowHub.Main/Views/Desktop/HomePageD.xaml b/FlowHub.Main/Views/Desktop/HomePageD.xaml
index da09466..c7007c7 100644
--- a/FlowHub.Main/Views/Desktop/HomePageD.xaml
+++ b/FlowHub.Main/Views/Desktop/HomePageD.xaml
@@ -49,6 +49,7 @@
                 Margin="1"
                 Padding="5"
                 WidthRequest="430"
+                
                 Stroke="DarkSlateBlue"
                 StrokeThickness="2"
                 StrokeShape="RoundRectangle 8">
diff --git a/FlowHub.Main/Views/Mobile/Expenditures/ManageExpendituresM.xaml b/FlowHub.Main/Views/Mobile/Expenditures/ManageExpendituresM.xaml
index 2fe6efb..c6ca27c 100644
--- a/FlowHub.Main/Views/Mobile/Expenditures/ManageExpendituresM.xaml
+++ b/FlowHub.Main/Views/Mobile/Expenditures/ManageExpendituresM.xaml
@@ -134,7 +134,7 @@
             
         </Grid>
         
-        <Grid toolkit:DockLayout.DockPosition="Bottom" HeightRequest="65" Margin="10,10" >
+        <Grid toolkit:DockLayout.DockPosition="Bottom" HeightRequest="65" Margin="10,5" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"/>
@@ -145,24 +145,25 @@
                          HorizontalOptions="Start" IsVisible="{Binding ShowStatisticBtn}"
                          Grid.Column="0" VerticalOptions="Start" Command="{Binding GoToSpecificStatsPageCommand}"/>
             <!--IsVisible="{Binding ShowStatisticBtn}"-->
-            <Label FontSize="17" Margin="5" Grid.Column="0" Grid.ColumnSpan="3" HorizontalOptions="Center" VerticalOptions="End">
+            <Label FontSize="17" Margin="3" Grid.Column="0" Grid.ColumnSpan="3" HorizontalOptions="Center" VerticalOptions="End">
                 <Label.Text>
-                    <MultiBinding StringFormat="{} {2} Flow Out(s) worth {0:n3} {1}">
+                    <MultiBinding StringFormat="{} {2} Flow Out(s) worth {0:n2} {1}">
                         <Binding Path="TotalAmount"/>
                         <Binding Path="UserCurrency"/>
                         <Binding Path="TotalExpenditures"/>
                     </MultiBinding>
                 </Label.Text>
             </Label>
+            
 
-            <ImageButton IsVisible="True" Source="{AppThemeBinding Dark=add_btn_d.png, Light=add_btn_l.png}" Command="{Binding GoToAddExpenditurePageCommand}"
+            <ImageButton IsVisible="True" Source="{AppThemeBinding Dark=add_btn_d.png, Light=add_btn_l.png}" Command="{Binding ShowAddExpenditurePopUpCommand}"
                          VerticalOptions="Start" HorizontalOptions="End" Margin="0,0,10,0" Grid.Column="2"/>
 
             <ImageButton IsVisible="False" IsEnabled="False" Source="{AppThemeBinding Dark=add_btn_d.png, Light=add_btn_l.png}" Command="{Binding DropCollectionCommand}"
                          VerticalOptions="Start" HorizontalOptions="Center" Margin="0,0,10,0" Grid.Column="2"/>
         </Grid>
-
-        <CollectionView x:Name="ColView" IsVisible="true" ItemsSource="{Binding ExpendituresList}"
+        
+        <CollectionView x:Name="ColView" IsVisible="true" ItemsSource="{Binding ExpendituresList}"                        
                         HorizontalOptions="Center">
             <CollectionView.EmptyView>
                 <ContentView>
@@ -174,13 +175,13 @@
             </CollectionView.EmptyView>
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="models:ExpendituresModel">
-                    <ScrollView Margin="5,1.3">
-                        <VerticalStackLayout HorizontalOptions="Center">
+                    <ScrollView Margin="0,2">
+                        <VerticalStackLayout HorizontalOptions="Center"> <!--set to fill and expand for it to take the whole width of the screen-->
                             <SwipeView >
                                 <SwipeView.LeftItems>                                    
                                     <SwipeItem 
                                         Command="{Binding Source={x:Reference Page}, 
-                                            Path=BindingContext.GoToEditExpenditurePageCommand}"  
+                                            Path=BindingContext.ShowEditExpenditurePopUpCommand}"  
                                                    CommandParameter="{Binding .}" 
                                             IconImageSource="{AppThemeBinding Dark= edit_d.png, Light= edit_l.png}" 
                                                BackgroundColor="{AppThemeBinding Dark={StaticResource BackGroundDark}, Light={StaticResource BackGroundLight}}"/>
@@ -194,10 +195,10 @@
                                                BackgroundColor="{AppThemeBinding Dark={StaticResource BackGroundDark}, Light={StaticResource BackGroundLight}}"/>
                                 </SwipeView.RightItems>
 
-                                <Border Padding="10" HeightRequest="83" HorizontalOptions="Center" 
-                                        MinimumWidthRequest="370" MaximumWidthRequest="400">
+                                <Border Padding="10" HeightRequest="83" 
+                                        MinimumWidthRequest="370">
 
-                                    <VerticalStackLayout>
+                                    <VerticalStackLayout HorizontalOptions="FillAndExpand">
                                         <Label HorizontalOptions="Center" Text="{Binding DateSpent, StringFormat='{0:MMMM dd, yyyy}'}"/>
                                         <VerticalStackLayout>
                                             <Label Margin="3,0" Text="{Binding Reason, StringFormat='Reason: {0}'}"/>
diff --git a/FlowHub.Main/Views/Mobile/Expenditures/UpSertExpenditurePageM.xaml b/FlowHub.Main/Views/Mobile/Expenditures/UpSertExpenditurePageM.xaml
index e6311f0..d666111 100644
--- a/FlowHub.Main/Views/Mobile/Expenditures/UpSertExpenditurePageM.xaml
+++ b/FlowHub.Main/Views/Mobile/Expenditures/UpSertExpenditurePageM.xaml
@@ -114,9 +114,7 @@
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
-            <material:CheckBox IsChecked="{Binding AddAnotherExp}" IsVisible="{Binding IsAdd}"
-                                   Margin="5,0,10,0"
-                                   Text="Save and Add another" />
+        
 
             
             <ImageButton Source="{AppThemeBinding Dark=save_icon_d, Light=save_icon_l}" input:FormView.IsSubmitButton="True"/>
diff --git a/FlowHub.Main/Views/Mobile/Incomes/ManageIncomesM.xaml b/FlowHub.Main/Views/Mobile/Incomes/ManageIncomesM.xaml
index a0250eb..cdfee71 100644
--- a/FlowHub.Main/Views/Mobile/Incomes/ManageIncomesM.xaml
+++ b/FlowHub.Main/Views/Mobile/Incomes/ManageIncomesM.xaml
@@ -19,7 +19,7 @@
             </Label.GestureRecognizers>
             <Label.Text>
                 <MultiBinding StringFormat="{} Current Balance is {0:n2} {1}">
-                    <Binding Path="UserPockerMoney"/>
+                    <Binding Path="UserPocketMoney"/>
                     <Binding Path="UserCurrency"/>
                 </MultiBinding>
             </Label.Text>
diff --git a/FlowHub.Main/Views/Mobile/LoginM.xaml b/FlowHub.Main/Views/Mobile/LoginM.xaml
index 64f1330..9a6f69e 100644
--- a/FlowHub.Main/Views/Mobile/LoginM.xaml
+++ b/FlowHub.Main/Views/Mobile/LoginM.xaml
@@ -112,18 +112,24 @@
                 <!--Section for Login begins below-->
                 <VerticalStackLayout x:Name="LoginForm" Margin="25">
 
-                    <input:FormView SubmitCommand="{Binding GoToHomePageFromLoginCommand}" Spacing="25">
+                    <input:FormView SubmitCommand="{Binding GoToHomePageFromLoginCommand}" Spacing="25" >
                         <Label Text="User does not exist!" x:Name="NoUserFoundText" HorizontalOptions="Center" TextColor="Red" 
                                FontAttributes="Bold" FontSize="23" IsVisible="{Binding ErrorMessageVisible}" />
                         <ActivityIndicator IsRunning="{Binding IsBusy}" IsVisible="{Binding IsBusy}"/>
 
-                        <material:TextField Title="Email" Text="{Binding CurrentUser.Email}" AllowClear="True" Icon="{AppThemeBinding Dark=email_icon_d.png, Light=email_icon_l.png}">
+                        <material:TextField Title="Email" Text="{Binding CurrentUser.Email}" AllowClear="True" 
+                                            IsTextPredictionEnabled="True"
+                                            Icon="{AppThemeBinding Dark=email_icon_d.png, Light=email_icon_l.png}">
                             <material:TextField.Validations>
                                 <validation:RequiredValidation/>
                             </material:TextField.Validations>
                         </material:TextField>
 
-                        <material:TextField Title="Password" Text="{Binding CurrentUser.Password}" Icon="{AppThemeBinding Dark= password_d.png, Light=password_l.png}" IsPassword="True">
+                        <material:TextField Title="Password" Text="{Binding CurrentUser.Password}" 
+                                            Icon="{AppThemeBinding Dark= password_d.png, Light=password_l.png}" IsPassword="True">
+                            <material:TextField.Attachments>
+                                <material:TextFieldPasswordShowHideAttachment/>
+                            </material:TextField.Attachments>
                             <material:TextField.Validations>
                                 <validation:RequiredValidation/>
                             </material:TextField.Validations>
@@ -132,13 +138,7 @@
 
                         <ImageButton Source="{AppThemeBinding Dark=login_online_d, Light=login_online_l}"
                                      Clicked="LoginOnlineBtn_Clicked" x:Name="LoginButton" input:FormView.IsSubmitButton="True"/>
-                        <Button Text="Login" BackgroundColor="DarkSlateBlue" FontAttributes="Bold" 
-                            FontSize="20" IsVisible="false"
-                            TextColor="White" input:FormView.IsSubmitButton="True"/>
                         
-                        <Button Text="Login Online" BackgroundColor="BlueViolet" FontAttributes="Bold" 
-                            FontSize="20" IsVisible="false" Clicked="LoginOnlineBtn_Clicked"
-                            TextColor="White" input:FormView.IsSubmitButton="True"/>
 
                     </input:FormView>
 
diff --git a/FlowHub.Main/Views/Mobile/Statistics/SingleMonthStatsPageM.xaml.cs b/FlowHub.Main/Views/Mobile/Statistics/SingleMonthStatsPageM.xaml.cs
index 1392af3..de22744 100644
--- a/FlowHub.Main/Views/Mobile/Statistics/SingleMonthStatsPageM.xaml.cs
+++ b/FlowHub.Main/Views/Mobile/Statistics/SingleMonthStatsPageM.xaml.cs
@@ -25,7 +25,7 @@ protected override void OnAppearing()
 		LineChart.Series = viewModel.LineSeries;
 		SelectedTitle.Text = "Biggest Flow Out Details";
 	}
-	ChartPoint obj = null;
+	ChartPoint obj;
     private void Chart_ChartPointPointerDown(IChartView chart, ChartPoint point)
     {
 		if (point is not null)
diff --git a/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml b/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml
new file mode 100644
index 0000000..90f4834
--- /dev/null
+++ b/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<mct:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:mct="clr-namespace:CommunityToolkit.Maui.Views;assembly=CommunityToolkit.Maui"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             x:Class="FlowHub.Main.Views.UpSertExpendituresPopUp"
+             xmlns:validation="clr-namespace:InputKit.Shared.Validations;assembly=InputKit.Maui"  
+             xmlns:material="clr-namespace:UraniumUI.Material.Controls;assembly=UraniumUI.Material"
+             xmlns:input="clr-namespace:InputKit.Shared.Controls;assembly=InputKit.Maui"
+             xmlns:models="clr-namespace:FlowHub.Models;assembly=FlowHub.Models"
+             xmlns:viewModels="clr-namespace:FlowHub.Main.ViewModels.Expenditures"
+             x:DataType="viewModels:UpSertExpenditureVM" 
+             CanBeDismissedByTappingOutsideOfPopup="False"            
+             Size="{OnPlatform Android ='350,400', WinUI='400,400'} "
+             Color="Transparent"
+             x:Name="page">
+
+    
+    <Border Margin="8,0"
+        Stroke="{AppThemeBinding Dark={StaticResource BackGroundDark}, Light=White}"
+        StrokeThickness="0"
+        StrokeShape="RoundRectangle 12">
+        <Border.Resources>
+            
+        </Border.Resources>
+        <VerticalStackLayout>
+        <Label Text="{Binding PageTitle}" HorizontalOptions="Center" Margin="0,10,0,0" 
+               TextDecorations="Underline" FontAttributes="Bold"
+               FontSize="23" TextColor="White"/>
+
+            <input:FormView Spacing="5" Margin="8,0"
+                    SubmitCommand="{Binding UpSertExpenditureCommand}">
+                <input:FormView.Resources>
+                    <ResourceDictionary>
+                        <Style TargetType="material:TextField">
+                            <Setter Property="BorderColor" Value="DarkSlateBlue"/>
+                        </Style>
+                        <Style TargetType="material:EditorField">
+                            <Setter Property="BorderColor" Value="DarkSlateBlue"/>
+                        </Style>
+                        <Style TargetType="material:DatePickerField">
+                            <Setter Property="BorderColor" Value="DarkSlateBlue"/>
+                        </Style>
+                    </ResourceDictionary>
+                </input:FormView.Resources>
+
+                <VerticalStackLayout  toolkit:DockLayout.DockPosition="Top" >
+                    <VerticalStackLayout.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding HardResetUserBalanceCommand}"/>
+                    </VerticalStackLayout.GestureRecognizers>
+                    
+                    <Label HorizontalOptions="End" Margin="8,8" FontAttributes="Italic" FontSize="13"
+                                    TextColor="AliceBlue">
+                        <Label.Text>
+                            <MultiBinding StringFormat="{} Resulting Balance : {0:n2} {1}">
+                                <Binding Path="ResultingBalance"/>
+                                <Binding Path="ActiveUser.UserCurrency"/>
+                            </MultiBinding>
+                        </Label.Text>
+                    </Label>
+                    <Label HorizontalOptions="End" Margin="8,2" FontAttributes="Italic" FontSize="13"
+                                    TextColor="AliceBlue">
+                        <Label.Text>
+                            <MultiBinding StringFormat="{} Flow Out's Amount : {0:n2} {1}">
+                                <Binding Path="TotalAmountSpent"/>
+                                <Binding Path="ActiveUser.UserCurrency"/>
+                            </MultiBinding>
+                        </Label.Text>
+                    </Label>
+                </VerticalStackLayout>
+
+                <material:DatePickerField MinimumDate="01/01/2022" Title="Date Spent" 
+                                            MaximumDate="{Binding Source={x:Static sys:DateTime.Now}, StringFormat='{0:MMMM dd, yyyy}'}"
+                                            Date="{Binding SingleExpenditureDetails.DateSpent}">
+
+                    <material:DatePickerField.Validations>
+                        <validation:RequiredValidation/>
+                    </material:DatePickerField.Validations>
+                </material:DatePickerField>
+
+                <Grid ColumnDefinitions="*" ColumnSpacing="8">
+                    <material:TextField Grid.Column="0" Title="Unit Price"
+                                        x:Name="UnitPrice" Focused="UnitPrice_Focused"
+                                        TextChanged="UnitPrice_TextChanged"
+                                        AccentColor="Gray"
+                                        Text="{Binding SingleExpenditureDetails.UnitPrice}" Keyboard="Numeric" >
+                       
+                    </material:TextField>
+                </Grid>
+
+                <material:EditorField Title="Reason" Text="{Binding SingleExpenditureDetails.Reason}" IsTextPredictionEnabled="True"
+                                      AccentColor="Gray"
+                                      TitleColor="White">
+                    <material:EditorField.Validations>
+                        <validation:RequiredValidation/>
+                    </material:EditorField.Validations>
+                </material:EditorField>
+
+                <HorizontalStackLayout HorizontalOptions="Center" Margin="0,15,0,0" Spacing="15">
+                    <Button input:FormView.IsSubmitButton="True"
+                                            Text="Save Expenditure" BackgroundColor="{StaticResource SaveBtnColor}" TextColor="White" 
+                                            FontSize="20" FontAttributes="Bold"/>
+
+                    <Button Command="{Binding CancelBtnCommand}"
+                                            Text="Cancel" BackgroundColor="{StaticResource NegativeActionBtnDark}" TextColor="White"
+                                            FontSize="16" />
+
+                </HorizontalStackLayout>
+
+
+            </input:FormView>
+        </VerticalStackLayout>
+    </Border>
+        
+</mct:Popup>
\ No newline at end of file
diff --git a/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml.cs b/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml.cs
new file mode 100644
index 0000000..7afb9b9
--- /dev/null
+++ b/FlowHub.Main/Views/UpSertExpendituresPopUp.xaml.cs
@@ -0,0 +1,69 @@
+using CommunityToolkit.Maui.Views;
+using FlowHub.Main.Utilities;
+using FlowHub.Main.ViewModels.Expenditures;
+using UraniumUI.Material.Controls;
+
+namespace FlowHub.Main.Views;
+
+public partial class UpSertExpendituresPopUp : Popup
+{
+	readonly UpSertExpenditureVM viewModel;
+	public UpSertExpendituresPopUp(UpSertExpenditureVM vm)
+	{
+		InitializeComponent();
+		viewModel = vm;
+        this.BindingContext = vm;
+        viewModel.PageLoadedCommand.Execute(null);
+
+#if ANDROID
+        var mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
+        var orientation = mainDisplayInfo.Orientation;  
+        var width = mainDisplayInfo.Width;
+        var height = mainDisplayInfo.Height;
+        var density = mainDisplayInfo.Density;
+        var smallestWidth = Math.Min(width, height) * density;
+        var popupWidth = smallestWidth * 0.115;
+        
+        var popupHeight = (smallestWidth * 0.13) > 401 ? 350 : smallestWidth * 0.13;
+        Size = new Size(popupWidth, popupHeight);
+#elif WINDOWS
+        this.Size = new Size(400, 400);
+#endif
+        viewModel.PropertyChanged += ViewModel_PropertyChanged;
+	}
+
+    private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(viewModel.ClosePopUp) && viewModel.ClosePopUp)
+        {
+            viewModel.PropertyChanged -= ViewModel_PropertyChanged;
+            if (viewModel.ThisPopUpResult == PopupResult.Cancel)
+            {
+                Close(new PopUpCloseResult() { Data = null, Result = PopupResult.Cancel });
+                return;
+            }
+            Close(new PopUpCloseResult() { Data = viewModel.SingleExpenditureDetails, Result = viewModel.ThisPopUpResult});
+        }
+    }
+
+    
+
+    private void UnitPrice_TextChanged(object sender, TextChangedEventArgs e)
+    {
+        var s = sender as TextField;
+        if (s.Text?.Length == 0)
+        {
+            viewModel.SingleExpenditureDetails.UnitPrice = 0;
+        }
+
+        viewModel.UnitPriceOrQuantityChanged();
+    }
+    private void UnitPrice_Focused(object sender, FocusEventArgs e)
+    {
+        if (UnitPrice.Text == "0")
+        {
+            UnitPrice.Text = "";
+        }
+    }
+}
+
diff --git a/FlowHub.Models/UsersModel.cs b/FlowHub.Models/UsersModel.cs
index 838cd02..3335938 100644
--- a/FlowHub.Models/UsersModel.cs
+++ b/FlowHub.Models/UsersModel.cs
@@ -7,10 +7,10 @@ namespace FlowHub.Models;
 public class UsersModel : INotifyPropertyChanged
 {
     private string? email;
-    private double totalExpendituresAmount = 0;
-    private double totalIncomeAmount = 0;
-    private double totalInDebtAmount = 0;
-    private double totalOutDebtAmount = 0;
+    private double totalExpendituresAmount;
+    private double totalIncomeAmount;
+    private double totalInDebtAmount;
+    private double totalOutDebtAmount;
 
     public List<UsersModel> documents { get; set; }
     [BsonId]