Some more xaml tidied up