Merge "Updating navigation view model" into main