switched number fields to text fields on credit card view
merged stuff