Updated datagrid prototype