Chg: Payment form refactor