Moves more content to template file