improving the Grid mode