Improvements to card demo