Make grid_helper an option for grid
Fix plotting for cubes when grid is not requested