Added phone number save, troubleshoot StatePicker not persisting value