Move charity_id below birthday

@HelenRoss requested.