Added "add card" button and indicator of review progress
Hopefully fixed conflict.