Fix grid order