Update remove button behaviour