Collection card refactor