Added XAML changes