Update instances of IdentityPage to use builder