improve validation UX