#master: Add cancel button on edit/new footer. Change the help message on popover