Fixes to ItemGrid. Still not perfect. But it's better.