Fixed grid quality bug, added tooltips

Fixed grid quality bug, added tooltips, added some logic to support
larger grid sizes (incomplete)
Merge remote-tracking branch 'origin/master' into gh-pages