Added templates fixes for all sections.