Changed tamplate to HTML5