Final updates to fix the displayCurrentCard.