further refinements to the new 2-level nav
Merge pull request #22 from nphillips/master

further refinements to the new 2-level nav