HR-137 - attach handlers for add/remove buttons for existing children and refactoring