Reworking the option and schedule drop-downs.