Moved templates to the html