Nav tweaks, grid improvements