Improve credit card form. Fixes #1716

WIP