ref #127, grid fix. Further HTML cleanup and tweaks.