HTML5 structure and more style cleaning up