Enhance datagrid