Improve validation + toggle