Cosmetic changes to options&popup