More changes to the options dialog
Fixed conflict