Grid fixes
Merge pull request #137 from CruGlobal/nav-breakpoints

Grid fixes