Changing to HTML5 standards tags