registration UI - code cleanup