Made templates HTML5-valid