Change pump/timer additions to a use embedded forms instead of popups, and allow cancelling them