Tweaks to the options dialog and logic