added better UI selection