A few HTML updates
Merge branch 'minor-edits'