XSD layout chooser tweaks