Refactoring - data and export pages separated