Privacy website update

This PR represents Mika's changes in her privacy-website-update. I helped her merge in the changes made by web devs in master to prepare it for merging.