Markup fixes to correct charset and doctype