Begin work on refactoring XAML