Add support for adding/removing buttons