improve form payment flow