Fix top level layout to use a grid layout