Small refactoring and creating the new_cash_flow page #65