Revert "Revert "Update card class""

This reverts commit db39b6881c00b436d9ee9df0fd18e1255bfd0eba.