Added ability to remove button