improvement of validation and UX