Fixed datagrid layout issues