Add macro for ui-binder generation; refactoring.