changed the location of grid and correct imports