Add remove functionality to remove button. Needs bugfixing in remove handling.