Stopped caching headers and updated template