Add file chooser and clean up some stuff