fix remove button behaviour