cleaning up grid
fixing the renaming