Upgrade the html markup
Merge with master