add-Button handling works now as expected