GridLayout fixes