Modify AddCardActivity and restore Card.java