Improvement to payment and receipt forms

@Anuj_Goel This is unrelated. See: