Changes but option and popup broken