Proper data model and icons

Created a proper data model that we are going to be using, also added
some icons to the template.