UIBuilder code generator refactoring still in progress