Colspan/Move datagrid + tests