Multiple UI enhancements