added events to datagrid
merged with develop