More xaml cleanup and fixes to NodeFactory