Usability enhancements