Added "addButton" and fixed delete button