view model improvements