Improved layout datagrid