LAM-37 Changed to Use  WPF UserControl