Finished Add-button and added Remove button.