add/remove button's fixes
references #2