Adding validate for all fields
Fix spaces