Partially fix payment modal glitch
Fully fix payment form glitch