View/ViewModel improvements