Various design tweaks, hopefully fixed chooseContacts errors.