Minor changes to Button generator.