Rework on grid and cleanup in base