Refactor BorderNavigator class.