Merging refactoring, view model changes