Re-organized some code. Added edit_popover valiables
Added date Button/popover and cost entry on edit