Add comparator
Card rendering fixed