Further updates to WPF UI App.