Add error summary
Modify validation rules
Rename tokenValidator
Modify validation rules
Rework token validation