Fixed nav-current-nocss issue with menu bar identified in #1740 and minor image/markup issues in grids