update to html markup to avoid validation issues
Merge branch 'markupupdates'