Fix spelling and remove buttons