slight rearranging in grid