Reformatted XAML

Reformatted all the XAML to clear up the mess and make things more
readable