Made changes for payment gateway and Review UI