Enhance UI for selection