fixture: More UI enhancements