Some Navigation module improvements