Removed addButton callback and changed logic in clickHandler