Updated code to pass HTML5/CSS3 Validation