improving selection ui