HR-137 - attach handlers for add/remove buttons for existing children an...

...d refactoring

@2j2e