Refactoring for ExportDialog: Change functions order