updated to html5 elements and attributes