Refactoring for ExportDialog: Small UI changes and rename variables