add remove button and error logging