More html updates and added some more caching