Export-dialog: Small fixes and WIP