More changes to OptionsViewController