More progress on ui_option_switch