Cleaning up a lot of the registration UI