Reworked options dialog (untested)