Xm: make yes/no dialog modal
Xm: cleanup element/node checks
VF: add check dialogs and cleanup