Putting in a natural order the grid is relying on and fixing the deploy