MVVM sample - remaining change + XAML formatting.