Update site with a lot more functionality