HTML5 structure and some fixes