Added Proper caching to the trail entities
Added the new build for tangelo. Abstracted Pop up items into services.