MVVM sample improved.