'Add/Edit/Remove' buttons handling update