Updated GridLayout