fixed remove buttons