Add a new file chooser logic and UI, removed some warnings