More fixes.  Mainly XAML layout issues.