Fixed build, cleaned up XAML