Revert "Update card class"

This reverts commit 6f4e273584e40e1127000f28b64c3b88b224bf37.
Revert "Revert "Update card class""

This reverts commit 09839c9772221be939e269aa19c9db919bab2692.