more nav fixup