Add/Edit Card Keyboard working again

Closes #67