fix project
view model refactoring