Refactoring and tweaking the card choice screen