Make buttons more extensible