More GridLayout fixes