Fixed remove button problems