Navigation component dialog refactoring