AddressBookUI fixes