latest changes to register and building screens