[IMP] Better form view for payment mode