New templates and some other changes