Adapt to site changes to visitors and contacts
Fix whitespace errors