Fix bug with removeButton when splicing right controls