Fixes to XAML Loading

Corrected issues that happened while doing Git merging