Minor fixes in GridLayout