add address fields to add card modal

Fixes #1144
Also fixes #1143