Refactoring of Views and ViewModels