Refactor expense modal and add to edit/new page