Formatting changes; Doctype -> HTML5