Updated order of templates