Optimize website

In Progress