Made some changes to navigators.