Updated gridView code