Updated the html formatting and ids.