Some changes to the html structure