Changed cells, fixed dataModel, added targets for buttons