Repair & maintenance

work on the button store