Finished rework of credit card views