Split user-ux commits for merge