improve selector layout