UX enhancement