Site update

Massive update approved, live changes