Added return on the cancel buttons