registration-ui refactored