improved masonry, signUp, signIn