Ccc

Merging the current good-enough (minor things missing) of the new version of the website.