Further work on payment frontend