Move templates to end of body - #1