added better class selection UI