Templates and Pages modified