Feature/datagrid categories