Improve website performance

Cancelled