Fix improper quoting, add cancel options to file selection dialogs