Enhancement/183/add close button to datagrid