Smaller fixes to hide/show grid feature.
Fixes to beam spacing calculation for grid.