Updated some ids to use new semantic tags from HTML5