Clean up XAML and app bar code
Comments