UI enhancements and cleanup.