Many changes to the UI, added the data model. More changes to the UI to follow