Fix persistence, add 'add card' button