templates: changed order back