UX enhancements