FIX: Make CreditCardField use template