Fix typo and add some xaml