cleanup and addition of payment type request buttons