Changes to UI and Logic for AddCard and ReviewCard