Fixes and xaml changes