changed some caching and styles