Remove hardcoding of grid and use the new layout.