Refactored export UI (#745)