Improved validation UX