Main template changes