UX Refactoring