added make payment form
fixed merge conflicts