Improve credit card form. Fixes #1716

See #1716.

Doesn't solve all the problems, but is definitely an improvement over the current version.