Merge pull request #1746 from pjackson28/master

Fixed nav-current-nocss issue with menu bar identified in #1740 and minor image/markup issues in grids
Minor fixes the HTML in grid-base-eng.html.
Merge pull request #1747 from pjackson28/v3.0

Minor fixes the HTML in grid-base-eng.html
Merge branch 'v3.0'
Minor code cleanup from comments in pull request #1736.