add the card view and focus saving