Change to-navigation enabling to module level