Update to remove excess buttons