Restyle
More XAML work
Xaml Improvements
Merge pull request #1 from mscottreed/master

Scott, Llewellyn and Jim's edits