Improved settings dialog and options in general