lots of fixes on desktop form. Added mobile payment form here, too