More work on registration UI