Revert "Revert "Revert "Update card class"""

This reverts commit 815fad1d201eeeaa7ddd8b34fcf63eb78d72db8a.
Revert "Revert "Update card class""

This reverts commit 09839c9772221be939e269aa19c9db919bab2692.