refactored ux package