Refactor ViewModelLocator & NavigationService