Agenda ViewModel, Windows app UI fixes