More additions to WPF UI