XAML Designer fixes...

Again a few small fixes. Nothing big, more to come...