Changed the data model and updated the HTML