More fixes to grid layout