edited popover cancel buttons