Changes in header and location of templates