Added remove button bug fix