[nav] trying to harmonize nav modules