More UI enhancements