refactoring for new UI node implementation strat
build fix