Updating paypal-auth screen and refactoring out some of the code to do it