Replaced popup options with good ones