more UI enhancements