Minor mods to navigation