Restyle
More XAML work
Xaml Improvements