Changed template order