Clenaup work on mainwindow xaml from using UI designer
Further cleanup of XAML for main screen