Some more UI enhancements.