Ensure initial templates have surrounding <div>s