validation errors and fixed cancel buttons