More polish on item selector