Add Credit Card Form
Various Fixes
Various Fixes