some UX enhancements