More UI enhancements.