some minor changes
Minor xaml changes