Added functionality to DataView and DataModel
Added comments and better UI