final adjustments to navigation

part II