Fixing some of the warnings in the xaml views