Website 2.0

Squashing some bugs