Further UI enhancements