further refinements to the new 2-level nav