Updated the html structure