Further template modifications made over the past few days