Improved navigation viewmodel.