Wpf: More minor layout fixes