refactored ContactPicker
refactored PhoneNumberPicker