Implemented "Add" and "Remove" buttons