Cleaned up XAML formatting