fixes to grid