Added company and year to data model
Design updates