#15 - XWT, Export panel, refactoring