Dev/davide di carlo/improve payment page