Refactored the payment request page with the new requirement gathered
Fixed pull conflicts