Fixed datagrid visibility issues