Changed how app.xaml is build